Kaynağa Gözat

feat(生产订单): 为齐套检查组件添加订单类型支持并优化功能

liujt 6 ay önce
ebeveyn
işleme
2f647cc238

+ 9 - 0
src/api/productionPlan/index.js

@@ -398,3 +398,12 @@ export async function updatePreRelease(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+//任务齐套性检查 订单
+export async function updatePreReleaseOrder(data) {
+  const res = await request.post(`/aps/workorder/updatePreRelease`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 22 - 7
src/views/productionPlan/components/checkProductionPreparations.vue

@@ -27,7 +27,7 @@
       :page-size="20"
     >
       <template v-slot:toolbar>
-        <el-button type="primary" size="mini" @click="batchKittingComplete"
+        <el-button v-if="type != 'order' && type != 'plan'" type="primary" size="mini" @click="batchKittingComplete"
           >批量齐套检查</el-button
         >
       </template>
@@ -48,8 +48,8 @@
           type="primary"
           :underline="false"
           @click="kittingComplete(row)"
-          v-if="type == 'plan' || row.preType == '6'"
         >
+          <!-- v-if="type == 'plan' || row.preType == '6'" -->
           齐套检查
         </el-link>
 
@@ -57,7 +57,7 @@
           type="primary"
           :underline="false"
           @click="taskAssignment"
-          v-if="row.statusStr == '缺料' && row.preType == '6'"
+          v-if="row.statusStr == '缺料' && type == 'plan' && row.preType == '5'"
         >
           任务派单
         </el-link>
@@ -128,7 +128,8 @@
   import {
     completenessCheck,
     taskReleaseWork,
-    updatePreRelease
+    updatePreRelease,
+    updatePreReleaseOrder
   } from '@/api/productionPlan';
   import { listOrganizations, getUserPage } from '@/api/system/organization';
   import kittingComplete from './kittingComplete.vue';
@@ -253,8 +254,14 @@
     },
 
     methods: {
-      async completenessCheck(planId) {
-        this.preReleaseList = await completenessCheck({ planId });
+      async completenessCheck(planId, apsWorkOrderId) {
+        const params = {
+          planId,
+        }
+        if(apsWorkOrderId) {
+          params.apsWorkOrderId = apsWorkOrderId;
+        }
+        this.preReleaseList = await completenessCheck(params);
       },
 
       // reload(where) {
@@ -288,6 +295,8 @@
         } else {
           if (item.id && this.type == 'plan') {
             this.completenessCheck(item.id);
+          } else if (this.type == 'order') {
+            this.completenessCheck(item.productionPlanId, item.id);
           }
         }
       },
@@ -302,7 +311,13 @@
         this.dialogVisible = false;
       },
       updatePreRelease(item) {
-        updatePreRelease(item);
+        if (this.type == 'plan') {
+          updatePreRelease(item);
+        } else if (this.type == 'order') {
+          item.apsWorkOrderId = this.itemData.id;
+          updatePreReleaseOrder(item);
+        }
+        this.$emit('update');
       },
       kittingComplete(item) {
         if (item.preType == '5' || item.preType == '6') {

+ 1 - 1
src/views/productionPlan/index.vue

@@ -429,7 +429,7 @@
 
     <processDetail ref="processDetailRef" />
 
-    <checkProductionPreparations ref="checkProductionPreparationsRef" type="plan" />
+    <checkProductionPreparations ref="checkProductionPreparationsRef" type="plan" @update="reload" />
   </div>
 </template>
 

+ 1 - 1
src/views/workOrder/index.vue

@@ -211,7 +211,7 @@
     />
 
     <AssetsDialog ref="assetsRef" :treeIds="treeId"></AssetsDialog>
-    <checkProductionPreparations ref="checkProductionPreparationsRef" />
+    <checkProductionPreparations ref="checkProductionPreparationsRef" type="order" @update="reload" />
   </div>
 </template>