From 3b9d0130bf1b44618520c4e01eb3d7c18ad7d172 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Tue, 29 Apr 2025 15:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/storage/materials.vue              | 11 +++++++----
 .../src/views/heli/storage/subproject.vue             |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materials.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materials.vue
index 5cbf609..67b92c3 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materials.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materials.vue
@@ -21,7 +21,7 @@
       </el-form>
     </ContentWrap>
     <el-card class="hl-table">
-      <el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800" @row-click="clickRow">
+      <el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" @row-click="clickRow" :selection="true" :reserve-selection="true" 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" />
@@ -56,11 +56,9 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as StorageLogApi from '@/api/heli/storagelog'
 import * as ProcessBomApi from '@/api/heli/processbom'
 import { ElTable } from 'element-plus'
-import {formatDate} from "@/utils/formatTime";
 
 //:selectable="row=>row.disabled || chkboxEnable"
 const chkboxEnable = ref(true)
@@ -92,7 +90,12 @@ const clickRow = (row: any) => {
 }
 //指定key值,数据更新之后保留之前选中的数据
 const getRowKeys = (row) => {
-  return row.matId
+  if (formType.value  == 'out'){
+    return `${row.whId}_${row.matCode}_${row.pnId}`
+  }else {
+    return row.id
+
+  }
 }
 
 const queryReqVo: any = reactive({
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/subproject.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/subproject.vue
index 25d76cd..2c4667b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/subproject.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/subproject.vue
@@ -21,7 +21,7 @@
       </el-form>
     </ContentWrap>
     <el-card class="hl-table">
-      <el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" selection min-width="1800" @row-click="clickRow">
+      <el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" :reserve-selection="true" selection min-width="1800">
         <el-table-column type="selection" width="55" />
         <el-table-column label="序号" type="index" min-width="120" align="center" />
         <el-table-column prop="projectCode" label="项目编号" min-width="120" align="center" />