From 27d702b9bdca9323d13040a7ee2b2d8b1a5868f9 Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Wed, 14 Aug 2024 13:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86-=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.js                             |  2 ++
 .../company/promotion/form/PromotionData.vue  |  6 ++---
 src/views/company/promotion/index.vue         | 22 +++++++++----------
 src/views/company/staff/form/StaffForm.vue    | 19 ----------------
 4 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/src/utils/dict.js b/src/utils/dict.js
index 5d8e5f0..158770b 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -98,6 +98,8 @@ export const DICT_TYPE = {
   DICT_CUS_INFO_STATUS : 'cus_info_status',
   //推广渠道
   PROMOTION_CHANNEL : 'promotion_channel',
+  //用户类型
+  SYSTEM_USER_TYPE : 'system_user_type',
 
   // ------- carMain模块 -------
   //车辆性质
diff --git a/src/views/company/promotion/form/PromotionData.vue b/src/views/company/promotion/form/PromotionData.vue
index 293ab10..77e43a0 100644
--- a/src/views/company/promotion/form/PromotionData.vue
+++ b/src/views/company/promotion/form/PromotionData.vue
@@ -62,7 +62,7 @@
             <i class="el-icon-place"></i>
             推广人角色
           </template>
-<!--          <dict-tag :type="DICT_TYPE.USER_IDENTITY" :value="formData.identity"/>-->
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="formData.oldUser.userType"/>
         </el-descriptions-item>
       </el-descriptions>
     </el-dialog>
@@ -90,7 +90,7 @@ export default {
           promotionChannel: null,
           uniqueCode: null,
           registerTime: null,
-          identity: null
+          userType: null
         },
       }
   },
@@ -115,7 +115,7 @@ export default {
         promotionChannel: null,
         uniqueCode: null,
         registerTime: null,
-        identity: null
+        userType: null
       }
       this.resetForm('formRef')
     },
diff --git a/src/views/company/promotion/index.vue b/src/views/company/promotion/index.vue
index 65393c5..9f6ff22 100644
--- a/src/views/company/promotion/index.vue
+++ b/src/views/company/promotion/index.vue
@@ -5,14 +5,14 @@
       <el-form-item label="推广人姓名" prop="oldUserName">
         <el-input v-model="queryParams.oldUserName" placeholder="请输入推广人姓名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="推广人角色" prop="identity">
-        <el-select v-model="queryParams.identity" placeholder="请选择推广人角色" clearable size="small">
-<!--          <el-option-->
-<!--            v-for="dict in this.getDictDatas(DICT_TYPE.USER_IDENTITY)"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
+      <el-form-item label="推广人角色" prop="userType">
+        <el-select v-model="queryParams.userType" placeholder="请选择推广人角色" clearable size="small">
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="推广人推广码" prop="uniqueCode">
@@ -54,9 +54,9 @@
       </el-table-column>
       <el-table-column label="推广人姓名" align="center" prop="oldUserName" width="180" />
       <el-table-column label="推广人电话" align="center" prop="oldUser.mobile" width="180" />
-      <el-table-column label="推广人角色" align="center" prop="identity" width="180">
+      <el-table-column label="推广人角色" align="center" prop="oldUser.userType" width="180">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.USER_IDENTITY" :value="scope.row.identity"/>
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="scope.row.oldUser.userType"/>
         </template>
       </el-table-column>
       <el-table-column label="推广人推广码" align="center" prop="uniqueCode" width="180" />
@@ -107,7 +107,7 @@ export default {
         newUserName: null,
         registerTimeArray: null,
         uniqueCode: null,
-        identity: null
+        userType: null
       },
       // 显示搜索条件
       showSearch: true,
diff --git a/src/views/company/staff/form/StaffForm.vue b/src/views/company/staff/form/StaffForm.vue
index 0a9c953..5ea6868 100644
--- a/src/views/company/staff/form/StaffForm.vue
+++ b/src/views/company/staff/form/StaffForm.vue
@@ -65,13 +65,11 @@
         <el-row :gutter="2">
           <el-col :span="12">
             <el-form-item v-if="formData.id === undefined" label="登录账号" prop="loginAccount">
-              <el-input v-model="formData.loginAccount" placeholder="请输入登录账号"/>
               <el-input v-model="formData.loginAccount" placeholder="请输入登录账号" maxlength="16" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="formData.id === undefined" label="登录密码" prop="password">
-              <el-input v-model="formData.password" placeholder="请输入登录密码" type="password" show-password/>
               <el-input v-model="formData.password" placeholder="请输入登录密码" type="password" maxlength="16" show-password />
             </el-form-item>
           </el-col>
@@ -206,23 +204,6 @@ export default {
             trigger: 'blur'
           }
         ],
-        sex: [{required: true, message: "性别不能为空", trigger: 'blur'}],
-        address: [{required: true, message: "家庭住址不能为空", trigger: 'blur'}],
-        workYear: [{required: true, message: "工龄不能为空", trigger: 'blur'}],
-        joinedYear: [{required: true, message: "司龄不能为空", trigger: 'blur'}],
-        education: [{required: true, message: "学历不能为空", trigger: 'blur'}],
-        loginAccount: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }, {
-          min: 4,
-          max: 16,
-          message: '登录账号长度在4到16个字符',
-          trigger: 'blur'
-        }],
-        password: [{ required: true, message: '登录密码不能为空', trigger: 'blur' }, {
-          min: 4,
-          max: 16,
-          message: '登录密码长度在4到16个字符',
-          trigger: 'blur'
-        }],
         workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }],
         joinedDate: [{ required: true, message: '入职日期不能为空', trigger: 'blur' }]
       },