销售权限控制修改

bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue

@@ -74,6 +74,7 @@
                 <el-form-item label="业务员" prop="salesUserId">
                   <user-select
                     v-model="form.salesUserId"
+                    value-field="userName"
                     placeholder="请选择业务员"
                     @change="(uid, user) => handleUserChange(uid, user, 'salesUser')"
                   />

bms-front/src/views/customersuppliermanagement/customerinfo/index.vue

@@ -32,7 +32,12 @@
       </el-form-item>
 
       <el-form-item label="业务员" prop="salesUserId">
-        <user-select v-model="queryParams.salesUserId" placeholder="请选择业务员" @change="handleQuery" />
+        <user-select
+          v-model="queryParams.salesUserId"
+          value-field="userName"
+          placeholder="工号/姓名搜索"
+          @change="handleQuery"
+        />
       </el-form-item>
 
 
@@ -122,7 +127,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isColVisible('salesUserId')" label="业务员" align="center" prop="salesUserId">
-        <template #default="scope"><user-name :user-id="scope.row.salesUserId" /></template>
+        <template #default="scope">{{ scope.row.salesUserNickName || scope.row.salesUser || scope.row.salesUserId }}</template>
       </el-table-column>
 
 <!--      <el-table-column v-if="isColVisible('ed')" label="资金额度" align="center" prop="ed" />-->

bms-front/src/views/system/user/index.vue

@@ -188,6 +188,7 @@ const extraParams = computed(() => ({ deptId: deptId.value }))
 // 搜索项配置
 const searchColumns = [
   { label: "用户名称", prop: "userName", component: "input", placeholder: "请输入用户名称", width: "240px" },
+  { label: "用户昵称", prop: "nickName", component: "input", placeholder: "请输入用户昵称", width: "240px" },
   { label: "手机号码", prop: "phonenumber", component: "input", placeholder: "请输入手机号码", width: "240px" },
   { label: "状态", prop: "status", component: "select", dict: "sys_normal_disable", placeholder: "用户状态", width: "240px" },
   { label: "创建时间", prop: "dateRange", component: "daterange", width: "308px" }