From 4d56e27b0d64dcde053c6818eb691e6d64e9bf47 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Sun, 4 Feb 2024 11:04:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=89=A9=E6=96=99=E6=A0=B7=E5=BC=8F=E5=8F=8A=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/storagecheck/materials.vue | 76 +++++++++++--------
 1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue
index 2db48a09..62a87fb0 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue
@@ -1,19 +1,29 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <ContentWrap>
-      物料类型：<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" />
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="80%">
+    <ContentWrap class="borderxx">
+      <el-form class="-mb-15px" :model="queryReqVo" :inline="true" label-width="108px">
+        <el-form-item 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-button @click="handleQuery">
+        </el-form-item>
+        <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-table-column type="selection" width="55" :reserve-selection="true" :selectable="row=>chkboxEnable"  />
-        <el-table-column prop="no" label="序号" min-width="120" align="center" />
+        </el-form-item>
+      </el-form>
+    </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>
-  <template #footer>
+      <!-- 分页 -->
+      <Pagination :total="total" v-model:page="queryReqVo.pageNo" v-model:limit="queryReqVo.pageSize" @pagination="handleQuery" />
+    </el-card>
+    <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
@@ -38,7 +49,7 @@ import { ref } from 'vue'
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as StorageLogApi from '@/api/heli/storagelog'
 
-//:selectable="row=>row.disabled || chkboxEnable" 
+//:selectable="row=>row.disabled || chkboxEnable"
 const chkboxEnable = ref(true)
 
 const { t } = useI18n() // 国际化
@@ -49,18 +60,20 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const list = ref([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const multipleSelection = ref([]) 
+const multipleSelection = ref([])
 const matSubFormRef = ref()
 
-const handleSelectionChange = async (val) =>{
-  multipleSelection.value = val;
+const handleSelectionChange = async (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,17 +105,18 @@ 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
-  list.value.forEach(row => {
+  var iNum = 1
+  list.value.forEach((row) => {
     row.isCopy = 0
     row.no = iNum
-    iNum =  iNum+1
+    iNum = iNum + 1
     setTimeout(() => {
-      matSubFormRef.value.toggleRowSelection(row,!chkboxEnable.value); //让页面显示选中的数据
-      }, 0);
-    
+      matSubFormRef.value.toggleRowSelection(row, !chkboxEnable.value) //让页面显示选中的数据
+    }, 0)
+
     //matSubFormRef.value.toggleRowSelection(row,chkboxEnable.value)
   })
   try {
@@ -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)
@@ -132,4 +144,4 @@ const submitForm = async () => {
     formLoading.value = false
   }
 }
-</script>
\ No newline at end of file
+</script>