Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/plan/masterproductionschedule/auto-manufacturingorder.vue

@@ -251,7 +251,7 @@
                    unit: item.unit,
                    workShop: null,
                    workshopTypeCode: 'M',
                    requiredDate: null,
                    requiredDate: this.masterProduction.requiredDate,
                    id: item.id,
                    manufactureAttr: this.masterProduction.manufactureAttr,
                    isReportOperation: this.isReportOperation
@@ -417,7 +417,6 @@
    },
    getWorkShopOptions() {
      remote('work_shop').then((response) => {
        console.log("高压",response);
        if (response.data.code === 0) {
          this.workShopOptions = response.data.data
        } else {