From a4aa1f38e90d07d55c804bb6912a46816a789ce0 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 9 Apr 2024 08:28:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7--=E6=96=B0=E5=A2=9E=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=A0=E9=99=A4=E5=8D=A1=E9=A1=BF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue        | 15 +++++++++------
 .../purchasereturnRequestMain.data.ts             |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 5d25c1d81..e6185ed51 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -40,7 +40,7 @@
       />
       <el-table-column 
         v-slot="{ row, $index }" 
-        v-for="(headerItem,index) in tableFields" 
+        v-for="(headerItem) in tableFields" 
         :key="headerItem"
         :fixed="headerItem.tableForm?.fixed" 
         :label="headerItem.label" :prop="headerItem.field"
@@ -55,10 +55,10 @@
           :rules="tableFormRules"
           :class="tableFormRules ? '' : 'noRulesForm'">
           <!-- 字符串输入框 -->
-          <el-form-item 
+          <el-form-item
             v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
             :prop="headerItem.field" style="display: flex;align-items: center;">
-            <el-input 
+            <el-input  :key="headerItem.field+$index"
               v-model="row[headerItem.field]"
               clearable
               :type="headerItem?.tableForm?.inputType"
@@ -67,7 +67,7 @@
               style="flex:1" 
               @blur="inputStringBlur(headerItem.field, $event, row)"
             />
-            <el-button  v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
+            <el-button  :key="headerItem.field+$index+'button'" v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
           </el-form-item>
           <el-form-item  v-if="headerItem?.tableForm?.type == 'slot'">
             <slot :row="row"></slot>
@@ -92,6 +92,7 @@
             :prop="headerItem.field">
             <el-input-number 
               style="width: 100%;" 
+              :key="headerItem.field+$index"
               v-model="row[headerItem.field]" 
               :max="headerItem?.tableForm?.max"
               :min="headerItem?.tableForm?.min" 
@@ -104,7 +105,7 @@
           <el-form-item 
             v-if="headerItem?.tableForm?.type == 'Select'" 
             :prop="headerItem.field">
-            <el-select 
+            <el-select :key="headerItem.field+$index"
               v-model="row[headerItem.field]" 
               :clearable="headerItem?.tableForm.clearable || true"
               :multiple="headerItem?.tableForm.multiple" 
@@ -175,7 +176,8 @@
           <el-form-item 
             v-if="headerItem?.tableForm?.type == 'FormDate'" 
             :prop="headerItem.field">
-            <el-date-picker 
+            <el-date-picker
+            :key="headerItem.field+$index" 
               v-model="row[headerItem.field]" 
               :clearable="true"
               style="width: 100%"
@@ -190,6 +192,7 @@
             v-if="headerItem?.tableForm?.type == 'FormDateTime'" 
             :prop="headerItem.field">
             <el-date-picker 
+              :key="headerItem.field+$index"
               type="datetime"
               :clearable="true"
               v-model="row[headerItem.field]"
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 0712f2814..e2255f822 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -271,6 +271,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isForm:false,
     table: {
       width: 150
     },