From c38154df95a2c2fa1bd32c45f6be9c0d98e37440 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
index 4afd641..4768e46 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
@@ -29,19 +29,38 @@
url: "/CustomerInfo/",
sortName: "id"
});
- const editFormFields = ref({});
- const editFormOptions = ref([]);
+ const editFormFields = ref({
+ outRule: ""
+ });
+ const editFormOptions = ref([[
+ {
+ title: "鍑哄叆搴撹鍒�",
+ required: true,
+ field: "outRule",
+ type: "select",
+ dataKey: "customerOutRuleEnum",
+ data: [],
+ },]
+ ]);
const searchFormFields = ref({});
- const searchFormOptions = ref([]);
+ const searchFormOptions = ref([
+ [
+ {title:"瀹㈡埛缂栫爜", field:"code", type:"like"},
+ {title:"瀹㈡埛鍚嶇О", field:"name", type:"like"},
+ {title:"瀹㈡埛鍏ㄧО", field : "nickName", type:"like"},
+ {title:"鐘舵��", field:"state",type:"select",dataKey:"",data:[{key:1, value:"鍚敤"},{key:0, value:"绂佺敤"}]}
+ ]
+ ]);
const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'code',title:'瀹㈡埛缂栫爜',type:'string',width:110,align:'left',sort:true},
+ {field:'code',title:'瀹㈡埛缂栫爜',type:'string',width:110,align:'left'},
+ {field:'outRule',title:'鍑哄叆搴撹鍒�',type:'string',width:130,align:'left',bind: { key: "customerOutRuleEnum", data: [] } },
{field:'name',title:'瀹㈡埛鍚嶇О',type:'string',width:110,align:'left'},
{field:'nickName',title:'瀹㈡埛鍏ㄧО',type:'string',width:120,align:'left'},
- {field:'state',title:'鐘舵��',type:'bool',width:110,require:true,align:'left'},
+ {field:'state',title:'鐘舵��',type:'bool',width:110,require:true,align:'left',bind: { key: "enableEnum", data: [] }},
{field:'creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
+ {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left'},
{field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left'}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
--
Gitblit v1.9.3