Merge remote-tracking branch 'origin/master'

王震

2023-11-16 1f9c32908a68eef81f549b6986a9bc1f05056108

 src/views/plan/masterproductionschedule/index.vue

@@ -82,14 +82,14 @@
              >
            </el-dropdown-menu>
          </el-dropdown>
          <el-button
          <!-- <el-button
            v-if="permissions.masterproductionschedule_submit_oa"
            @click="commitOa()"
            type="primary"
            style="margin-left:10px;"
            :loading="loadingOa"
            >提交OA
          </el-button>
          </el-button> -->
          <!-- <el-button
            v-if="permissions.masterproductionschedule_sync_scm"
            @click="syncScm()"
@@ -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',
@@ -684,18 +690,18 @@
      })
    }
    if (this.permissions.masterproductionschedule_create_outsourcing) {
      this.table.toolbar.push({
        text: '创建委外订单',
        fun: this.createOutsourcingOrder
      })
      // this.table.toolbar.push({
      //   text: '创建委外订单',
      //   fun: this.createOutsourcingOrder
      // })
    }
    if (this.permissions.masterproductionschedule_create_order_manual) {
      this.orderTypeArr.push({
        label: '手动新增',
        command: 'MANUAL',
        disabled: false,
        permitArr: ['02processed']
      })
      // this.orderTypeArr.push({
      //   label: '手动新增',
      //   command: 'MANUAL',
      //   disabled: false,
      //   permitArr: ['02processed']
      // })
    }
    if (this.permissions.masterproductionschedule_create_order_auto) {
      this.orderTypeArr.push({
@@ -708,6 +714,7 @@
    this.getSysParam(sysParam.IS_REPORT_OPERATION)
  },
  methods: {
    deleteMainPlan(row){},
    getSysParam(paramKey) {
      getSysParam(paramKey).then((response) => {
        var paramVal = response.data.data