库存盘点新增物料样式及内容调整

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue

@@ -1,19 +1,29 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="80%">
-    <ContentWrap>
+    <ContentWrap class="borderxx">
-      物料类型：<el-select v-model="queryReqVo.matType" placeholder="物料类型" clearable class="!w-240px">
+      <el-form class="-mb-15px" :model="queryReqVo" :inline="true" label-width="108px">
-            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label"
+        <el-form-item label="物料类型：">
-              :label="dict.label" :value="dict.label" />
+          <el-select v-model="queryReqVo.matType" placeholder="物料类型" clearable class="!w-240px">
+            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label" :label="dict.label" :value="dict.label" />
           </el-select>
-          物料名称/编码：<el-input v-model="queryReqVo.matCode" placeholder="物料名称/编码"  class="!w-240px" />
+        </el-form-item>
-          <el-button @click="handleQuery">
+        <el-form-item label=" 物料名称/编码：" label-width="150px">
+          <el-input v-model="queryReqVo.matCode" placeholder="物料名称/编码" class="!w-240px" />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary">
             <Icon icon="ep:search" class="mr-5px" /> 搜索
           </el-button><el-button @click="resetQuery">
             <Icon icon="ep:refresh" class="mr-5px" /> 重置
           </el-button>
-      <el-table ref="matSubFormRef" :data="list" v-loading="formLoading" class="hl-table"  @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800">
+        </el-form-item>
-        <el-table-column type="selection" width="55" :reserve-selection="true" :selectable="row=>chkboxEnable"  />
+      </el-form>
-        <el-table-column prop="no" label="序号" min-width="120" align="center" />
+    </ContentWrap>
+    <el-card class="hl-table">
+      <el-table ref="matSubFormRef" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800">
+        <el-table-column type="selection" width="55" :reserve-selection="true" :selectable="row=>chkboxEnable" />
+        <!-- <el-table-column prop="no" label="序号" min-width="120" align="center" /> -->
+        <el-table-column label="序号" type="index" min-width="120" align="center" />
         <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
         <el-table-column prop="matName" label="物料名称" min-width="140" align="center" />
         <el-table-column prop="matType" label="物料类型" min-width="120" align="center" />
@@ -25,9 +35,10 @@
         <el-table-column prop="storageOkQty" label="库存数量" min-width="120" align="center" />
         <el-table-column prop="matUnit" label="库存单位" min-width="120" align="center" />
       </el-table>
-   
+      <!-- 分页 -->
-  </ContentWrap>
+      <Pagination :total="total" v-model:page="queryReqVo.pageNo" v-model:limit="queryReqVo.pageSize" @pagination="handleQuery" />
-  <template #footer>
+    </el-card>
+    <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
@@ -52,15 +63,17 @@ const total = ref(0) // 列表的总页数
 const multipleSelection = ref([])
 const matSubFormRef = ref()
 
-const handleSelectionChange = async (val) =>{
+const handleSelectionChange = async (val) => {
-  multipleSelection.value = val;
+  multipleSelection.value = val
 }
 //指定key值,数据更新之后保留之前选中的数据
 const getRowKeys = (row) => {
-  return row.matId;
+  return row.matId
-};
+}
 
-const queryReqVo = reactive({
+const queryReqVo: any = reactive({
+  // pageNo: 1,
+  // pageSize: 10,
   noZero: undefined,
   whId: undefined,
   matCode: undefined,
@@ -70,6 +83,7 @@ const queryReqVo = reactive({
 const handleQuery = async () => {
   const data = await StorageLogApi.getStorageNowList(queryReqVo)
   list.value = data
+  // total.value = data.total
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
@@ -91,16 +105,17 @@ const open = async (noZero: number, whId?: number, isAll?: number) => {
   formLoading.value = true
   const data = await StorageLogApi.getStorageNowList(queryReqVo)
   list.value = data
-  chkboxEnable.value = isAll ===2 ? false :true
+  // total.value = data.total
+  chkboxEnable.value = isAll === 2 ? false : true
 
-  var iNum =1
+  var iNum = 1
-  list.value.forEach(row => {
+  list.value.forEach((row) => {
     row.isCopy = 0
     row.no = iNum
-    iNum =  iNum+1
+    iNum = iNum + 1
     setTimeout(() => {
-      matSubFormRef.value.toggleRowSelection(row,!chkboxEnable.value); //让页面显示选中的数据
+      matSubFormRef.value.toggleRowSelection(row, !chkboxEnable.value) //让页面显示选中的数据
-      }, 0);
+    }, 0)
 
     //matSubFormRef.value.toggleRowSelection(row,chkboxEnable.value)
   })
@@ -109,7 +124,6 @@ const open = async (noZero: number, whId?: number, isAll?: number) => {
   } finally {
     formLoading.value = false
   }
-
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -119,12 +133,10 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-
     dialogVisible.value = false
-    multipleSelection.value.forEach(item =>{
+    multipleSelection.value.forEach((item) => {
       item.matRest = item.storageOkQty
       item.storageOkQty = ''
-
     })
     // 发送操作成功的事件
     emit('success', multipleSelection.value)