修改量具送检流程

src/api/bpm/components/inspectionManage/index.js

@@ -26,7 +26,7 @@ export async function surrender(data) {
 
 // 个人日志列表
 export async function getList(params) {
-  const res = await request.get('/eom/planToolLog/list', { params });
+  const res = await request.get('/eam/planToolLog/list', { params });
   if (res.data.code == 0) {
     return res.data;
   }
@@ -85,3 +85,12 @@ export async function statistics(params) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 管理员确认收到
+export async function adminVerify(data) {
+  const res = await request.post('/eam/planTool/adminVerify', data);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/utils/dict/tickets.js

@@ -3,7 +3,7 @@ export const ticketStatus = [
   { id: 0, label: '待接收' },
   { id: 1, label: '已接收' },
   { id: 2, label: '执行中' },
-  { id: 3, label: '已完成' },
+  { id: 3, label: '待验收' },
   { id: 4, label: '已验收' }
 ];
 

src/views/bpm/doneTickets/components/signingUpWork.vue

@@ -44,6 +44,16 @@
                     item.substance.positionNames
                   }}</span>
                 </div>
+                <div class="item_info">
+                  <span class="item_label">固资编码</span>
+                  <span class="item_value">{{ item.substance.fixCode }}</span>
+                </div>
+                <div class="item_info">
+                  <span class="item_label">编号</span>
+                  <span class="item_value">{{
+                    item.substance.extInfo.codeNumber
+                  }}</span>
+                </div>
               </div>
               <p>操作事项</p>
               <div class="ruleMatters_box">

src/views/bpm/handleTask/components/measuringToolInspection/detailDialog.vue

@@ -125,6 +125,27 @@
             </template>
           </HeaderTitle>
           <div class="maintain_equipment_info_content">
+            <div class="confirmBtn">
+              <el-button
+                v-if="
+                  taskDefinitionKey === 'leader_receive' &&
+                  !infoData.planDeviceList[0].leaderVerifyTime
+                "
+                type="primary"
+                @click="confirmReceive(1, 3)"
+                >确定收到</el-button
+              >
+              <el-button
+                v-if="
+                  taskDefinitionKey === 'team_leader_receive1' &&
+                  !infoData.planDeviceList[0].teamVerifyTime
+                "
+                @click="confirmReceive(2, 2)"
+                type="primary"
+                >确定收到</el-button
+              >
+            </div>
+
             <el-table :height="300" :data="infoData.planDeviceList" border>
               <el-table-column label="序号" type="index" width="50">
               </el-table-column>
@@ -239,7 +260,19 @@
                   label="负责人确认时间"
                   prop="teamReceiptTime"
                 ></el-table-column>
-                <el-table-column label="操作" width="90">
+                <el-table-column
+                  label="量具管理员确认时间"
+                  prop="leaderVerifyTime"
+                ></el-table-column>
+                <el-table-column
+                  label="负责人确认收到时间"
+                  prop="teamVerifyTime"
+                ></el-table-column>
+                <el-table-column
+                  label="使用人收取量具时间"
+                  prop="harvestTime"
+                ></el-table-column>
+                <!-- <el-table-column label="操作" width="90">
                   <template slot-scope="scope">
                     <el-button
                       v-if="!scope.row.teamReceiptTime"
@@ -249,7 +282,7 @@
                       >确认</el-button
                     >
                   </template>
-                </el-table-column>
+                </el-table-column> -->
               </template>
             </el-table>
             <!-- <div
@@ -381,7 +414,8 @@
   import dictMixins from '@/mixins/dictMixins';
   import {
     processById,
-    getList
+    getList,
+    adminVerify
   } from '@/api/bpm/components/inspectionManage/index.js';
   export default {
     name: 'measuringToolInspection_detailDialog',
@@ -425,6 +459,10 @@
           {
             value: 1,
             label: '异常'
+          },
+          {
+            value: 2,
+            label: '未收'
           }
         ],
         options: {
@@ -491,6 +529,22 @@
       });
     },
     methods: {
+      confirmReceive(confirmType, listType) {
+        let params = this.infoData.planDeviceList.map((item) => {
+          return {
+            id: item.id,
+            type: confirmType
+          };
+        });
+        adminVerify(params).then(() => {
+          processById({ id: this.businessId, type: listType }).then(
+            async (data) => {
+              this.infoData = data;
+              this.$message.success('确认成功');
+            }
+          );
+        });
+      },
       async getTableValue() {
         return this.infoData;
       }
@@ -533,6 +587,11 @@
     }
     .maintain_equipment_info_content {
       padding: 0 30px;
+      .confirmBtn {
+        display: flex;
+        justify-content: flex-end;
+        margin: 20px 0;
+      }
       .equipment_item {
         font-size: 14px;
         padding: 15px;

src/views/bpm/handleTask/components/measuringToolInspection/submit.vue

@@ -1,16 +1,7 @@
 <template>
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
-      <el-form-item
-        label="审批建议"
-        prop="reason"
-        style="margin-bottom: 20px"
-        :rules="{
-          required: true,
-          message: '请选择',
-          trigger: 'change'
-        }"
-      >
+      <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px">
         <el-input
           type="textarea"
           v-model="form.reason"
@@ -62,9 +53,9 @@
         :loading="isSaveLoading"
         @click="submit(1)"
         v-if="['user_receive'].includes(this.taskDefinitionKey)"
-        >已收
+        >报工
       </el-button>
-      <el-button
+      <!-- <el-button
         icon="el-icon-edit-outline"
         type="danger"
         size="mini"
@@ -72,7 +63,7 @@
         @click="submit(0)"
         v-if="['user_receive'].includes(this.taskDefinitionKey)"
         >未收
-      </el-button>
+      </el-button> -->
     </div>
   </el-col>
 </template>
@@ -157,9 +148,9 @@
     },
     methods: {
       async submit(boolen) {
-        if (!this.form.reason) {
-          return this.$message.error('请输入审批意见');
-        }
+        // if (!this.form.reason) {
+        //   return this.$message.error('请输入审批意见');
+        // }
         let data = await this.getTableValue();
         let status = 10;
         let isSubmit = 0;
@@ -204,6 +195,20 @@
             break;
         }
         console.log(data);
+        if (
+          this.taskDefinitionKey === 'leader_receive' &&
+          !data.planDeviceList[0].leaderVerifyTime
+        ) {
+          this.$message.error('请先确认收到');
+          return false;
+        }
+        if (
+          this.taskDefinitionKey === 'team_leader_receive1' &&
+          !data.planDeviceList[0].teamVerifyTime
+        ) {
+          this.$message.error('请先确认收到');
+          return false;
+        }
         let params = {
           bpmTaskId: this.taskId,
           bpmTaskReason: this.form.reason,

src/views/bpm/handleTask/components/selectedCollectionOutbound/outsourcingOutbound.vue

@@ -306,7 +306,7 @@
                 ></el-table-column>
                 <el-table-column
                   label="物料代号"
-                  prop="meterielCode"
+                  prop="materielCode"
                   width="130"
                 >
                 </el-table-column>

src/views/bpm/tickets/components/signingUpWork.vue

@@ -44,6 +44,18 @@
                     item.substance.positionNames
                   }}</span>
                 </div>
+                <div class="item_info">
+                  <span class="item_label">固资编码</span>
+                  <span class="item_value">{{ item.substance.fixCode }}</span>
+                </div>
+                <div class="item_info">
+                  <span class="item_label">编号</span>
+                  <span class="item_value">{{
+                    item.substance.extInfo
+                      ? item.substance.extInfo.codeNumber
+                      : ''
+                  }}</span>
+                </div>
               </div>
               <p>操作事项</p>
               <div class="ruleMatters_box">