领料成套流程完善

src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue

@@ -163,6 +163,71 @@
                     <!--            </template>-->
                     <!--          </el-table-column>-->
                 </el-table>
+
+                <el-table v-if="wholeTypeNameList.length > 0" :data="wholeTypeNameList">
+                    <el-table-column type="index" align="center" />
+                    <el-table-column type="expand">
+                        <template slot-scope="{ row }">
+                            <el-table :data="row.childrenList">
+                                <el-table-column label="序号" align="center" type="index" />
+                                <el-table-column
+                                    label="机具名称"
+                                    align="center"
+                                    prop="typeName"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column
+                                    label="规格型号"
+                                    align="center"
+                                    prop="typeModelName"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column
+                                    label="计量单位"
+                                    align="center"
+                                    prop="unitName"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column label="当前库存" align="center" prop="num" show-overflow-tooltip />
+                                <el-table-column
+                                    label="预出库数量"
+                                    align="center"
+                                    prop="outNum"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column label="差缺量" align="center" prop="" show-overflow-tooltip>
+                                    <template
+                                        slot-scope="scope"
+                                        v-if="Number(scope.row.outNum) - Number(scope.row.num) > 0"
+                                    >
+                                        <span style="color: red; cursor: pointer" @click="handleDifference(scope.row)">
+                                            {{ Number(scope.row.outNum) - Number(scope.row.num) }}
+                                        </span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="预领数量" align="center" prop="preNum" show-overflow-tooltip />
+                                <el-table-column label="申请人" align="center" prop="applyFor" show-overflow-tooltip />
+                                <el-table-column
+                                    label="申请时间"
+                                    align="center"
+                                    prop="updateTimes"
+                                    show-overflow-tooltip
+                                />
+                                <el-table-column
+                                    label="任务状态"
+                                    align="center"
+                                    prop="taskName"
+                                    show-overflow-tooltip
+                                />
+
+                                <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+                            </el-table>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="wholeTypeName" align="center" label="成套设备名称" />
+                    <el-table-column align="center" prop="wholeTypeNum" label="成套设备数量" width="260">
+                    </el-table-column>
+                </el-table>
             </el-col>
 
             <el-col :span="6">
@@ -318,6 +383,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
+import { queryCompleteSetToolsApi } from '@/api/store/completeTools.js'
 import {
     auditLeaseByCompanyCq,
     getLeaseListAllCq,
@@ -476,6 +542,8 @@ export default {
                     label: '领料数量',
                 },
             ],
+
+            wholeTypeNameList: [],
         }
     },
     computed: {
@@ -661,6 +729,32 @@ export default {
             } else {
                 this.flowPath = this.flowPath
             }
+
+            if (res.rows[0].ctLeaseApplyDetails) {
+                this.getCtFileList(res.rows[0].ctLeaseApplyDetails)
+            }
+        },
+
+        // 生成成套附属设备
+        getCtFileList(ctData) {
+            for (const key in ctData) {
+                const ctList = {
+                    wholeTypeName: key,
+                    wholeTypeNum: ctData[key][0].setsNum,
+                    childrenList: [],
+                }
+                ctList.childrenList = ctData[key].map((e) => {
+                    return {
+                        ...e,
+                        applyFor: this.queryParams.applyFor,
+                        updateTimes: this.queryParams.updateTimes,
+                        taskName: this.queryParams.taskName,
+                    }
+                })
+                this.wholeTypeNameList.push(ctList)
+            }
+
+            console.log(this.wholeTypeNameList, ' this.wholeTypeNameList')
         },
         // 取消按钮
         cancel() {

src/views/store/poleConfig/poleConfig.vue

@@ -397,6 +397,8 @@ export default {
             }
             this.$message.closeAll()
             const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes()
+
+            console.log('checkNode', checkNode)
             this.recursionGetDeviceName(this.deviceTypeTreeNew, val[val.length - 2])
             if (checkNode.length < 1) return
 
@@ -408,7 +410,7 @@ export default {
                 deviceAscription: '抱杆设备', // 所属类型
                 ascriptionType: 1, // 所属类型 1 主体设备 2 配套设备
                 typeName: this.deviceName,
-                isStorage: checkNode[0].isStorage,
+                isStorage: checkNode[0].data.isStorage,
             }
 
             if (this.tempList.length === 0) {
@@ -446,6 +448,7 @@ export default {
                 deviceAscription: '配套设备', // 所属类型
                 ascriptionType: 2, // 所属类型 1 主体设备 2 配套设备
                 typeName: this.deviceName,
+                isStorage: checkNode[0].data.isStorage,
             }
 
             // 先判断当前所选的配套设备是否已选择为主体设备