From 17df25887bfd85161ebf2215ee69af98f171c012 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Tue, 9 Jul 2024 16:14:36 +0800
Subject: [PATCH] =?UTF-8?q?SCP=E4=BE=9B=E5=BA=94=E5=95=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=85=B3=E8=81=94=E7=AE=A1=E7=90=86=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../systemSetting/supplierUser/index.vue      | 15 ++++---
 .../supplierUser/supplierUser.data.ts         | 44 ++++++++++++++-----
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
index cb66c5960..c8d92b883 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
@@ -55,11 +55,11 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierUser.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm 
-    ref="importFormRef" 
-    url="/wms/supplier-user/import" 
-    :importTemplateData="importTemplateData" 
-    @success="importSuccess" 
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/supplier-user/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
     :updateIsDisable="true"
     :coverIsDisable="true"
     :mode="2"
@@ -99,7 +99,7 @@ const onInput = (field,value) => {
   }
 
 }
-    
+
 
 // 查询列表页面参数设置
 const searchTableParams = ref([
@@ -184,6 +184,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    if(formField == 'userName'){
+      setV['userId'] = val[0]['id']
+    }
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
index 1e5c4a94e..94a3317c8 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
@@ -15,7 +15,7 @@ export const User = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '用户名称',
-    field: 'username',
+    field: 'userName',
     sort: 'custom',
     table: {
       width: 150
@@ -58,7 +58,8 @@ export const User = useCrudSchemas(reactive<CrudSchema[]>([
 
 // 表单校验
 export const SupplierUserRules = reactive({
-  userId: [required],
+  // userId: [required],
+  userName: [required],
   supplierCode: [required],
   status: [required],
   concurrencyStamp: [required],
@@ -75,11 +76,37 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     label: '用户ID',
     field: 'userId',
     sort: 'custom',
+    isForm: false,
     isSearch: true,
+    // tableForm:{
+    //   isInpuFocusShow: true,
+    //   searchListPlaceholder: '请选用户信息',
+    //   searchField: 'username',
+    //   searchTitle: '用户信息',
+    //   searchAllSchemas: User.allSchemas,
+    //   searchPage: UserApi.getUserPage
+    // },
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     dialogWidth:'1025px',//搜索出来弹窗的宽度
+    //     isSearchList: true,
+    //     searchListPlaceholder: '请选用户信息',
+    //     searchField: 'username',
+    //     searchTitle: '用户信息',
+    //     searchAllSchemas: User.allSchemas,
+    //     searchPage: UserApi.getUserPage
+    //   }
+    // }
+  },
+  {
+    label: '用户账号',
+    field: 'userName',
+    sort: 'custom',
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选用户信息',
-      searchField: 'id',
+      searchField: 'username',
       searchTitle: '用户信息',
       searchAllSchemas: User.allSchemas,
       searchPage: UserApi.getUserPage
@@ -90,18 +117,13 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
         dialogWidth:'1025px',//搜索出来弹窗的宽度
         isSearchList: true,
         searchListPlaceholder: '请选用户信息',
-        searchField: 'id',
+        searchField: 'username',
         searchTitle: '用户信息',
         searchAllSchemas: User.allSchemas,
         searchPage: UserApi.getUserPage
       }
-    }
-  },
-  {
-    label: '用户账号',
-    field: 'userName',
-    sort: 'custom',
-    isForm: false,
+    },
+    isSearch: true,
   },
   {
     label: '用户昵称',