出库优化

src/views/claimAndreturn/picking/apply/component/AddPicking1.vue

@@ -705,6 +705,7 @@ export default {
       this.queryParams.agreementCode = data.agreementCode
       this.queryParams.agreementId = data.agreementId
       this.queryParams.estimateLeaseTime = data.estimateLeaseTime
+      this.queryParams.wholeTypeName = data.wholeTypeName
 
       // this.queryParams.leaseType = data.leaseType
       this.$set(this.queryParams, 'leaseType', data.leaseType)

src/views/claimAndreturn/picking/outbound/index.vue

@@ -1,14 +1,7 @@
 <template>
   <!-- 领料出库 -->
   <div class="app-container">
-        <el-form
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="80px"
-        >
       <el-form-item label="领料单号" prop="code">
         <el-input
           v-model="queryParams.code"
@@ -20,13 +13,7 @@
       </el-form-item>
       <el-form-item label="单位名称" prop="unitId">
         <el-select v-model="queryParams.unitId" placeholder="请选择单位名称" clearable>
-                    <el-option
+          <el-option v-for="item in unitList" filterable :key="item.id" :label="item.name" :value="item.id"></el-option>
-                        v-for="item in unitList"
-                        filterable
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="工程名称" prop="proId">
@@ -90,24 +77,12 @@
         prop="createTimes"
         :show-overflow-tooltip="true"
       ></el-table-column>
-            <el-table-column
+      <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true"></el-table-column>
-                label="已出库数量"
+      <el-table-column label="出库状态" align="center" prop="taskName" :show-overflow-tooltip="true"></el-table-column>
-                align="center"
-                prop="alNum"
-                :show-overflow-tooltip="true"
-            ></el-table-column>
-            <el-table-column
-                label="出库状态"
-                align="center"
-                prop="taskName"
-                :show-overflow-tooltip="true"
-            ></el-table-column>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-                    <el-button size="mini" @click="handleView(scope.row)" v-hasPermi="['picking:outbound:view']"
+          <el-button size="mini" @click="handleView(scope.row)" v-hasPermi="['picking:outbound:view']">查看</el-button>
-                        >查看</el-button
-                    >
           <el-button
             size="mini"
             type="primary"
@@ -149,9 +124,7 @@
           />
         </el-form-item>
         <el-form-item>
-                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery"
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
-                        >查询</el-button
-                    >
           <el-button icon="el-icon-refresh" size="mini" @click="resetDialogQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -174,6 +147,12 @@
             <el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
           </template>
         </el-table-column>
+        <el-table-column prop="deviceType" align="center" label="是否成套管理">
+          <template slot-scope="{ row }">
+            <el-tag size="mini" type="primary" v-if="row.isCt == 0">是</el-tag>
+            <el-tag size="mini" type="warning" v-if="row.isCt == 1">否</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" v-if="isView">
           <template slot-scope="{ row }" v-if="row.alNum > 0">
             <el-button type="text" @click="onPreviewRecord(row)">出库记录</el-button>
@@ -198,7 +177,9 @@
             >
               数量出库
             </el-button>
-                        <el-button size="mini" type="primary" v-if="scope.row.isStorage == 0"> 查看附件 </el-button>
+            <el-button size="mini" type="primary" v-if="scope.row.isCt == 0" @click="onViewFile(scope.row)">
+              查看附件
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -245,6 +226,21 @@
           <el-table-column align="center" label="出库人" prop="userName" show-overflow-tooltip />
         </el-table>
       </el-dialog>
+
+      <el-dialog title="附件详情" :visible.sync="openFileVisible" width="50%" append-to-body>
+        <el-table :data="fileList">
+          <!-- <el-table-column align="center" prop="typeName" label="设备名称" /> -->
+          <el-table-column align="center" label="规格型号" prop="deviceType" />
+          <el-table-column align="center" label="是否管理库存">
+            <template slot-scope="{ row }">
+              <el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
+              <el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="预领数量" prop="deviceNum" align="center" />
+          <el-table-column align="center" label="库存数量" prop="num" />
+        </el-table>
+      </el-dialog>
     </el-dialog>
 
     <!-- 编码出库 -->
@@ -439,6 +435,7 @@ import {
   getLeaseListAll,
   getLeaseOutOrder,
 } from '@/api/claimAndRefund/receive.js'
+import { queryCompleteSetToolsApi } from '@/api/store/completeTools.js'
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
 import Treeselect from '@riophae/vue-treeselect'
@@ -538,6 +535,8 @@ export default {
       // 领料任务详情数据
       leaseOutDetailRecord: [],
       leaseOutData: {},
+      openFileVisible: false,
+      fileList: [],
     }
   },
   created() {
@@ -831,6 +830,21 @@ export default {
         this.leaseOutDetailParams.endTime = ''
       }
     },
+
+    // 查看附件
+    async onViewFile(row) {
+      console.log(row)
+
+      const res = await queryCompleteSetToolsApi({
+        id: row.ctParentId,
+        wholeTypeName: row.typeName,
+        wholeTypeNum: 1,
+      })
+
+      this.fileList = res.data
+
+      this.openFileVisible = true
+    },
   },
 }
 </script>