From 1abcc2de7d788b68572ef9433c4bca55999bd749 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Mon, 8 Apr 2024 11:10:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E8=B4=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/gw/com/index.ts                       |  8 ++++++
 .../Gw/boxMateQuality/BoxMateQualityForm.vue  | 25 ++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/api/gw/com/index.ts b/src/api/gw/com/index.ts
index b3a3d27..7ea20c7 100644
--- a/src/api/gw/com/index.ts
+++ b/src/api/gw/com/index.ts
@@ -20,3 +20,11 @@ export const getBaseSupplierList = async () => {
       return res.Data
     })
 }
+// 获取材质列表
+export const getBaseCompositionList = async () => {
+  return await request
+    .post({ url: `/DistributionBoxTesting/GetBaseCompositionList`, data: { filter: {} } })
+    .then((res) => {
+      return res.Data
+    })
+}
diff --git a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
index 6566d88..14a36f2 100644
--- a/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
+++ b/src/views/Gw/boxMateQuality/BoxMateQualityForm.vue
@@ -84,7 +84,7 @@
                         <vxe-form-item title="原材料规格型号" field="MrmSpecification" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.MrmSpecification" placeholder="请输入原材料规格型号"
-                                    @change="fnChangeA(params)"  @click="fnSltBaseSupplierAOpen"></vxe-input>
+                                    @change="fnChangeA(params)" @click="fnSltBaseSupplierAOpen"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="原材料出厂日期" field="ManufactureDate" span="12">
@@ -160,8 +160,14 @@
                     <vxe-form-gather span="24">
                         <vxe-form-item title="材质" field="Texture" span="12">
                             <template #default="params">
-                                <vxe-input v-model="params.data.Texture" placeholder="请输入材质" clearable
-                                    @change="fnChangeA(params)"></vxe-input>
+                                <vxe-select v-model="params.data.Texture" clearable filterable
+                                    @change="fnBaseCompositionA1">
+                                    <template v-for="item in dictBaseCompositionList">
+                                        <vxe-option :value="item.Name" :label="item.Name"></vxe-option>
+                                    </template>
+                                </vxe-select>
+                                <!-- <vxe-input v-model="params.data.Texture" placeholder="请输入材质" clearable
+                                    @change="fnChangeA(params)"></vxe-input> -->
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="公称厚度(mm)" field="Thickness" span="12">
@@ -273,6 +279,7 @@ const refSltBaseSupplierA = ref()
 const dictStore = useDictStore()
 const { dictProcessType } = storeToRefs(dictStore)
 const dictBaseSupplierList: any = ref([])
+const dictBaseCompositionList: any = ref([])
 // 定义事件[success]
 const emit = defineEmits(['success'])
 // 是否显示表单
@@ -405,6 +412,7 @@ onMounted(() => {
 const open = async (type: string, row?: any) => {
     formType.value = type
     dictBaseSupplierList.value = await comApi.getBaseSupplierList()
+    dictBaseCompositionList.value = await comApi.getBaseCompositionList()
     await fnResetA()
     switch (type) {
         case 'add':
@@ -486,7 +494,16 @@ const fnChgFileB = async (info: UploadChangeParam) => {
         formDataB.value.FileItems = JSON.stringify(FileItems)
     }
 }
-
+// 表单B - 文件B
+const fnBaseCompositionA1 = async () => {
+    const baseComposition = dictBaseCompositionList.value.filter((val: any) => {
+        return val.Name == formDataA.value.Texture
+    })
+    if (baseComposition.length > 0) {
+        const baseCompositionOne = baseComposition[0]
+        formDataA.value.Thickness = baseCompositionOne.Thickness
+    }
+}
 // 提供open方法打开弹窗
 defineExpose({ open })
 // 改变数据A