Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/produceOrder/components/report/Common.vue

@@ -290,7 +290,7 @@
                 rootCategoryLevelId: this.infoData.rootCategoryLevelId,
                 path: this.infoData.path[0]?.pathName,
                 model: this.infoData.model,
-                sourceCategoryId: this.infoData.sourceCategoryId,
+                sourceInstanceId: this.infoData.sourceInstanceId,
                 specification: this.infoData.specification
               }
             );
@@ -342,8 +342,8 @@
                 workReportDeviceList: [this.workReportDeviceList],
                 workReportCategoryList: [this.categoryMsg]
               }).then((res) => {
-                this.$message.success('报工成功！');
-                this.getReportCount();
+                // this.$message.success('报工成功！');
+                // this.getReportCount();
               });
             });
           } else {

src/views/produceOrder/components/report/Drying.vue

@@ -351,8 +351,8 @@
                 workReportDeviceList: [this.workReportDeviceList],
                 workReportCategoryList: [this.categoryMsg]
               }).then((res) => {
-                this.$message.success('报工成功！');
-                this.getReportCount();
+                // this.$message.success('报工成功！');
+                // this.getReportCount();
               });
             });
           } else {

src/views/produceOrder/components/report/Extrusion.vue

@@ -379,7 +379,7 @@
                 rootCategoryLevelId: this.infoData.rootCategoryLevelId,
                 path: this.infoData.path[0]?.pathName,
                 model: this.infoData.model,
-                sourceCategoryId: this.infoData.sourceCategoryId,
+                sourceInstanceId: this.infoData.sourceInstanceId,
                 specification: this.infoData.specification
               }
             );
@@ -469,8 +469,8 @@
                 workReportCategoryList: [this.categoryMsg],
                 workReportDeviceList
               }).then(() => {
-                this.$message.success('报工成功！');
-                this.getReportCount();
+                // this.$message.success('报工成功！');
+                // this.getReportCount();
               });
             });
           } else {

src/views/produceOrder/components/report/Furnace.vue

@@ -161,7 +161,7 @@
                 rootCategoryLevelId: this.infoData.rootCategoryLevelId,
                 path: this.infoData.path[0]?.pathName,
                 model: this.infoData.model,
-                sourceCategoryId: this.infoData.sourceCategoryId,
+                sourceInstanceId: this.infoData.sourceInstanceId,
                 specification: this.infoData.specification
               }
             );
@@ -218,8 +218,8 @@
                 workReportDeviceList: [this.workReportDeviceList],
                 workReportCategoryList: [this.categoryMsg]
               }).then((res) => {
-                this.$message.success('报工成功！');
-                this.getReportCount();
+                // this.$message.success('报工成功！');
+                // this.getReportCount();
               });
             });
           } else {

src/views/produceOrder/components/report/HalfAdded.vue

@@ -312,7 +312,7 @@
                 rootCategoryLevelId: this.infoData.rootCategoryLevelId,
                 path: this.infoData.path[0]?.pathName,
                 model: this.infoData.model,
-                sourceCategoryId: this.infoData.sourceCategoryId,
+                sourceInstanceId: this.infoData.sourceInstanceId,
                 specification: this.infoData.specification
               }
             );
@@ -382,8 +382,8 @@
                 workReportDeviceList: [this.workReportDeviceList],
                 workReportCategoryList: [this.categoryMsg]
               }).then((res) => {
-                this.$message.success('报工成功！');
-                this.getReportCount();
+                // this.$message.success('报工成功！');
+                // this.getReportCount();
               });
             });
           } else {

src/views/produceOrder/components/report/Heating.vue

@@ -321,7 +321,7 @@
                 rootCategoryLevelId: this.infoData.rootCategoryLevelId,
                 path: this.infoData.path[0]?.pathName,
                 model: this.infoData.model,
-                sourceCategoryId: this.infoData.sourceCategoryId,
+                sourceInstanceId: this.infoData.sourceInstanceId,
                 specification: this.infoData.specification
               }
             );
@@ -391,8 +391,8 @@
                 workReportDeviceList: [this.workReportDeviceList],
                 workReportCategoryList: [this.categoryMsg]
               }).then((res) => {
-                this.$message.success('报工成功！');
-                this.getReportCount();
+                // this.$message.success('报工成功！');
+                // this.getReportCount();
               });
             });
           } else {

src/views/produceOrder/components/report/Package.vue

@@ -351,8 +351,8 @@
                   this.categoryMsg
                 ]
               }).then((res) => {
-                this.$message.success('报工成功！');
-                this.getReportCount();
+                // this.$message.success('报工成功！');
+                // this.getReportCount();
               });
             });
           } else {

src/views/produceOrder/components/report/Sinter.vue

@@ -145,7 +145,7 @@
                 rootCategoryLevelId: this.infoData.rootCategoryLevelId,
                 path: this.infoData.path[0]?.pathName,
                 model: this.infoData.model,
-                sourceCategoryId: this.infoData.sourceCategoryId,
+                sourceInstanceId: this.infoData.sourceInstanceId,
                 specification: this.infoData.specification
               }
             );
@@ -185,8 +185,8 @@
                 workReport: this.workReport,
                 workReportDeviceList: [this.workReportDeviceList]
               }).then((res) => {
-                this.$message.success('报工成功！');
-                this.getMsg();
+                // this.$message.success('报工成功！');
+                // this.getMsg();
               });
             });
           }

src/views/produceOrder/components/report/Warehousing.vue

@@ -197,8 +197,8 @@
                 workReport: this.workReport,
                 workReportCategoryList: [this.categoryMsg]
               }).then((res) => {
-                this.$message.success('报工成功！');
-                this.getReportCount();
+                // this.$message.success('报工成功！');
+                // this.getReportCount();
               });
             });
           } else {

src/views/produceOrder/report.vue

@@ -120,7 +120,7 @@
         v-if="tabList.length"
         ref="reportRef"
         :is="componentName"
-        :key="activeName"
+        :key="activeName + isUpdate"
         :infoData="infoData"
         :taskInfo="{
           ...tabList[activeName],
@@ -162,6 +162,7 @@
     data () {
       return {
         infoData: {},
+        isUpdate: true,
         descriptionsShow: true,
         activeName: '0',
         tabList: [],
@@ -203,7 +204,7 @@
       }
     },
     created () {
-      this.getDetail(this.$route.query.id);
+      this.init();
     },
     methods: {
       handleReport () {
@@ -232,15 +233,25 @@
               ].code,
             ...data
           };
-          await report(params);
+          await report(params).then((res) => {
+            this.$message.success('报工成功！');
+            this.getDetail();
+            this.isUpdate = !this.isUpdate;
+            return res;
+          });
         });
       },
-      async getDetail (id) {
-        const res = await getById(id);
-
+      async init () {
+        await this.getDetail();
+        await this._getTaskListById();
+      },
+      async getDetail () {
+        const res = await getById(this.$route.query.id);
         this.infoData = res;
+      },
+      async _getTaskListById () {
         // 获取工序
-        const res1 = await getTaskListById(res.produceVersionId);
+        const res1 = await getTaskListById(this.infoData.produceVersionId);
 
         this.tabList = res1;
         this.activeName = '0';