From 51ec0fbe59a3c7768996072874ea6f0c2b91c060 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 21 十二月 2023 13:18:05 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/const/crud/customerOrder/customerOrderForm.js |   64 +++++++++++++++++---------------
 1 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/const/crud/customerOrder/customerOrderForm.js b/src/const/crud/customerOrder/customerOrderForm.js
index 89b9d30..9fda846 100644
--- a/src/const/crud/customerOrder/customerOrderForm.js
+++ b/src/const/crud/customerOrder/customerOrderForm.js
@@ -17,6 +17,7 @@
 export const tableOption = {
   border: true,
   index: true,
+  indexFixed: false,
   height: '292px',
   indexLabel: '搴忓彿',
   menuAlign: 'center',
@@ -25,6 +26,7 @@
   delBtn: false,
   align: 'center',
   addBtn: false,
+  addBtnText: '娣诲姞琛�',
   addRowBtn: true,
   refreshBtn: false, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
   columnBtn: false, // 鏄惁鏄剧ず鏄惧奖鎸夐挳H
@@ -37,30 +39,6 @@
     minWidth: 200,
     span: 24
   }, {
-    label: '闆朵欢瑙勬牸',
-    prop: 'customerPartSpec',
-    type: 'input',
-    cell: true,
-    minWidth: 200,
-    span: 24
-  }, {
-    label: '鍒堕�犲睘鎬�',
-    prop: 'manufactureAttr',
-    cell: true,
-    type: 'select',
-    minWidth: 200,
-    span: 24,
-    dicData:[{
-        label: '鏅��',
-        value: 'N'
-    },{
-        label: '鏍峰搧',
-        value: 'S'
-    },{
-        label: '鐮斿彂',
-        value: 'D'
-    }]
-  }, {
     label: '浜у搧鍚嶇О',
     prop: 'productName',
     cell: true,
@@ -68,13 +46,13 @@
     minWidth: 200,
     span: 24
   }, {
-    label: '闅跺睘鍝佺墝',
-    prop: 'productType',
-    cell: true,
+    label: '瑙勬牸鍨嬪彿',
+    prop: 'customerPartSpec',
     type: 'input',
+    cell: true,
     minWidth: 200,
     span: 24
-  }, {
+  },  {
     label: '鍗曚綅',
     prop: 'otcUnit',
     slot: true,
@@ -93,12 +71,38 @@
     span: 24,
     rules:[{required:true,message:'绫诲瀷蹇呴』鏄暟瀛�',trigger:'blur'}]
   }, {
-    label: '鏀惰揣鍦板潃',
-    prop: 'shippingAddress',
+    label: '鍒堕�犲睘鎬�',
+    prop: 'manufactureAttr',
+    cell: true,
+    type: 'select',
+    minWidth: 200,
+    span: 24,
+    dicData:[{
+        label: '鏅��',
+        value: 'N'
+    },{
+        label: '鏍峰搧',
+        value: 'S'
+    },{
+        label: '鐮斿彂',
+        value: 'D'
+    }]
+  }, {
+    label: '闅跺睘鍝佺墝',
+    prop: 'productType',
     cell: true,
     type: 'input',
     minWidth: 200,
     span: 24
+  },{
+    label: '鏀惰揣鍦板潃',
+    prop: 'shippingAddress',
+    cell: true,
+    type: 'textarea',
+    minWidth: 200,
+    span: 24,
+    minRows: 1,
+    maxRows: 3
   }, {
     label: '浜у搧澶囨敞',
     prop: 'remark',

--
Gitblit v1.9.3