增加 盘点主子表显示

src/views/wms/inventoryCheck/index.vue

@@ -1,14 +1,13 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+                :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <!-- <el-form-item label="表主键" prop="inventoryCheckId">
-              <el-input v-model="queryParams.inventoryCheckId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />
-            </el-form-item> -->
             <el-form-item label="盘点单号" prop="checkCode">
-              <el-input v-model="queryParams.checkCode" placeholder="请输入盘点单号" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.checkCode" placeholder="请输入盘点单号" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
             <!-- <el-form-item label="物料大类" prop="materialCategoryId">
               <el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
@@ -23,51 +22,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <!-- <el-form-item label="盘点类型" prop="checkType">
-              <el-select v-model="queryParams.checkType" placeholder="请选择盘点类型" clearable >
-                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="盘点状态" prop="checkStatus">
-              <el-select v-model="queryParams.checkStatus" placeholder="请选择盘点状态" clearable >
-                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item label="审核人" prop="auditBy">
-              <el-input v-model="queryParams.auditBy" placeholder="请输入审核人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="审核时间" prop="auditTime">
-              <el-date-picker clearable
-                v-model="queryParams.auditTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择审核时间"
-              />
-            </el-form-item> -->
-            <!-- <el-form-item label="审核状态(0待审核,1审核通过,2审核未通过)" prop="auditStatus">
-              <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态(0待审核,1审核通过,2审核未通过)" clearable >
-                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item label="审核意见" prop="auditComments">
-              <el-input v-model="queryParams.auditComments" placeholder="请输入审核意见" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="开始时间" prop="beginTime">
-              <el-date-picker clearable
-                v-model="queryParams.beginTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择开始时间"
-              />
-            </el-form-item>
-            <el-form-item label="结束时间" prop="endTime">
-              <el-date-picker clearable
-                v-model="queryParams.endTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择结束时间"
-              />
-            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -76,27 +30,36 @@
         </el-card>
       </div>
     </transition>
-
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:inventoryCheck:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:inventoryCheck:add']">
+              新增
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:inventoryCheck:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                       v-hasPermi="['system:inventoryCheck:edit']">修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:inventoryCheck:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                       v-hasPermi="['system:inventoryCheck:remove']">删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:inventoryCheck:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+                       v-hasPermi="['system:inventoryCheck:export']">导出
+            </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true"
+                         @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
+<!--主表-->
-      <el-table v-loading="loading" :data="inventoryCheckList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="inventoryCheckList" @selection-change="handleSelectionChange"
+                @row-click="selectCheckRecord">
         <el-table-column type="selection" width="55" align="center"/>
         <!-- <el-table-column label="表主键" align="center" prop="inventoryCheckId" v-if="columns[0].visible"/> -->
         <el-table-column label="盘点单号" align="center" prop="checkCode" v-if="columns[2].visible"/>
@@ -138,16 +101,74 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:inventoryCheck:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['system:inventoryCheck:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:inventoryCheck:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['system:inventoryCheck:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                  v-model:limit="queryParams.pageSize" @pagination="getList"/>
+<!--子表-->
+
+
+    </el-card>
+    <el-card style="margin-top: 8px" shadow="never">
+    <el-table v-loading="RecordLoading" :data="inventoryCheckRecordList">
+      <el-table-column type="selection" width="55" align="center"/>
+      <!--        <el-table-column label="盘点记录主键" align="center" prop="icRecordId" v-if="columns[0].visible"/>-->
+      <!--        <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[1].visible">-->
+      <!--        </el-table-column>-->
+      <el-table-column label="盘点单号" align="center" prop="checkCode" />
+      <el-table-column label="批次码" align="center" prop="batchCode"/>
+      <el-table-column label="库位编码" align="center" prop="locationCode"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" />
+      <el-table-column label="物料名称" align="center" prop="materialName" />
+      <el-table-column label="库存数量" align="center" prop="inventoryQty" />
+      <el-table-column label="盘点数量" align="center" prop="checkQty" />
+      <el-table-column label="盘点状态" align="center" prop="checkStatus" >
+        <!--          <template #default="scope">-->
+        <!--            <dict-tag :options="wms_stock_result" :value="scope.row.checkStatus"/>-->
+        <!--          </template>-->
+      </el-table-column>
+      <!--        <el-table-column label="erp同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[13].visible">-->
+      <!--          <template #default="scope">-->
+      <!--            <dict-tag :options="erp_synchronous_status" :value="scope.row.erpSynchronousStatus"/>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="erp同步数量" align="center" prop="erpSynchronousQty" v-if="columns[14].visible"/>-->
+      <!--        <el-table-column label="是否发起调整" align="center" prop="isAdjust" >
+                <template #default="scope">
+                  <dict-tag :options="wms_stock_if" :value="scope.row.isAdjust"/>
+                </template>
+              </el-table-column>
+
+              <el-table-column label="调整状态" align="center" prop="adjustStatus" >
+                <template #default="scope">
+                  <dict-tag :options="wms_stockadjust_status" :value="scope.row.adjustStatus"/>
+                </template>
+              </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-tooltip content="修改" placement="top">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                       v-hasPermi="['system:inventoryCheckRecord:edit']"></el-button>
+          </el-tooltip>
+          <el-tooltip content="删除" placement="top">
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                       v-hasPermi="['system:inventoryCheckRecord:remove']"></el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="RecordTotal > 0" :total="RecordTotal" v-model:page="recordQueryParams.pageNum"
+                v-model:limit="recordQueryParams.pageSize" />
   </el-card>
     <!-- 添加或修改库存盘点对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -254,18 +275,32 @@
 </template>
 
 <script setup name="InventoryCheck" lang="ts">
-import { listInventoryCheck, getInventoryCheck, delInventoryCheck, addInventoryCheck, updateInventoryCheck } from '@/api/wms/inventoryCheck';
+import {
+  listInventoryCheck,
+  getInventoryCheck,
+  delInventoryCheck,
+  addInventoryCheck,
+  updateInventoryCheck
+} from '@/api/wms/inventoryCheck';
 import {InventoryCheckVO, InventoryCheckQuery, InventoryCheckForm} from '@/api/wms/inventoryCheck/types';
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 import {UserForm, UserQuery, UserVO} from '@/api/system/user/types';
 import api from '@/api/system/user';
 
 import {getBaseMaterialCategoryListInWMS} from '@/api/wms/baseMaterialCategory';
+import {listInventoryCheckRecord} from "@/api/wms/inventoryCheckRecord";
+import {InventoryCheckRecordVO} from "@/api/wms/inventoryCheckRecord/types";
 
 
 const {proxy} = getCurrentInstance() as ComponentInternalInstance;
-const { material_mategories, wms_stocking_type, approve_status, wms_stocking_status } = toRefs<any>(proxy?.useDict('material_mategories','wms_stocking_type','approve_status','wms_stocking_status'));
+const {
+  material_mategories,
+  wms_stocking_type,
+  approve_status,
+  wms_stocking_status
+} = toRefs<any>(proxy?.useDict('material_mategories', 'wms_stocking_type', 'approve_status', 'wms_stocking_status'));
 const inventoryCheckList = ref<InventoryCheckVO[]>([]);
+const inventoryCheckRecordList = ref<InventoryCheckRecordVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -273,7 +308,8 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-
+const RecordTotal = ref(0);
+const RecordLoading = ref(true);
 const queryFormRef = ref<ElFormInstance>();
 const inventoryCheckFormRef = ref<ElFormInstance>();
 const userList = ref<UserVO[]>();
@@ -334,8 +370,7 @@ const data = reactive<PageData<InventoryCheckForm, InventoryCheckQuery>>({
     auditComments: undefined,
     beginTime: undefined,
     endTime: undefined,
-    params: {
+    params: {}
-    }
   },
   rules: {
     inventoryCheckId: [
@@ -378,6 +413,10 @@ const data = reactive<PageData<InventoryCheckForm, InventoryCheckQuery>>({
 });
 
 const {queryParams, form, rules} = toRefs(data);
+const recordQueryParams = {
+  pageNum: 1,
+  pageSize: 10
+}
 let baseStoreList = ref([]);
 /** 查询车间下拉树结构 */
 const getBaseWarehouseListsss = async () => {
@@ -397,7 +436,14 @@ const getList = async () => {
   total.value = res.total;
   loading.value = false;
 }
+const selectCheckRecord = async (e) => {
+  RecordLoading.value = true;
+  const res = await listInventoryCheckRecord({checkCode: e.checkCode ,pageSize : recordQueryParams.pageSize ,pageNum: recordQueryParams.pageNum});
+  inventoryCheckRecordList.value = res.rows;
+  RecordTotal.value = res.total;
+  RecordLoading.value = false;
 
+}
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -487,7 +533,6 @@ const getMaterialCategorySelect = async () => {
 };
 
 
-
 onMounted(() => {
   getMaterialCategorySelect();
   getUserList();