From 4793073db4c7d8975b06ede6f7b1761e916a1b6d Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 4 Mar 2025 17:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=89=E6=96=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/TripartiteMaterial/list.vue     | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/views/basicdata/TripartiteMaterial/list.vue b/src/views/basicdata/TripartiteMaterial/list.vue
index 91fe4b3e..77e9ed86 100644
--- a/src/views/basicdata/TripartiteMaterial/list.vue
+++ b/src/views/basicdata/TripartiteMaterial/list.vue
@@ -65,11 +65,11 @@
 
   <!-- 配置装车目的地 -->
   <el-dialog :title="addVisited ? '新增' : '编辑'" v-model="details.popUpShow.addVisited" width="40%"
-    :before-close="beforeClose" append-to-body class="truckLoadingDetailPopUp">
+    append-to-body class="truckLoadingDetailPopUp">
     <div v-loading="details.loadingObj.truckLoadingDetailPopUpLoading">
       <el-form ref="formRef" label-width="100px" :model="details.form">
         <el-form-item label="品牌" prop="brandName"
-          :rules="[{ required: true, message: '请选择品牌', trigger: ['blur', 'change'] }]">
+          :rules="[{ required: true, message: '请选择品牌', trigger: ['blur'] }]">
           <el-select class="w100" v-model="details.form.brandName" filterable clearable placeholder="请选择品类"
             style="width: 240px" :loading="loadingObj.loading" @change="handleChangeBrand" remote reserve-keyword
             default-first-option :remote-method="value => debounce(remoteMethodBrand(value), 500)">
@@ -79,7 +79,7 @@
 
         <!-- materialArr -->
         <el-form-item label="结算品类" prop="categoryName"
-          :rules="[{ required: true, message: '请选择结算品类', trigger: ['blur', 'change'] }]">
+          :rules="[{ required: true, message: '请选择结算品类', trigger: ['blur'] }]">
           <el-select class="w100" v-model="details.form.categoryName" filterable clearable placeholder="请选择结算品类"
             style="width: 240px" :loading="loadingObj.loading" @change="handleChangeMaterial" remote reserve-keyword
             default-first-option :remote-method="value => debounce(getMaterialTree(value), 500)">
@@ -88,7 +88,7 @@
         </el-form-item>
 
         <el-form-item label="结算类型" prop="type"
-          :rules="[{ required: true, message: '请选择结算类型', trigger: ['blur', 'change'] }]">
+          :rules="[{ required: true, message: '请选择结算类型', trigger: ['blur'] }]">
           <el-select class="w100" v-model="details.form.type" filterable clearable placeholder="请选择结算类型"
             style="width: 240px" remote reserve-keyword default-first-option>
             <el-option v-for="val in details.typeList" :key="val.value" :label="val.label" :value="val.value" />
@@ -392,14 +392,11 @@ const beforeClose = done => {
 /** 新增配载 */
 const handleAdd = async () => {
   addVisited.value = true;
-  details.form.brandName = ''
-  details.form.type = ''
-  details.form.materielName = ''
-  details.popUpShow.addVisited = true;
-
+  
   details.popUpShow.addVisited = true;
+  details.form = {};
   await nextTick();
-  formRef.value.resetFields();
+  formRef.value.resetField();
   
 };
 
@@ -510,20 +507,21 @@ const handleJumpedit = ({ row }) => {
     query: { name: '主体品类详情', factoryCategoryId: row.id },
   });
 };
-const handleJumpDetail = async ({ row }) => {
+const handleJumpDetail = ({ row }) => {
   addVisited.value = false;
-  console.log(row);
-  details.form.brandName = row.brandId
-  details.form.categoryName = row.categoryId
-  details.form.firsts = row.firsts
-  details.form.seconds = row.seconds
-  details.form.thirds = row.thirds
-  details.form.type = row.type
-  details.form.materielName = row.materielName
+  const { brandId, categoryId, firsts, seconds, thirds, type, materielName, id } = row;
+  details.form = {
+    brandName: brandId,
+    categoryName: categoryId,
+    firsts,
+    seconds,
+    thirds,
+    type,
+    materielName,
+    id,
+  };
   details.popUpShow.addVisited = true;
-  details.form.id = row.id
-
-}
+};
 /** 删除 */
 const handleRemove = ({ row }) => {
   ElMessageBox.confirm('确认删除吗?', '', {