From 547e4d9d68b7667c04de79fa12d3200a074c6c16 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Thu, 1 Feb 2024 12:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9=20?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=89=A9=E6=96=99=E5=88=97=E8=A1=A8=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

库存盘点 选中物料列表交互
---
 .../views/heli/storagecheck/checkdetail.vue   | 14 +++++----
 .../src/views/heli/storagecheck/materials.vue | 31 +++++++++++++++----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
index 46ae0cff..c4bd62e1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
@@ -62,7 +62,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="排除库存为0的物料?" prop="noZero">
-                  <el-radio-group v-model="formData.noZero" >
+                  <el-radio-group v-model="formData.noZero" disabled>
                     <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value"
                       :label="dict.value">
                       {{ dict.label }}
@@ -75,7 +75,7 @@
               <el-col :span="24">
                 <el-form-item label="盘点开始日期" prop="checkTime">
                   <el-date-picker v-model="formData.checkTime" value-format="x" placeholder="盘点开始时间" 
-                    class="!w-220px" />
+                    class="!w-220px" disabled />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -84,7 +84,7 @@
         <el-row>
           <el-col :span="20">
             <el-form-item label="备注" prop="description">
-              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200"  />
+              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -98,7 +98,7 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-button class="hl-addbutton" type="primary" size="large" @click="openMatForm(1)">新增</el-button>
+                <el-button class="hl-addbutton" type="primary" size="large" @click="openMatForm">新增</el-button>
               </el-col>
               <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules"
                 v-loading="subFormLoading" label-width="0">
@@ -323,8 +323,9 @@ const formRef = ref() // 表单 Ref
 const matSubFormRef = ref() //子表单 Ref
 const matOpenFormRef = ref()
 
-const openMatForm = (noZero: number,whId?: number,isAll?: number) => {
-  matOpenFormRef.value.open(noZero,whId, isAll)
+const openMatForm = () => {
+  //noZero: number,whId?: number,isAll?: number
+  matOpenFormRef.value.open(formData.value.noZero,formData.value.whId, formData.value.checkType)
 }
 
 const subFormLoading = ref(false) // 子表单的加载中
@@ -353,6 +354,7 @@ const handleStatus = async (num) => {
 const getList = async (arrMat) => {
   message.alertWarning('数组个数为:'+arrMat.length)
 
+  formData.value.matItemDOList = arrMat
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
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 9868d86f..36cca875 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,9 +1,9 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form ref="matSubFormRef" :model="list" v-loading="formLoading" label-width="0">
-      <el-table :data="list" class="hl-table"  @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" disabled="true" />
-        <el-table-column prop="cid" label="序号" :width="80" />
+    <el-form  :model="list" v-loading="formLoading" label-width="0" >
+      <el-table ref="matSubFormRef" :data="list" 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 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" />
@@ -23,9 +23,12 @@
   </Dialog>
 </template>
 <script setup lang="ts">
+import { ref } from 'vue'
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as StorageLogApi from '@/api/heli/storagelog'
 
+//:selectable="row=>row.disabled || chkboxEnable" 
+const chkboxEnable = ref(true)
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -36,11 +39,15 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const list = ref([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const multipleSelection = ref([]) 
+const matSubFormRef = ref()
 
 const handleSelectionChange = async (val) =>{
   multipleSelection.value = val;
 }
-
+//指定key值,数据更新之后保留之前选中的数据
+const getRowKeys = (row) => {
+  return row.matId;
+};
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10
@@ -51,13 +58,25 @@ const open = async (noZero: number, whId?: number, isAll?: number) => {
   dialogVisible.value = true
   dialogTitle.value = '物料列表'
 
-  message.alertWarning(noZero)
   // 修改时，设置数据
 
   formLoading.value = true
   const data = await StorageLogApi.getStorageNowPage(queryParams)
   list.value = data.list
   total.value = data.total
+  chkboxEnable.value = isAll ===2 ? false :true
+
+  var iNum =1
+  list.value.forEach(row => {
+    row.isCopy = 0
+    row.no = iNum
+    iNum =  iNum+1
+    setTimeout(() => {
+      matSubFormRef.value.toggleRowSelection(row,!chkboxEnable.value); //让页面显示选中的数据
+      }, 0);
+    
+    //matSubFormRef.value.toggleRowSelection(row,chkboxEnable.value)
+  })
   try {
     // 获取物料库存实时列表
   } finally {