From 20bed3451797d8d86c0ef93f8d566cb73e6c987f Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Wed, 23 Apr 2025 15:24:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?YT-2387=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceInvoiced/index.vue         | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
index a2c52ced6..e80bb0129 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
@@ -116,24 +116,27 @@ const { getList, setSearchParams } = tableMethods
     }
   }
 
-// 列表头部按钮
-const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-invoiced:create'}), // 新增
-  // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierinvoice-invoiced:import'}), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
-  defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPass'}), //批量通过 
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
+const HeadButttondata = ref([])
+if(routeName.value == 'SupplierinvoiceInvoiced'){
+  HeadButttondata.value = [
+    defaultButtons.defaultExportBtn(null), // 导出
+    defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPass'}), //批量通过 
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+  ]
+} else {
+  console.log(routeName.value)
+  HeadButttondata.value = [
+    defaultButtons.defaultExportBtn(null), // 导出
+    defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPassWork'}), //批量通过 
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+  ]
+}
+
+
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {

From 63897810214cd20b674733575137c604cb0a7822 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Wed, 23 Apr 2025 17:16:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/purchasePlanMain.data.ts | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 2ab5f1826..8d38b3533 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -938,24 +938,24 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       }
     },
-    {
-      label: '箱数',
-      field: 'orderQty',
-      sort: 'custom',
-      sortSearchDefault: 8,
-      sortTableDefault:23,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      tableForm: {
-        disabled: true
-      }
-    },
+    // {
+    //   label: '箱数',
+    //   field: 'orderQty',
+    //   sort: 'custom',
+    //   sortSearchDefault: 8,
+    //   sortTableDefault:23,
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   },
+    //   tableForm: {
+    //     disabled: true
+    //   }
+    // },
     {
       label: '采购标包数量',
       field: 'purchaseStdQty',
@@ -1039,7 +1039,6 @@ export const PurchasePlanDetail = useCrudSchemas(
       isTableForm: false,
       isForm: false,
       isTable: true,
-      hiddenInMain: true,
     },
     {
       label: '已收采购数量',

From 5b322d7d19bc6b35d15005c91eb9be50b7189f4d Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Thu, 24 Apr 2025 10:27:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?ERP=E5=BA=93=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=AE=A1=E7=90=86=E7=B2=BE=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E6=8C=89=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/basicDataManage/factoryModeling/areabasic/index.vue    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
index 0a6270e46..5eaaaf516 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
@@ -372,7 +372,8 @@ const onChange = (field, e)=>{
     } else {
       Area.allSchemas.formSchema.forEach((item) => {
         if (item.field == 'manageMode') {
-          item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY')
+          item.componentProps.options = manageModeOptions.value
+          // item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY')
           basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value
         }
       })