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

Fixiaobai

2023-12-15 ad2437550eb0c8f3c3c8736df1a38a713f920ec2

 src/views/plan/masterproductionschedule/index.vue

@@ -411,7 +411,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          /* {
            minWidth: '140',
            prop: 'inventoryReservedQuantity',
            label: '库存预留数量',
@@ -419,7 +419,7 @@
            isTrue: true,
            isSearch: false,
            searchInfoType: 'text'
          },
          }, */
          /* {
            minWidth: '140',
            prop: 'outsourcingNumber',
@@ -681,13 +681,13 @@
            fun: this.createOutsourcingOrder
          } */
    if (this.permissions.plan_masterproductionschedule_add) {
      this.table.toolbar.push({
      /* this.table.toolbar.push({
        text: '新增',
        type: 'primary',
        fun: this.addMasterProductionSchedule,
        disabled: false,
        permitArr: []
      })
      }) */
    }
    if (this.permissions.masterproductionschedule_create_outsourcing) {
      // this.table.toolbar.push({