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

zouyu

2023-11-15 0222e4af06ee8bb66544fd45056a0114d94860cd

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

 src/views/plan/masterproductionschedule/index.vue

@@ -592,12 +592,12 @@
        ],
        toolbar: [],
        operator: [
          {
            text: '订单预留',
            type: 'text',
            size: 'small',
            fun: this.customReserved
          },
          // {
          //   text: '订单预留',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.customReserved
          // },
          // {
          //   text: '查看库存',
          //   type: 'text',
@@ -611,11 +611,17 @@
            fun: this.searchMasterPlanSourceHandle
          },
          {
            text: '订单',
            text: '作废',
            type: 'text',
            size: 'small',
            fun: this.searchOrderHandle
          }
            fun: this.deleteMainPlan
          },
          // {
          //   text: '订单',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.searchOrderHandle
          // }
        ],
        operatorConfig: {
          fixed: 'right',
@@ -708,6 +714,7 @@
    this.getSysParam(sysParam.IS_REPORT_OPERATION)
  },
  methods: {
    deleteMainPlan(row){},
    getSysParam(paramKey) {
      getSysParam(paramKey).then((response) => {
        var paramVal = response.data.data