From 77fc68316f8bd82498f4447591eaeac9905374fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 26 Dec 2023 15:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=A1=A8=E5=8D=95=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8Ftableform=20=E5=88=A0=E9=99=A4=E5=88=97?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  6 ++++
 src/components/TableForm/src/TableForm.vue    |  3 +-
 .../productdismantleRequestMain.data.ts       | 36 +++++++++----------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index a34f2ebe8..6b281649d 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -68,6 +68,7 @@
         :tableData="tableData"
         :tableFormRules="tableFormRules"
         :isShowButton="isShowButton"
+        :isShowReduceButton="isShowReduceButton"
         @handleAddTable="handleAddTable"
         @handleDeleteTable="handleDeleteTable"
         @tableSelectionChange="tableSelectionChange"
@@ -113,6 +114,11 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
+  // 是否显示tableForm 删除按钮
+  isShowReduceButton: {
+    type: Boolean,
+    default: true
+  },
   // 校验rules
   rules: {
     type: Object,
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 12d0190d2..7a37be94e 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -269,7 +269,7 @@
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 const props = defineProps({
-  // 是否显示删除按钮
+  // 是否显示添加按钮
   isShowButton: {
     type: Boolean,
     default: true,
@@ -284,6 +284,7 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  // 是否显示删除按钮
   isShowReduceButton:{
     type: Boolean,
     default: true,
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 9dc642fc5..f4bd20ff0 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -440,7 +440,7 @@ export const ProductdismantleRequestMainRules = reactive({
  */
 export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
+    label: '拆解生产线代码',
     field: 'productionLineCode',
     sort: 'custom',
     table: {
@@ -485,7 +485,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '工位代码',
+    label: '拆解工位代码',
     field: 'workStationCode',
     sort: 'custom',
     table: {
@@ -610,6 +610,22 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       disabled: true
     }
   },
+  {
+    label: '成品库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '数量',
     field: 'qty',
@@ -769,22 +785,6 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     isTableForm: false,
     isForm: false,
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps:{
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
   {
     label: '单据号',
     field: 'number',