From 51a0838a3f9569ee3c19053de1831adc138a42f9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 27 Dec 2024 09:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92=E5=92=8C=E9=9D=9E=E6=9C=AC?=
 =?UTF-8?q?=E7=94=B0=E8=A1=A5=E7=BB=99=E5=93=81=E5=8F=91=E8=B4=A7=EF=BC=8C?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=AD=96=E7=95=A5=E5=8E=BB=E6=8E=89=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/batchStrategy/AddForm.vue        |  4 +--
 .../deliverJobMain/deliverJobMain.data.ts     |  1 -
 .../deliverRecordMain.data.ts                 |  1 -
 .../deliverRequestMain.data.ts                |  5 ++--
 .../deliverPlanMain/deliverPlanMain.data.ts   | 26 ++++++++++++++++---
 .../deliverplan/saleMain/saleMain.data.ts     | 11 ++++++++
 6 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
index fff1670c3..5e52f6940 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
@@ -245,12 +245,12 @@
                     </div>
                   </div>
                 </div>
-                <div class="button flex">
+                <!-- <div class="button flex">
                   <div @click="handleAddTable(formData.configuration.ManagementPrecision)">
                     <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
                     <div>添加条件</div>
                   </div>
-                </div>
+                </div> -->
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index 63f01df0b..5e9281f58 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -784,7 +784,6 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain: true
   },
   {
     label: '描述',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index 8294bc888..57fd77107 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -576,7 +576,6 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain: true
   },
   {
     label: '描述',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index fb5417eea..1a1f4a257 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -869,9 +869,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isForm: false,
-    isTableForm: false
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '描述',
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 970c92dc9..b0b2ecff8 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -614,7 +614,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemCode',
     sort: 'custom',
     table: {
-      width: 150
+      minWidth: 150
     },
     tableForm:{
       multiple:true,
@@ -647,12 +647,22 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      minWidth: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '计划数量',
     field: 'planQty',
     sort: 'custom',
     table: {
-      width: 150
+      minWidth: 150
     },
     form: {
       component: 'InputNumber',
@@ -677,7 +687,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      minWidth: 150
     },
     tableForm: {
       disabled: true,
@@ -957,6 +967,16 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '计划数量',
     field: 'planQty',
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
index 801c75947..159b008ee 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
@@ -622,6 +622,17 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+    isTableForm:false,
+    isForm:false
+  },
   {
     label: '备注',
     field: 'remark',