From 841d13014438e9d5c3ab34382f2a2351cf0697ba Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 15 Mar 2024 14:31:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=BD=E5=BA=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  2 +-
 .../businesstype/businesstype.data.ts         | 17 +++++-----
 .../documentSetting/businesstype/index.vue    |  3 +-
 .../itemManage/itemarea/index.vue             |  1 +
 .../itemManage/itemarea/itemarea.data.ts      | 31 +++++++++++--------
 5 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index cbb764b65..dd189cf7d 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -252,7 +252,7 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const dialogWidth = ref()
 if (props.basicFormWidth) {
-  dialogWidth.value = props.basicFormWidth
+  dialogWidth.value = props.basicFormWidth + '%'
 } else {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
index 26b6be7d8..c50ffcadc 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
@@ -39,14 +39,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '可用物料类型范围',
     field: 'itemTypes',
@@ -291,6 +284,14 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false, 
     isForm: false,
   },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   { 
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
index e39ebaa09..da20f22c5 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
@@ -52,10 +52,11 @@
     :apiCreate="BusinesstypeApi.createBusinesstype"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    :basicFormWidth="75"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Businesstype.allSchemas" />
+  <Detail ref="detailRef" :isBasic="true"   :allSchemas="Businesstype.allSchemas" />
 
   <!-- 导入 -->
   <ImportForm
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 1369f6e85..c89bde0ee 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -56,6 +56,7 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     :isShowButton = isShowButton
+    :basicFormWidth="75"
   />
 
   <!-- 详情 -->
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index ecb3e4260..caa6c1f06 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -118,6 +118,19 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '管理精度',
+    field: 'manageMode',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.MANAGEMENT_MODE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '最高库存数量',
     field: 'maxQty',
@@ -223,19 +236,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '管理精度',
-    field: 'manageMode',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.MANAGEMENT_MODE,
-    dictClass: 'string',
-    // colorType: 'danger',
-    isTable: true,
-    table: {
-      width: 150
-    },
-  },
+ 
   {
     label: '入库自动转为出库包装规格',
     field: 'newlyToOutpackunit',
@@ -255,6 +256,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+    isTable:false
   },
   {
     label: '出库自动转为出库包装规格',
@@ -275,6 +277,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+    isTable:false
   },
   {
     label: '需要接收确认',
@@ -331,6 +334,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+    isTable:false
   },
   {
     label: '超过高储是否允许叫料',
@@ -346,6 +350,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+    isTable:false
   },
   {
     label: '优先空库位',