From e4bae18c56739b1e306d847e1400ff91434ae154 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 9 Apr 2024 10:35:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92=20---=20?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TableFormCountPlan/src/TableFormCountPlan.vue        | 4 ++--
 .../count/countPlanMain/countPlanMain.data.ts            | 9 +++++----
 src/views/wms/countManage/count/countPlanMain/index.vue  | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
index d46d46215..e1138a47f 100644
--- a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
+++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
@@ -22,7 +22,7 @@
           :rules="tableFormRules"
           :class="tableFormRules ? '' : 'noRulesForm'">
           <el-form-item :prop="tableFields[0].field">
-          <el-select
+          <el-select :key="row.id+$index" 
             v-model="row.type"
             :placeholder="tableFields[0].placeholder || '请输入' + tableFields[0].label"
             @change="tableFormChange(tableFields[0].field, $event, row)"
@@ -51,7 +51,7 @@
           :rules="tableFormRules"
           :class="tableFormRules ? '' : 'noRulesForm'">
           <el-form-item :prop="tableFields[1].field">
-          <el-select
+          <el-select :key="row.id+$index" 
             v-model="row.value"
             :placeholder="
               tableFields[1].placeholder ||
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 2af966e54..4a0559d59 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -128,6 +128,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -149,7 +150,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -168,7 +169,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -187,7 +188,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -206,7 +207,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 10239dd80..e793608e4 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -747,7 +747,7 @@ const getItembasicAllList = async () => {
     allList.value.itembasicAllList = res.map((element) => {
       return {
         value: element.code,
-        label: element.name
+        label: element.name + '-'+ element.code
       }
     })
   })
@@ -791,7 +791,7 @@ const getLocationAllList = async () => {
     allList.value.locationAllList = res.map((element) => {
       return {
         value: element.code,
-        label: element.name
+        label: element.name + '-'+ element.code
       }
     })
   })