修改新增用户

src/api/contentManagement/memInfo.js

 import request from '@/utils/request'
 import Qs from 'qs'
+import {encrypt} from "@/utils/jsencrypt";
 
 /**
  * 1. 列表查询

src/api/system/user.js

 import request from '@/utils/request'
 import { praseStrEmpty } from '@/utils/common'
 import Qs from 'qs'
+import { encrypt } from '@/utils/jsencrypt'
 
 /**
  * 1.新增用户
@@ -179,3 +180,12 @@ export function uploadFalseFile(params) {
     responseType: 'blob'
   })
 }
+
+// 17. 获取私密信息
+export function getPrivate(businessId) {
+  return request({
+    url: '/system/user/getUserPhone',
+    method: 'get',
+    params: { businessId: businessId }
+  })
+}

src/views/contentManagement/activity/info/index.vue

@@ -660,6 +660,7 @@ export default {
   min-height: 736px;
   min_width: 414px;
   word-wrap: break-word;
+  overflow: hidden;
 }
 
 .preview-content img {

src/views/operationsManagement/memGoldCoinFlow/index.vue

@@ -218,8 +218,7 @@ export default {
         count: undefined,
         endCount: undefined,
         orderId: undefined,
-        targetId: undefined,
-        flag: ''
+        targetId: undefined
       },
       // 表单参数
       form: {},

src/views/operationsManagement/member/info/index.vue

@@ -846,7 +846,7 @@ export default {
         })
       }
     },
-    residenceFormatter() {``
+    residenceFormatter() {
       this.form.memResidence = [this.form.memResidenceProvince, this.form.memResidenceCity]
       this.form.memNative = [this.form.memNativeProvince, this.form.memNativeCity]
     },

src/views/system/user/index.vue

@@ -46,11 +46,11 @@
           >{{ commonField.resetName }}</el-button>
         </el-form-item>
         <el-form-item style="float: right">
-<!--          <el-button-->
-<!--            :class="commonField.addClass"-->
-<!--            :type="commonField.typePrimary"-->
-<!--            @click="handleTest"-->
-<!--          >图片预览测试</el-button>-->
+          <!--          <el-button-->
+          <!--            :class="commonField.addClass"-->
+          <!--            :type="commonField.typePrimary"-->
+          <!--            @click="handleTest"-->
+          <!--          >图片预览测试</el-button>-->
           <!--          //新增按钮-->
           <el-button
             v-hasPermi="hasAddPerm"
@@ -196,36 +196,36 @@
       </el-col>
     </el-row>
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
             <el-form-item v-if="form.businessId == undefined" label="登录名" prop="username">
-              <el-input v-model="form.username" show-word-limit maxlength="20" placeholder="请输入登录名" />
+              <el-input v-model="form.username" show-word-limit maxlength="20" placeholder="请输入登录名" style="width: 180px" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.businessId == undefined" label="密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入密码" type="password" />
+              <el-input v-model="form.password" placeholder="请输入密码" type="password" style="width: 180px" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="form.name" placeholder="请输入用户名称" />
+              <el-input v-model.trim="form.name" placeholder="请输入用户名称" style="width: 180px" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" />
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" style="width: 180px" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="性别">
-              <el-select v-model="form.sex" placeholder="请选择">
+              <el-select v-model="form.sex" placeholder="请选择" style="width: 180px">
                 <el-option
                   v-for="dict in sexOptions"
                   :key="dict.dictValue"
@@ -238,23 +238,38 @@
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phone">
               <el-input
-                v-model.trim="form.phone"
+                v-model.trim="displayedPhone"
                 value="phone"
                 placeholder="请输入手机号码"
                 maxlength="11"
+                style="width: 180px"
               />
+              <el-tooltip v-if="form.businessId != undefined" :content="showSecretData ? '点击解锁' : '点击锁定'" placement="top">
+                <i
+                  v-if="showSecretData"
+                  class="el-icon-lock"
+                  style="margin-left: 10px; cursor: pointer;font-size: 20px"
+                  @click="toggleLock(false)"
+                />
+                <i
+                  v-else
+                  class="el-icon-unlock"
+                  style="margin-left: 10px; cursor: pointer;font-size: 20px"
+                  @click="toggleLock(true)"
+                />
+              </el-tooltip>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="身份证号" prop="idNumber">
-              <el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
+              <el-input v-model.trim="displayedIdNumber" placeholder="请输入身份证号" maxlength="18" style="width: 180px" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
+              <el-input v-model.trim="displayedEmail" placeholder="请输入邮箱" maxlength="25" style="width: 180px" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -413,7 +428,7 @@ import {
   changeUserStatus,
   importExcel,
   uploadFalseFile,
-  importTemplate
+  importTemplate, getPrivate
   // userLoginManage
 } from '@/api/system/user'
 import { getToken } from '@/utils/auth'
@@ -609,12 +624,53 @@ export default {
       userInfoLoading: false,
       userImportLoading: false,
       userRestLoading: false,
-      addLoading: false
+      addLoading: false,
+      showSecretData: true
     }
   },
   computed: {
     commonField() {
       return commonField
+    },
+    displayedPhone: {
+      get() {
+        if (this.showSecretData && this.form.businessId !== undefined) {
+          // 如果 memPhone 有值，则显示实际的电话号码；否则显示 '**'
+          return this.form.phone || '***********'
+        } else {
+          return this.form.phone
+        }
+      },
+      set(value) {
+        // 当用户输入时，更新 form.memPhone
+        this.form.phone = value
+      }
+    },
+    displayedEmail: {
+      get() {
+        if (this.showSecretData && this.form.businessId !== undefined) {
+          return this.form.email || '***********'
+        } else {
+          return this.form.email
+        }
+      },
+      set(value) {
+        // 当用户输入时，更新 form.memPhone
+        this.form.email = value
+      }
+    },
+    displayedIdNumber: {
+      get() {
+        if (this.showSecretData && this.form.businessId !== undefined) {
+          return this.form.idNumber || '***********'
+        } else {
+          return this.form.idNumber
+        }
+      },
+      set(value) {
+        // 当用户输入时，更新 form.memPhone
+        this.form.idNumber = value
+      }
     }
   },
   /** 路由离开前存储筛选条件*/
@@ -770,6 +826,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false
+      this.showSecretData = true
       this.reset()
     },
     // 表单重置
@@ -840,6 +897,7 @@ export default {
           this.form.roleList.push(id)
         })
         // this.form.postId = response.data.deptId
+        this.showSecretData = true
         this.title = '修改用户'
       })
       // this.getChildrenDept(userId)
@@ -875,7 +933,17 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.businessId !== undefined) {
-            updateUser(this.form).then(response => {
+            const paramsUp = { ...this.form }
+            if (this.form.phone === '' || this.form.phone === null) {
+              paramsUp.phone = undefined
+            }
+            if (this.form.email === '' || this.form.email === null) {
+              paramsUp.email = undefined
+            }
+            if (this.form.idNumber === '' || this.form.idNumber === null) {
+              paramsUp.idNumber = undefined
+            }
+            updateUser(paramsUp).then(response => {
               this.$message({
                 message: '修改成功',
                 type: 'success'
@@ -1050,6 +1118,20 @@ export default {
     },
     /* 上传文件所需求 */
     handlePreview(file) {
+    },
+    toggleLock(isLocked) {
+      if (!isLocked) {
+        getPrivate(this.form.businessId).then(res => {
+          this.form.email = res.data.email
+          this.form.idNumber = res.data.idNumber
+          this.form.phone = res.data.phone
+        })
+      } else {
+        this.form.email = ''
+        this.form.idNumber = ''
+        this.form.phone = ''
+      }
+      this.showSecretData = isLocked
     }
   }
 }