update:合并生产报工

pages/mes/prodReport/index.vue

@@ -1770,51 +1770,55 @@ export default {
             workorderSoSizeItemId: item.workorderSoSizeItemId,
             netWeight: item.netWeight,
             printContents: item.whether=='1'?item.printContents: null
-		})
-          .then((res) => {
-            if (res.code === 200) {
-             this.proVisible = false;
-              if (res.msg === '操作成功') {
-                this.$u.toast('上报成功');
-                if(item.printTemplate) {
-                  let params = {}
-                  res.data.forEach(datas => {
-                    params = {
-                      reportName: 'mysql:'+item.printTemplate,
-                      values: {
-                        proWorkorder: datas.proWorkorder,
-                        size: datas.size,
-                        directive: datas.directive
+        })
+            .then((res) => {
+              if (res.code === 200) {
+              this.proVisible = false;
+                if (res.msg === '操作成功') {
+                  this.$u.toast('上报成功');
+                  if(item.printTemplate) {
+                    let params = {}
+                    res.data.forEach(datas => {
+                      params = {
+                        reportName: 'mysql:'+item.printTemplate,
+                        values: {
+                          proWorkorder: datas.proWorkorder,
+                          size: datas.size,
+                          directive: datas.directive
+                        }
                       }
-                    }
-                    datas.packagePrintList.forEach(v => {
-                      params.values.packagePrint = v
-                      this.printPdfSocket(params)
+                      datas.packagePrintList.forEach(v => {
+                        params.values.packagePrint = v
+                        this.printPdfSocket(params)
+                      })
                     })
-                  })
-                }
-                if(item.whether=='1'){
+                  }
+                  if(item.whether=='1'){
                     this.printPdfSocket({
-                          reportName: 'mysql:qrcode-50*50-2',
-                          values: {
-                            detail: [
-                              {
-                              barcode: item.printContents,
-                              gp: item.printContents
-                              },
-                            ],
+                      reportName: 'mysql:qrcode-50*50-2',
+                      values: {
+                        detail: [
+                          {
+                          barcode: item.printContents,
+                          gp: item.printContents
                           },
-                        })
-                      }
-			if (res.msg === '') {
-				this.$u.toast('上报成功');
-				} else {
+                        ],
+                      },
+                    })
+                  }
+                }
+                if (!res.msg) {
+                  this.$u.toast('上报成功');
+                } else {
                   this.$u.toast(res.msg);
                 }
                 this.getTaskList();
-            }
-          });
-      });
+
+              }
+
+        });
+
+      })
     },
     feedingInspectionShow() {
       this.feedingInspectionVisible = true;