From f0a94ac0dbb596d842d657f332e4d8021f662c3b Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 5 Jun 2024 14:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=85=A5=E5=BA=93-=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/store/putInStore.js           |  7 +-
 sgzb-ui/src/views/store/warehousing/config.js | 22 ++++++
 .../views/store/warehousing/putInStore.vue    | 74 +++++++++++++------
 3 files changed, 79 insertions(+), 24 deletions(-)
 create mode 100644 sgzb-ui/src/views/store/warehousing/config.js

diff --git a/sgzb-ui/src/api/store/putInStore.js b/sgzb-ui/src/api/store/putInStore.js
index dbf7ead5..63b1c0c2 100644
--- a/sgzb-ui/src/api/store/putInStore.js
+++ b/sgzb-ui/src/api/store/putInStore.js
@@ -64,7 +64,12 @@ export function inputByCode(data) {
   })
 }
 
-
+// 查看盘点入库详情接口
+export const getInventoryWarehousingApi = (params) => {
+  return request.get(`/material/inventoryAndWarehousing/getDetail`, {
+    params
+  })
+}
 
 
 
diff --git a/sgzb-ui/src/views/store/warehousing/config.js b/sgzb-ui/src/views/store/warehousing/config.js
new file mode 100644
index 00000000..98d92cfb
--- /dev/null
+++ b/sgzb-ui/src/views/store/warehousing/config.js
@@ -0,0 +1,22 @@
+export const dialogConfig = {
+  outerWidth: '70%',
+  outerTitle: '查看',
+  outerVisible: false,
+  handleColShow: false, // 是否显示操作列
+  pageShow: true,  // 是否显示分页组件
+  isSelShow: false,// 表格是否需要复选框
+  isFormShow: true, // 是否显示表单查询组件
+  formLabel: [
+      { f_label: '关键字', f_model: 'keyWord', f_type: 'ipt', },
+  ],
+
+  columnsList: [
+      { t_width: '', t_props: 'putInType', t_label: '入库来源' },
+      { t_width: '', t_props: 'typeName', t_label: '设备类型' },
+      { t_width: '', t_props: 'typeModelName', t_label: '规格型号' },
+      { t_width: '', t_props: 'maCode', t_label: '设备编码' },
+      { t_width: '', t_props: 'modelName', t_label: '入库人' },
+      { t_width: '', t_props: 'createDate', t_label: '入库日期' },
+  ],
+
+}
diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index 5de10d36..bc1a75e9 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -55,19 +55,8 @@
             v-loading="loading"
             :data="returnList"
             @selection-change="handleSelectionChange"
+            border
         >
-            <!-- <el-table-column
-                label="序号"
-                align="center"
-                width="80"
-                type="index"
-            >
-                <template scope="scope">
-                    <span>{{
-                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
-                    }}</span>
-                </template>
-            </el-table-column> -->
             <el-table-column
                 align="center"
                 label="序号"
@@ -119,17 +108,16 @@
                 prop="remark"
                 :show-overflow-tooltip="true"
             />
-            <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']"
-          >审核</el-button>
-        </template>
-      </el-table-column> -->
+            <el-table-column label="操作" align="center">
+                <template slot-scope="{ row }">
+                    <el-button
+                        type="text"
+                        size="mini"
+                        @click="queryDetails(row)"
+                        >查看详情</el-button
+                    >
+                </template>
+            </el-table-column>
         </el-table>
 
         <pagination
@@ -769,6 +757,20 @@
                 <el-button @click="cancelCode">取 消</el-button>
             </div>
         </el-dialog>
+
+        <!-- 查看时详情弹框 -->
+        <DialogModel
+            :dialogConfig="dialogConfig"
+            @closeDialogOuter="closeDialogOuter"
+        >
+            <template slot="outerContent">
+                <TableMode
+                    :config="dialogConfig"
+                    :sendParams="sendParams"
+                    :sendApi="getInventoryWarehousingApi"
+                />
+            </template>
+        </DialogModel>
     </div>
 </template>
 
@@ -786,14 +788,23 @@ import {
     getTypeList,
     getDeviceTypeTree,
     inputByCode,
+    getInventoryWarehousingApi,
 } from '@/api/store/putInStore'
 import { getInfo } from '@/api/login'
 import { supplierInfoList } from '@/api/store/tools'
 import { getUnitData, getProData } from '@/api/claimAndRefund/receive'
 
+import DialogModel from '@/components/DialogModel'
+import TableMode from '@/components/TableModel'
+import { dialogConfig } from './config'
+
 export default {
     name: 'DevicesWarehousing',
     // dicts: ['sys_normal_disable'],
+    components: {
+        DialogModel,
+        TableMode,
+    },
     data() {
         return {
             // 用户信息
@@ -931,6 +942,11 @@ export default {
                     },
                 ],
             },
+
+            // 详情弹框配置
+            dialogConfig,
+            getInventoryWarehousingApi,
+            sendParams: {},
         }
     },
     created() {
@@ -1138,6 +1154,7 @@ export default {
             this.title = '数量盘点入库'
             this.resetCodeForm()
             this.getUnitData()
+            this.GetDeviceTypeTree()
             this.$nextTick(() => {
                 this.$refs['codeForm'].clearValidate()
             })
@@ -1151,6 +1168,7 @@ export default {
             this.title = '编码盘点入库'
             this.resetCodeForm()
             this.getUnitData()
+            this.GetDeviceTypeTree()
             this.$nextTick(() => {
                 this.$refs['codeForm'].clearValidate()
             })
@@ -1457,6 +1475,16 @@ export default {
             this.codeForm.proId = val
             // console.log('🚀 ~ changeProList ~ this.codeForm:', this.codeForm.proId);
         },
+        /* 查看详情 */
+        async queryDetails(row) {
+            this.sendParams.kindName = row.kindName
+            this.dialogConfig.outerVisible = true
+        },
+
+        /* 外层弹框关闭 */
+        closeDialogOuter() {
+            this.dialogConfig.outerVisible = false
+        },
     },
 }
 </script>