Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/api/warehouseManagement/index.js

@@ -323,5 +323,25 @@ export default {
       return res.data.data;
     }
     return Promise.reject(new Error(res.data.message));
-  }
+  },
+  //解锁详情
+  getUnlockDetails: async (id) => {
+    const res = await request.get(
+      `/wms/inventoryUnlockApprove/getById/${id}`
+    );
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
+  },
+  //解锁驳回
+  notUnlockPass: async (data) => {
+    const res = await request.put(
+      `/bpm/inventoryUnlockApprove/notPass`, data
+    );
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
+  },
 };

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

@@ -2,27 +2,25 @@
   <div>
     <el-descriptions>
           <el-descriptions-item label="创建时间">{{ formData.createTime }}</el-descriptions-item>
-          <el-descriptions-item label="创建人">{{ formData.createUser }}</el-descriptions-item>
-          <el-descriptions-item label="物品编码">{{ formData.inventoryCode }}</el-descriptions-item>
-          <el-descriptions-item label="名称">{{ formData.name }}</el-descriptions-item>
-          <el-descriptions-item label="批次号">{{ formData.batchNum }}</el-descriptions-item>
-          <el-descriptions-item label="规格">{{ formData.spec }}</el-descriptions-item>
-          <el-descriptions-item label="型号">{{ formData.model }}</el-descriptions-item>
-          <el-descriptions-item label="牌号">{{ formData.certificateNumber }}</el-descriptions-item>
+          <!-- <el-descriptions-item label="创建人">{{ formData.createUser }}</el-descriptions-item> -->
+          <el-descriptions-item label="物品编码">{{ formData.productCode }}</el-descriptions-item>
+          <el-descriptions-item label="名称">{{ formData.productName }}</el-descriptions-item>
+          <el-descriptions-item label="批次号">{{ formData.batchNo }}</el-descriptions-item>
+          <el-descriptions-item label="解锁编码">{{ formData.unlockNo }}</el-descriptions-item>
+          <!-- <el-descriptions-item label="型号">{{ formData.model }}</el-descriptions-item> -->
+          <!-- <el-descriptions-item label="牌号">{{ formData.certificateNumber }}</el-descriptions-item> -->
       </el-descriptions>
       <div style="margin-top: 12px">
         <ele-pro-table
           ref="eleTable"
-          row-key="outInDetailId"
-          :columns="tableColumns"
-          :datasource="datasource"
+          :columns="columns"
+          :datasource="formData.details"
           height="calc(100vh - 405px)"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :pageSize="20"
-          @selection-change="handleSelectionChange"
           :initLoad="false"
-          @done="onDone"
+          :needPage="false"
         >
           <template v-slot:measureQuantity="{ row }">
             <el-input
@@ -62,6 +60,7 @@
   import { getDetail } from '@/api/bpm/components/changeManage/index.js';
   // import fileMain from '@/components/addDoc/index.vue';
   import { relationTypeList } from '@/enum/dict.js';
+  import storageApi from '@/api/warehouseManagement/index.js';
 
   const defForm = {
     name: '',
@@ -87,9 +86,67 @@
     },
     data() {
       return {
-        form: {
-          ...defForm
-        }
+        formData: {
+          // ...defForm
+        },
+        LockOrderSourceTypeEnum: {
+          0: '无定义',
+          1: '销售发货单',
+          2: '领料出库单',
+          3: '调拨出库单',
+          4: '销售订单'
+        },
+        columns: [
+          {
+            columnKey: 'selection',
+            type: 'selection',
+            width: 45,
+            align: 'center'
+          },
+          {
+            columnKey: 'index',
+            type: 'index',
+            width: 50,
+            align: 'center',
+            label: '序号',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            prop: 'quantity',
+            label: '锁定数量',
+            showOverflowTooltip: true,
+            width: 130,
+            align: 'center'
+          },
+          {
+            prop: 'unionQuantity',
+            label: '解锁数量',
+            slot: 'unionQuantity',
+            // sortable: 'custom',
+            showOverflowTooltip: true,
+            width: 130,
+            align: 'center'
+          },
+          {
+            prop: 'sourceOrderNo',
+            label: '关联单据编码',
+            align: 'center'
+          },
+          {
+            prop: 'sourceType',
+            label: '关联单据类型',
+            align: 'center',
+            formatter: (row) => {
+              return this.LockOrderSourceTypeEnum[row.sourceType] || '-';
+            }
+          },
+          {
+            prop: 'orderDate',
+            label: '锁定时间',
+            align: 'center'
+          },
+        ],
       };
     },
     created() {
@@ -98,7 +155,7 @@
     methods: {
       //获取详情
       async getInfo(id) {
-        this.form = await getDetail(id);
+        this.formData = await storageApi.getUnlockDetails(id);
       }
     }
   };

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

@@ -37,12 +37,12 @@
         >驳回
       </el-button>
 
-      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+      <!-- <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
         <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item command="cancel">作废</el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown>
+      </el-dropdown> -->
     
     </div>
   </el-col>
@@ -52,6 +52,7 @@
   import { UpdateInformation, cancel } from '@/api/bpm/components/contractManage/contractBook';
   import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
+  import storageApi from '@/api/warehouseManagement/index.js';
 
   // 流程实例的详情页，可用于审批
   export default {
@@ -98,20 +99,31 @@
       handleBackList() {
         this.$emit('handleBackList');
       },
+      
 
 
       async handleAudit(status) {
+
+        console.log(this.id);
+
         let variables = {
           pass: !!status
         };
 
-        let API = !!status ? approveTaskWithVariables : rejectTask;
-        API({
+        let API = !!status ? approveTaskWithVariables : storageApi.notUnlockPass;
+
+        const params =  !!status ? {
           id: this.taskId,
           reason: this.form.reason,
           variables
-        }).then((res) => {
-          if (res.data.code != '-1') {
+        } : {
+          businessId: this.businessId,
+          id: this.taskId,
+          reason: this.form.reason,
+        }
+        API(params).then((res) => {
+          console.log('API~~~', res);
+          if (res?.data?.code != '-1') {
             this.$emit('handleAudit', {
               status,
               title: status === 0 ? '驳回' : ''