Merge remote-tracking branch 'origin/dev-nx' into dev-nx

sgzb-ui/src/views/store/warehousing/config.js

@@ -16,6 +16,7 @@ export const dialogConfig = {
         { 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: 'num', t_label: '设备数量' },
         { t_width: '', t_props: 'modelName', t_label: '入库人' },
         { t_width: '', t_props: 'createDate', t_label: '入库日期' },
     ],

sgzb-ui/src/views/store/warehousing/putInStore.vue

@@ -764,12 +764,11 @@
             @closeDialogOuter="closeDialogOuter"
         >
             <template slot="outerContent">
-                <el-table data="detailsList">
-                    <el-table-column></el-table-column>
-                    <el-table-column></el-table-column>
-                    <el-table-column></el-table-column>
-                    <el-table-column></el-table-column>
-                </el-table>
+                <TableMode
+                    :config="dialogConfig"
+                    :sendParams="sendParams"
+                    :sendApi="getInventoryWarehousingApi"
+                />
             </template>
         </DialogModel>
     </div>
@@ -948,7 +947,6 @@ export default {
             dialogConfig,
             getInventoryWarehousingApi,
             sendParams: {},
-            detailsList: [],
         }
     },
     created() {
@@ -1484,12 +1482,7 @@ export default {
         /* 查看详情 */
         async queryDetails(row) {
             this.sendParams.kindName = row.kindName
-            const { data: res } = await getInventoryWarehousingApi(
-                this.sendParams,
-            )
-            this.detailsList = res.rows
-            console.log(res, '详情--')
-            // this.dialogConfig.outerVisible = true
+            this.dialogConfig.outerVisible = true
         },
 
         /* 外层弹框关闭 */