修改委外的bug和派单工作中心重复的bug

src/views/produce/components/outsourcing/new_outsourceList.vue

@@ -1127,41 +1127,6 @@
         this.$refs.pickingListRef.open(id, type);
       },
 
-      outsourceMaterialFn(res) {
-        let _arr = [];
-        _arr = [...res.pickOutInList, ...res.materialList];
-
-        this.pickOutInList = _arr.reduce((acc, item) => {
-          const existingItem = acc.find((existing) => existing.id === item.id);
-          if (!existingItem) {
-            item.isSelection = '2';
-            acc.push(item);
-          }
-          return acc;
-        }, []);
-
-        this.bomMaterialList = res.bomMaterialList.map((m) => {
-          return {
-            ...m,
-            isDemandQuantity: true
-          };
-        });
-
-        this.pickOutInList.map((v) => {
-          v.checked = true;
-        });
-
-        this.checkListLen = this.pickOutInList.length;
-
-        this.standardOutputList = res.standardOutputList;
-
-        this.changNumber(this.pickOutInList);
-
-        this.$nextTick(() => {
-          this.$refs.pickOutRef.toggleAllSelection();
-        });
-      },
-
       changNumber(list) {
         let total = 0;
         let batchTotal = 0;
@@ -1441,7 +1406,12 @@
 
         this.checkListLen = this.pickOutInList.length;
 
-        this.standardOutputList = res.standardOutputList;
+        this.standardOutputList = res.standardOutputList.map((item) => {
+          item.demandQuantity = item.demandQuantity
+            ? item.demandQuantity
+            : this.attributeData.formedNumLast;
+          return item;
+        });
 
         this.changNumber(this.pickOutInList);
 

src/views/produce/components/qualityInspection/components/selfInspectionReporting.vue

@@ -511,7 +511,12 @@
       produceTaskTypeText() {
         const map = {
           1: '普通工序',
-          2: '质检工序'
+          2: '抽样质检工序',
+          3: '普通质检工序',
+          4: '包装工序',
+          5: '入库工序',
+          6: '工一检',
+          99: '关键工序'
         };
         return map[this.form.produceTaskType] || '';
       }

src/views/produceOrder/components/releaseDialog/index.vue

@@ -583,7 +583,14 @@
         if (userData.centerList.length != 0) {
           this.form.workCenterId = userData.centerList[0].centerId;
           this.form.workCenterName = userData.centerList[0].centerName;
-          this.workCenterList = userData.centerList;
+          const map = new Map();
+          userData.centerList.forEach((item) => {
+            const { teamId, ...rest } = item;
+            if (!map.has(rest.centerId)) {
+              map.set(rest.centerId, rest);
+            }
+          });
+          this.workCenterList = [...map.values()];
           this.userTeamList = userData.teamList;
           this.changeWork(userData.centerList[0].centerId);
           this.getProductionData(userData.centerList[0].centerId);

vue.config.js

@@ -32,9 +32,9 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.251:18186',
+        target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',