From 1cd843e272fca4c413d4138fab03922da54dde63 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 27 Feb 2024 13:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E3=80=81=E7=89=A9=E6=96=99=E9=9C=80=E6=B1=82=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E3=80=81=E5=85=A5=E5=BA=93=E3=80=81=E5=87=BA=E5=BA=93=E3=80=91?=
 =?UTF-8?q?=E5=B0=86=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E4=B8=8E=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/storage/StorageForm.vue    | 22 ++++++++++++++----
 .../src/views/heli/storage/StorageOut.vue     | 23 +++++++++++++++----
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index c9cd7f6a..2124f1de 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -95,16 +95,17 @@
                 <el-table :data="formData.matItemDOList" class="hl-table">
                   <el-table-column prop="cid" label="序号" min-width="80" align="center" fixed />
                   <el-table-column prop="matId" min-width="140" align="center">
-                    <template #header> <span class="hl-table_header">*</span> 物料编码 </template>
+                    <template #header> <span class="hl-table_header">*</span> 物料编码/名称</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
-                        <el-select v-model="scope.row.matId" placeholder="物料编码" :remote-method="remoteMatCodeSearch" v-bind:disabled="ctrView || ctrSave" remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading" @change="(val) => handleMatCode(scope, val)" class="!w-180px">
+                        <!-- <el-select v-model="scope.row.matId" placeholder="物料编码/名称" :remote-method="remoteMatCodeSearch" v-bind:disabled="ctrView || ctrSave" remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading" @change="(val) => handleMatCode(scope, val)" class="!w-180px">
                           <el-option v-for="item in matList" :key="item.id" :label="item.code" :value="item.id" />
-                        </el-select>
+                        </el-select> -->
+                         <MaterialSelect v-model="scope.row.matId" @update:newValue="handleSelectedMaterial(scope.$index,$event)" />
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="matName" label="物料名称" min-width="120" align="center" />
+                  <!-- <el-table-column prop="matName" label="物料名称" min-width="120" align="center" /> -->
                   <el-table-column prop="matType" label="物料类型" align="center" min-width="120">
                     <template #default="scope">
                       <dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType" v-if="scope.row.matType ? true : false" />
@@ -281,7 +282,7 @@ import * as StorageApi from '@/api/heli/storage'
 import * as StorageMatApi from '@/api/heli/storagemat'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import { useUserStore } from '@/store/modules/user'
-
+import MaterialSelect from '@/views/heli/hlvuestyle/materialSelect.vue'
 import * as MaterialApi from '@/api/heli/material'
 import * as WarehouseApi from '@/api/heli/warehouse'
 import * as RgApi from '@/api/heli/rg'
@@ -768,6 +769,17 @@ onMounted(async () => {
   //用户信息，用于底部数据展示
   userList.value = await UserApi.getSimpleUserList()
 })
+
+//接收物料传递的数据
+const handleSelectedMaterial = (currentIndex: number, newValue: any) => {
+  // console.log(currentIndex,'接收物料对应的数据:', newValue)
+  formData.value.matItemDOList[currentIndex].matId = newValue?.id
+  formData.value.matItemDOList[currentIndex].matName = newValue?.name
+  formData.value.matItemDOList[currentIndex].matCode = newValue?.code
+  formData.value.matItemDOList[currentIndex].matSpec = newValue?.spec
+  formData.value.matItemDOList[currentIndex].matType = newValue?.materialType
+  formData.value.matItemDOList[currentIndex].matUnit = newValue?.unit
+}
 </script>
 <style>
 a {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 228e1079..7a5453b8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -94,16 +94,17 @@
                 <el-table :data="formData.matItemDOList" class="hl-table">
                   <el-table-column prop="cid" label="序号" :width="80" />
                   <el-table-column prop="matId" min-width="140" align="center">
-                    <template #header> <span class="hl-table_header">*</span>物料名称 </template>
+                    <template #header> <span class="hl-table_header">*</span>物料编码/名称 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
-                        <el-select v-model="scope.row.matId" placeholder="物料名称" :remote-method="remoteMatNameSearch" v-bind:disabled="ctrView || ctrSave" remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading" @change="(val) => handleMatName(scope, val)" class="!w-180px">
+                        <!-- <el-select v-model="scope.row.matId" placeholder="物料名称" :remote-method="remoteMatNameSearch" v-bind:disabled="ctrView || ctrSave" remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading" @change="(val) => handleMatName(scope, val)" class="!w-180px">
                           <el-option v-for="item in matList" :key="item.id" :label="item.name" :value="item.id" />
-                        </el-select>
+                        </el-select> -->
+                        <MaterialSelect v-model="scope.row.matId" @update:newValue="handleSelectedMaterial(scope.$index,$event)" />
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
+                  <!-- <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" /> -->
                   <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
                     <template #default="scope">
                       <dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType" v-if="scope.row.matType ? true : false" />
@@ -280,6 +281,7 @@ import * as StorageApi from '@/api/heli/storage'
 import * as StorageMatApi from '@/api/heli/storagemat'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import { useUserStore } from '@/store/modules/user'
+import MaterialSelect from '@/views/heli/hlvuestyle/materialSelect.vue'
 
 import * as MaterialApi from '@/api/heli/material'
 import * as WarehouseApi from '@/api/heli/warehouse'
@@ -439,7 +441,7 @@ const openerror = () => {
         `文件名为：${failedAttachmentsName.value.join(' / ')}上传失败`,
         `文件格式不正确或网络问题 请您稍后再试`,
         {
-          dangerouslyUseHTMLString: false, 
+          dangerouslyUseHTMLString: false,
           confirmButtonText: '知道了',
           center: true
         }
@@ -866,6 +868,17 @@ onMounted(async () => {
   //用户信息，用于底部数据展示
   userList.value = await UserApi.getSimpleUserList()
 })
+
+//接收物料传递的数据
+const handleSelectedMaterial = (currentIndex: number, newValue: any) => {
+  // console.log(currentIndex,'接收物料对应的数据:', newValue)
+  formData.value.matItemDOList[currentIndex].matId = newValue?.id
+  formData.value.matItemDOList[currentIndex].matName = newValue?.name
+  formData.value.matItemDOList[currentIndex].matCode = newValue?.code
+  formData.value.matItemDOList[currentIndex].matSpec = newValue?.spec
+  formData.value.matItemDOList[currentIndex].matType = newValue?.materialType
+  formData.value.matItemDOList[currentIndex].matUnit = newValue?.unit
+}
 </script>
 <style>
 a {