Merge remote-tracking branch 'origin/master'

src/views/inout/IoAuditedOrder.vue

@@ -736,7 +736,7 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 1,
+        status: row.status,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
@@ -745,7 +745,7 @@ export default {
             templateId: response.data,
             orderIdFk: row.billNo,
             action: row.action,
-            moduleId: 1,
+            status: row.status,
           }
           orderPDFFromTemplateFile(tQuery).then((response) => {
             //将pdf文件转换为url。

src/views/inout/IoCheckAuditOrder.vue

@@ -731,13 +731,14 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 2,
+        status: row.status,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
         if (response.code === 20000) {
           tQuery = {
             templateId: response.data,
+            status: row.status,
             orderIdFk: row.billNo,
             action: row.action,
             moduleId: 2,

src/views/system/dept/invRelUsers.vue

@@ -218,7 +218,7 @@ export default {
         this.userTotal = res.data.total;
 
       }).catch((error) => {
-        this.$message.error("用户数据加载失败")
+        this.$message.error("数据正在处理，请勿重复提交")
       });
     },