Просмотр исходного кода

feat(qualityReportApproval): 新增合格证详情获取功能并简化审批表单

yusheng 3 месяцев назад
Родитель
Сommit
1d60c60dc4

+ 11 - 1
src/api/bpm/components/qualityReportApproval/qualityReportApproval.js

@@ -29,4 +29,14 @@ export async function getDetailById(id) {
     return res.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+
+
+// 获取合格证详情
+export async function getCertifiById(id) {
+  const res = await request.get(`/qms/qmscertificatemanagement/getById/${id}`);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 5 - 1
src/views/bpm/handleTask/components/qualityReportApproval/detailDialog.vue

@@ -18,7 +18,8 @@
   import {
     getDetail,
     getListDetail,
-    getDetailById
+    getDetailById,
+    getCertifiById
   } from '@/api/bpm/components/qualityReportApproval/qualityReportApproval';
   import browse from '@/components/jimureport/browse.vue';
   import { getJmPrintViewUrl } from '@/components/jimureport//api.js';
@@ -69,6 +70,9 @@
         if (this.businessType?.includes('质检受托单')) {
           api = requestentrustGetById;
         }
+        if (this.businessType?.includes('合格证')) {
+          api = getCertifiById;
+        }
         const detail = await api(this.businessId);
         // this.reportData = detail;
         // this.showEditFlag = true;

+ 15 - 134
src/views/bpm/handleTask/components/qualityReportApproval/submit.vue

@@ -1,43 +1,6 @@
 <template>
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
-      <el-form-item
-        v-if="taskDefinitionKey === 'deptLeaderAssign'"
-        label="采购部门"
-        prop="userId"
-        style="margin-bottom: 20px"
-      >
-        <deptSelect
-        
-          v-model="form.useDeptId"
-          @changeGroup="searchDeptNodeClick"
-        />
-      </el-form-item>
-      <el-form-item
-        v-if="taskDefinitionKey === 'deptLeaderAssign'"
-        label="采购员"
-        prop="userId"
-        style="margin-bottom: 20px"
-        :rules="{
-          required: true,
-          message: '请选择',
-          trigger: 'change'
-        }"
-      >
-        <el-select
-          v-model="form.userId"
-          clearable
-          style="width: 100%"
-          :filterable="true"
-        >
-          <el-option
-            v-for="item in userOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item
         label="审批建议"
         style="margin-bottom: 20px"
@@ -100,23 +63,16 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
-  import { listAllUserBind } from '@/api/system/organization';
   import {
-    assign,
-    cancel,
-    UpdateInformation
-  } from '@/api/bpm/components/purchasingManage/purchasePlanManage';
-  import deptSelect from '@/components/CommomSelect/dept-select.vue';
-  import { getUserPage } from '@/api/system/organization';
-  import storageApi from '@/api/warehouseManagement';
+    approveTaskWithVariables,
+    rejectTask,
+    cancelTask
+  } from '@/api/bpm/task';
 
   // 流程实例的详情页,可用于审批
   export default {
     name: '',
-    components: {
-      deptSelect
-    },
+    components: {},
     props: {
       businessId: {
         default: ''
@@ -133,21 +89,11 @@
     },
     data() {
       return {
-        form: {
-          userId: '',
-          reason: '',
-          useDeptId: ''
-        },
-        userOptions: [],
-        isSaveLoading:false
+        form: {},
+        isSaveLoading: false
       };
     },
-    created() {
-      this.userOptions = [];
-      listAllUserBind().then((data) => {
-        this.userOptions.push(...data);
-      });
-    },
+    created() {},
     methods: {
       /** 处理转办审批人 */
       handleUpdateAssignee() {
@@ -157,77 +103,18 @@
       handleBackList() {
         this.$emit('handleBackList');
       },
-      searchDeptNodeClick(val) {
-        console.log(val, 'val');
-        getUserPage({
-          groupId: val,
-          size: 999
-        }).then((data) => {
-          this.userOptions = data.list;
-        });
-      },
-      async storeManagerApprove() {
-        let res = await this.getTableValue();
-        let storageData = res.returnStorageData;
-        if(!storageData){
-         return
-        }
-        storageData.isSkip = 1;
-        try {
-          this.isSaveLoading = true;
-          await storageApi.storage(storageData);
-          approveTaskWithVariables({
-            id: this.taskId,
-            reason: this.form.reason,
-            variables: {
-              pass: true
-            }
-          }).then((res) => {
-            if (res.code != '-1') {
-              this.$emit('handleAudit', {
-                status: 1,
-                title: '入库'
-              });
-            }
-            this.isSaveLoading = false;
-          });
-        } catch (error) {
-          this.isSaveLoading = false;
-          this.$message.error('保存失败');
-        }
-      },
+
       async handleAudit(status) {
-        let userInfo = this.userOptions.find(
-          (item) => item.id == this.form.userId
-        );
-        //主管指派采购员
-        // if (this.taskDefinitionKey === 'deptLeaderAssign') {
-        //   if (!this.form.userId) {
-        //     this.$message.warning(`请选择采购员!`);
-        //     return;
-        //   }
-        //   await assign({
-        //     userId: userInfo.id,
-        //     userName: userInfo.name,
-        //     id: this.taskId,
-        //     reason: this.form.reason,
-        //     businessId: this.businessId
-        //   });
-        // }
-        // //采购员核对
-        // if (this.taskDefinitionKey === 'purchaserCheck') {
-        //   let arr = await this.getTableValue();
-        //   if (!arr) {
-        //     return;
-        //   }
-        //   await UpdateInformation(arr);
-        // }
+        // let userInfo = this.userOptions.find(
+        //   (item) => item.id == this.form.userId
+        // );
+
         let API = !!status ? approveTaskWithVariables : rejectTask;
         await API({
           id: this.taskId,
           reason: this.form.reason,
           variables: {
-            userId: userInfo?.id,
+            // userId: userInfo?.id,
             pass: !!status
           }
         });
@@ -249,13 +136,7 @@
           title: status === 0 ? '驳回' : ''
         });
       },
-      getTableValue() {
-        return new Promise((resolve, reject) => {
-          this.$emit('getTableValue', async (data) => {
-            resolve(await data);
-          });
-        });
-      },
+
       //更多
       handleCommand(command) {
         if (command === 'cancel') {