工序报工记录规则执行检查结果的审核流程

src/api/maintenance/patrol_maintenance.js

@@ -0,0 +1,146 @@
+import request from '@/utils/request';
+
+// 计划分页
+export async function getPage(data) {
+  const res = await request.get('/eam/planmaintenance/page', { params: data });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 更新或保存
+export async function saveOrUpdate(data) {
+  const res = await request.post('/eam/planmaintenance/saveOrUpdate', data);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 详情
+export async function getById(id) {
+  const res = await request.get(`/eam/planmaintenance/getById/${id}`);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 详情(维修)
+export async function getRepairInfoById(params) {
+  const res = await request.get(`/eam/planmaintenance/getRepairInfoById`, {
+    params
+  });
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 撤回
+export async function revocation(id) {
+  const res = await request.get(`/eam/planmaintenance/revocation/${id}`);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 撤回（量具送检）
+export async function revocationDelivery(id) {
+  const res = await request.get(`/eam/plan/revocation/${id}`);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 查询未派单设备数据
+export async function getNotSendOrderList(planId) {
+  const res = await request.get(
+    `/eam/planmaintenance/getNotSendOrderList/${planId}`
+  );
+  if (res.data.code == 0) {
+    return res.data?.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 派单
+export async function sendOrder(data) {
+  const res = await request.get(`/eam/planmaintenance/sendOrder`, {
+    params: data
+  });
+  if (res.data.code == 0) {
+    return res.data?.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 工单分页
+export async function getWorkOrderPage(data) {
+  const res = await request.get('/eam/workordermaintenance/page', {
+    params: data
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 详情
+export async function getWordOrderDetail(workOrderId) {
+  const res = await request.get(
+    `/eam/workordermaintenance/maintenanceDetail/${workOrderId}`
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 工单转派
+export async function workOrderRotate(data) {
+  const res = await request.get('/eam/workordermaintenance/rotate', {
+    params: data
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+export async function addAssists(data) {
+  const res = await request.get('/eam/workordermaintenance/addAssists', {
+    params: data
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 删除量具送检计划
+export async function workOrderDelete(data) {
+  const res = await request.delete('/eam/plan/delete', { data });
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 负责人已收
+export async function received(data) {
+  const res = await request.post('/eam/planTool/received', data);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 通过工单查询备品备件
+ */
+export async function getSpareParts(params) {
+  const res = await request.get(`/eam/workorder/getSpareParts`, { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/producetaskrecordrulesrecord/index.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request';
+
+// 一键报工，新增或修改填写表单类型的执行记录，并修改状态为已执行
+export async function saveOrUpdateAndSubmit(body) {
+  const res = await request.post(
+    '/mes/producetaskrulerecord/saveOrUpdateAndSubmit',
+    body
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 缓存，新增或修改填写表单类型的执行记录
+export async function saveOrUpdate(body) {
+  const res = await request.post(
+    '/mes/producetaskrulerecord/saveOrUpdate',
+    body
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 一键报工，新增或修改填写表单类型的执行记录，并修改状态为已执行
+export async function logicDelete(id) {
+  const res = await request.delete(
+    '/mes/producetaskrulerecord/logicDeleteById/' + id
+  );
+  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('/mes/producetaskrulerecord/getById/' + id);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

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

@@ -1,32 +1,5 @@
 <template>
-  <ele-modal
-    :title="title"
-    :visible.sync="visible"
-    :close-on-click-modal="false"
-    @close="handleClose"
-    resizable
-    maxable
-    width="80%"
-  >
-    <div
-      class="switch"
-      v-if="type == 'detail' && details && details.executeMethod == 2"
-      :maxable="true"
-      style="margin-bottom: 20px"
-    >
-      <div class="switch_left">
-        <ul>
-          <li
-            v-for="item in tabOptions"
-            :key="item.key"
-            :class="{ active: activeComp == item.key }"
-            @click="activeComp = item.key"
-          >
-            {{ item.name }}
-          </li>
-        </ul>
-      </div>
-    </div>
+  <div style="margin-top: 20px">
     <el-form
       v-if="details"
       ref="formRef"
@@ -44,7 +17,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="工序名称">
-            <el-input :value="details.taskTypeName" disabled></el-input>
+            <el-input :value="details.produceTaskName" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8"> </el-col>
@@ -86,7 +59,7 @@
       <el-row v-if="details.executeMethod == 2" style="margin-bottom: 20px">
         <el-col :span="8">
           <el-form-item label="记录规则名称">
-            <el-input :value="details.productModel" disabled></el-input>
+            <el-input :value="details.ruleName" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -474,11 +447,7 @@
         </el-tabs>
       </div>
     </el-form>
-
-    <template v-slot:footer>
-      <el-button @click="handleClose">返回</el-button>
-    </template>
-  </ele-modal>
+  </div>
 </template>
 
 <script>
@@ -490,6 +459,12 @@
   export default {
     name: 'editModal',
     mixins: [dictMixins],
+    props: {
+      // 业务id
+      businessId: {
+        default: ''
+      }
+    },
     data() {
       const formBaseData = {
         username: '',
@@ -503,8 +478,8 @@
         form: JSON.parse(JSON.stringify(formBaseData)),
         rules: {},
         tabOptions: [
-          { key: 'main', name: '记录表' },
-          { key: 'bpm', name: '流程详情' }
+          { key: 'main', name: '记录表1' },
+          { key: 'bpm', name: '流程详情2' }
         ],
         // 详情或者是审核
         type: 'detail',
@@ -524,28 +499,18 @@
         ruleInfo: ''
       };
     },
+    mounted() {
+      console.log('this.businessId', this.businessId);
+      this.getDatails(this.businessId);
+    },
     methods: {
-      // 外部调用，打开弹窗
-      open(data, type) {
-        this.type = type;
-        this.details = data;
-        this.title = type == 'detail' ? '详情' : '审核';
-        console.log('data', data);
-        this.getDatails(data.id);
-        if (data.executeMethod == 1) {
-          // 查询事项规则信息
-          this.maintenanceGetById(data.eamPlanId);
-          // 获取审核人列表数据
-          this.getUserList();
-        }
-        this.visible = true;
-      },
       // 关闭时清理表单
       handleClose() {
         this.visible = false;
       },
       // 获取详情
       async getDatails(id) {
+        console.log('获取数据');
         try {
           this.loading = true;
           const data = await getById(id);