Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-11-17 2fefc3c07619a513fe82144ea1f8d75c068bcb9e

 src/views/plan/manufacturingorder/index.vue

@@ -428,8 +428,8 @@
          },
          {
            minWidth: '120',
            prop: 'orderRemark',
            label: '销售订单备注',
            prop: 'remark',
            label: '备注',
            sort: true,
            isTrue: true,
            isSearch: true,
@@ -824,12 +824,12 @@
        ],
        toolbar: [],
        operator: [
          {
            text: '查看库存',
            type: 'text',
            size: 'small',
            fun: this.searchStock
          }
          // {
          //   text: '查看库存',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.searchStock
          // }
        ],
        operatorConfig: {
          fixed: 'right',