ソースを参照

feat: 添加报工检查功能

yusheng 2 ヶ月 前
コミット
52fc1ce151
2 ファイル変更21 行追加15 行削除
  1. 9 13
      src/api/recordRules/index.js
  2. 12 2
      src/views/recordComponents/workOrder.vue

+ 9 - 13
src/api/recordRules/index.js

@@ -1,6 +1,5 @@
 import request from '@/utils/request';
 
-
 // /main/recordrules/getById/{id} 查看详情
 export async function recordrulesGetById(id) {
   const res = await request.get(`/main/recordrules/getById/${id}`);
@@ -10,7 +9,6 @@ export async function recordrulesGetById(id) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 规则记录分页查询
 export async function recordrulesPage(body) {
   const res = await request.post(`/main/recordrules/page`, body);
@@ -75,7 +73,6 @@ export async function getRecordRulesPlanDetail(id) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // /mes/recordrulesplan/revoke post 撤回
 export async function recordrulesplanRevoke(id) {
   const res = await request.put(`/pcs/recordRulesPlan/revoke`, id);
@@ -105,10 +102,7 @@ export async function recordrulesplanManualDispatchOrder(body) {
 
 // /mes/recordrulesplan/reManualDispatchOrder
 export async function recordrulesplanReManualDispatchOrder(body) {
-  const res = await request.put(
-    `/pcs/recordrulesorder/reassign`,
-    body
-  );
+  const res = await request.put(`/pcs/recordrulesorder/reassign`, body);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -117,21 +111,23 @@ export async function recordrulesplanReManualDispatchOrder(body) {
 
 // /mes/producetaskrulerecord/saveOrUpdateAndSubmit 报工
 export async function producetaskrulerecordSaveOrUpdateAndSubmit(body) {
-  const res = await request.put(
-    `/pcs/recordrulesorder/reportingWork`,
-    body
-  );
+  const res = await request.put(`/pcs/recordrulesorder/reportingWork`, body);
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-
 export async function getById(id) {
   const res = await request.get('/pcs/recordrulesorder/getById/' + id);
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+export async function checkReportingWork(id) {
+  const res = await request.get(
+    '/pcs/recordrulesorder/checkReportingWork/' + id
+  );
+  return res.data.code;
+}

+ 12 - 2
src/views/recordComponents/workOrder.vue

@@ -60,7 +60,10 @@
 <script>
   import dictMixins from '@/mixins/dictMixins';
   import tableColumnsMixin from '@/mixins/tableColumnsMixin';
-  import { producetaskrulerecordQueryRecordWorkOrderPage } from '@/api/recordRules/index';
+  import {
+    producetaskrulerecordQueryRecordWorkOrderPage,
+    checkReportingWork
+  } from '@/api/recordRules/index';
   import redeployOther from './redeployOther.vue';
   import workOrderReport from './workOrderReport.vue';
   import { getteampage } from '@/api/main/index.js';
@@ -348,7 +351,14 @@
         this.$refs.redeployOtherRef.open(row, 'transfer');
       },
       // 报工
-      openWorkOrderReport(type, row) {
+      async openWorkOrderReport(type, row) {
+        if (type != 'detail') {
+          const code = await checkReportingWork(row.id);
+          if (code == '-1') {
+            return;
+          }
+        }
+
         this.$refs.workOrderReportRef.open(type, row);
       }
     }