From b49866f95f296da8936fb48b04f954b7ecd07ad6 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Wed, 28 Feb 2024 17:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9C=80=E6=B1=82=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=20=E5=AD=90=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

物料需求计划 子项目编号
---
 .../src/views/heli/materialplan/edit.vue               |  4 ++--
 .../src/views/heli/storage/StorageOut.vue              | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
index c4f4e9af..e1b3c12a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
@@ -142,8 +142,8 @@
                     <template #header><span class="hl-table_header">*</span>子项目编号</template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.projectSubId`" :rules="subFormRules.projectSubId" class="mb-0px!">
-                        <el-select class="!w-265px" v-model="row.projectSubId" filterable clearable>
-                          <el-option v-for="dict in formData.projectOrderSubs" :key="dict.projectSubId" :label="dict.projectSubCode" :value="dict.projectSubId" />
+                        <el-select class="!w-265px" v-model="row.projectSubId"  clearable>
+                          <el-option v-for="dict in formData.projectPlanSubs" :key="dict.projectSubId" :label="dict.projectSubCode" :value="dict.projectSubId" />
                         </el-select>
                       </el-form-item>
                     </template>
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 7a5453b8..bd32b37f 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
@@ -878,6 +878,16 @@ const handleSelectedMaterial = (currentIndex: number, newValue: any) => {
   formData.value.matItemDOList[currentIndex].matSpec = newValue?.spec
   formData.value.matItemDOList[currentIndex].matType = newValue?.materialType
   formData.value.matItemDOList[currentIndex].matUnit = newValue?.unit
+
+
+  formData.value.matItemDOList[currentIndex].rgId = ''
+  formData.value.matItemDOList[currentIndex].pnId = ''
+
+  formData.value.matItemDOList[currentIndex].pnlist = pnList.value.filter(
+    (pn) =>
+      pn.wh_id == formData.value.whId &&
+      matLastData.value.filter((mat) => mat.matId == newValue?.id && mat.pnId == pn.id).length > 0
+  )
 }
 </script>
 <style>