fix(维护管理): 优化startExecuting接口响应处理并添加工单接收功能

src/api/maintenance/repair.js

@@ -46,13 +46,13 @@ export async function details(id) {
 }
 
 export async function startExecuting(params) {
-  const data = await request.post(`/eam/PdaWorkOrder/startExecuting`, params);
-  if (data.code == 0) {
-    return data.data;
+  const res = await request.post(`/eam/PdaWorkOrder/startExecuting`, params);
+  if (res.data.code == 0) {
+    return res.data.data;
   }
-  return Promise.reject(new Error(data.message));
+  return Promise.reject(new Error(res.data.message));
 }
- // 上报
+// 上报
 export async function reportWorkOrder(data) {
   const res = await request.post(`/eam/workorder/reportWorkOrder`, data);
   if (res.data.code == 0) {
@@ -61,7 +61,6 @@ export async function reportWorkOrder(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // // 保存
 // export async function save (data) {
 //   const res = await request.post('/eam/repairrequest/save', data);

src/views/maintenance/components/signingUpWork.vue

@@ -197,7 +197,12 @@
 <script>
   import modalTitle from '@/components/modalTitle.vue';
   import { report } from '@/api/equipment/work.js';
-  import { getById } from '@/api/maintenance/patrol_maintenance';
+  import {
+    getById,
+    getWordOrderDetail
+  } from '@/api/maintenance/patrol_maintenance';
+
+  const dayjs = require('dayjs');
   export default {
     components: {
       modalTitle
@@ -265,7 +270,6 @@
           row.status == '-1' ? '异常' : row.status == '1' ? '正常' : '';
       },
       open(row) {
-        console.log(row);
         this.getInfo(row);
         this.visible = true;
       },
@@ -307,6 +311,15 @@
             item1.normal = '正常';
           });
         });
+        // console.log(getWordOrderDetail(row.id), 'res.data');
+        getWordOrderDetail(row.id).then((res) => {
+          this.time = [
+            res.acceptTime,
+            dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+          ];
+        });
+
+        console.log(this.time, 'this.time');
         this.infoData = res.data;
         this.infoData.workOrderId = row.id;
       }

src/views/maintenance/patrol/workOrder/index.vue

@@ -32,7 +32,11 @@
             申请备品备件
           </el-link>
           <el-link
-            v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
+            v-if="
+              row.orderStatus !== 3 &&
+              row.orderStatus !== 4 &&
+              row.orderStatus !== 0
+            "
             type="primary"
             :underline="false"
             icon="el-icon-edit"
@@ -40,6 +44,15 @@
           >
             报工
           </el-link>
+          <el-link
+            v-if="row.orderStatus == 0"
+            type="primary"
+            :underline="false"
+            icon="el-icon-edit"
+            @click="startExecuting(row)"
+          >
+            接收
+          </el-link>
           <el-link
             v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
             type="primary"
@@ -70,7 +83,7 @@
     getWordOrderDetail
   } from '@/api/maintenance/patrol_maintenance';
   import jimureportBrowse from '@/components/jimureport/browseModal.vue';
-
+  import { startExecuting } from '@/api/maintenance/repair';
   import dictMixins from '@/mixins/dictMixins';
 
   import { getToken } from '@/utils/token-util';
@@ -280,7 +293,11 @@
       reload(where) {
         this.$refs.table.reload({ page: 1, where });
       },
-
+      startExecuting(row) {
+        startExecuting({id:row.id}).then((res) => {
+            this.reload();
+        });
+      },
       // 添加备品备件
       async addSpareItems(row) {
         let data = await getWordOrderDetail(row.id);