优化

src/api/produce/workOrder.js

@@ -81,3 +81,28 @@ export async function workorderList(data) {
 }
 
 
+
+
+// pda报工保存
+
+export async function jobSave(data) {
+  const res = await request.post('/mes/workreport/save', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+
+// pda报工保存缓存
+
+export async function saveCache(data) {
+  const res = await request.post('/mes/workreport/saveCache', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+

src/views/produce/components/jobBooking/index.vue

@@ -147,6 +147,7 @@
 <script>
   import { listByIdsReport } from '@/api/produce/job';
   import { getWarehouseList } from '@/api/produce/index';
+  import { jobSave , saveCache} from '@/api/produce/workOrder'
   import pickingList from '../picking/pickingList.vue';
 
   import workOrderBom from '../feeding/components/workOrderBom.vue';
@@ -164,6 +165,9 @@
   import aridRegion from '../feeding/components/aridRegion.vue';
   import packingBom from './components/packingBom.vue';
   import packingTgBom from './components/packingTgBom';
+
+
+
   export default {
     components: {
       pickingList,
@@ -204,7 +208,9 @@
         idsList: [],
         isLoad: false,
 
-        warehouseList: []
+        warehouseList: [],
+
+        loading: null,
       };
     },
 
@@ -361,7 +367,7 @@
       },
 
       async save(type) {
-        const loading = this.$loading({
+         this.loading = this.$loading({
           lock: true,
           text: '加载中',
           background: 'rgba(0, 0, 0, 0.7)'
@@ -376,7 +382,7 @@
 
         if (!bol2) {
           this.$message.warning('请输入合格品数量');
-          loading.close();
+          this.loading.close();
           return false;
         }
 
@@ -409,7 +415,7 @@
 
         if (!bol) {
           this.$message.warning(`请完善工单${wId}第${_i}处置方式`);
-          loading.close();
+          this.loading.close();
 
           return false;
         }
@@ -420,7 +426,7 @@
           });
 
           if (succ) {
-            loading.close();
+      
             const isRecycle = await this.checkRecycle();
             if (!isRecycle) {
               return false;
@@ -438,7 +444,7 @@
 
         if (this.taskObj.type == 1) {
           const isCache = await this.checkCache(type);
-
+  
           if (!isCache) {
             return false;
           }
@@ -446,19 +452,20 @@
 
         jobSave(this.List)
           .then((res) => {
-            loading.close();
+            this.loading.close();
             this.$message.success('报工成功')
             this.getList(this.idsList);;
        
           })
           .finally(() => {
             setTimeout(function () {
-              loading.close();
+              this.loading.close();
             }, 3000);
           });
       },
 
       checkRecycle() {
+        this.loading.close();
         return new Promise((resolve) => {
           this.$confirm('是否跳过副产品回收处置！', '提示', {
             confirmButtonText: '确定',
@@ -482,6 +489,7 @@
 
 						saveCache(this.List).then(rr => {
 				   this.$message.success('缓存成功')
+           this.loading.close();
 						})
 						resolve(false)
 					} else if (type == 2) {