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/userInfo.vue |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
index e402f39..5aa50c2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
@@ -32,15 +32,26 @@
             const editFormFields = ref({});
             const editFormOptions = ref([]);
             const searchFormFields = ref({});
-            const searchFormOptions = ref([]);
+            const searchFormOptions = ref([
+                [
+                    {title:"鍛樺伐鍙�", field:"code", type:"like"},
+                    {title:"閮ㄩ棬缂栫爜", field:"deptNo", type:"like"},
+                    {title:"閮ㄩ棬鍚嶇О", field : "name", type:"like"}  
+                ],
+                [
+                    {title:"鐘舵��", field:"state",type:"select",dataKey:"",data:[]},
+                    {title:"搴撳瓨缁勭粐", field:"invOrgId", type:"like"},
+                    {title:"绫诲瀷", field:"type", type:"select", dataKey:"", data:[]},
+                ]
+            ]);
             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:'deptNo',title:'閮ㄩ棬缂栫爜',type:'string',width:110,align:'left'},
                        {field:'deptName',title:'閮ㄩ棬鍚嶇О',type:'string',width:110,align:'left'},
                        {field:'name',title:'鍛樺伐鍚嶇О',type:'string',width:110,align:'left'},
-                       {field:'state',title:'鐘舵��',type:'int',width:110,require:true,align:'left'},
+                       {field:'state',title:'鐘舵��',type:'int',width:110,require:true,align:'left',bind: { key: "status", data: [] }},
                        {field:'invOrgId',title:'搴撳瓨缁勭粐',type:'string',width:110,align:'left'},
-                       {field:'type',title:'绫诲瀷',type:'int',width:110,require:true,align:'left'},
+                       {field:'type',title:'绫诲瀷',type:'int',width:110,require:true,align:'left',hidden:true},
                        {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:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},

--
Gitblit v1.9.3