zxh 2 years ago
parent
commit
c819e34506

+ 6 - 5
src/views/currentSystem/authorityManagement/userRights/mergeUser/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="登录名" prop="username">
-          <el-input v-model="ruleForm.username" size="medium" placeholder="请输入登陆名" :disabled="difference"  :maxlength="20" />
+          <el-input v-model="ruleForm.username" size="medium" placeholder="请输入登陆名" :disabled="difference" :maxlength="20" />
         </el-form-item>
       </el-col>
       <el-col :span="24">
@@ -31,7 +31,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-       <el-col :span="24">
+      <el-col :span="24">
         <el-form-item label="部门" prop="departmentId">
           <el-cascader v-model="ruleForm.departmentId" :options="company" :props="{ expandTrigger: 'hover',checkStrictly: true }"
                        :key="isResouceShow2" clearable @change="handleChange" style="width:100%" size="medium">
@@ -45,7 +45,7 @@
       </el-col>
       <el-col :span="24">
         <el-form-item label="邮箱" prop="email">
-          <el-input v-model="ruleForm.email" size="medium" placeholder="请输入邮箱"  :maxlength="20"/>
+          <el-input v-model="ruleForm.email" size="medium" placeholder="请输入邮箱" :maxlength="20" />
         </el-form-item>
       </el-col>
       <el-col :span="24">
@@ -55,7 +55,7 @@
       </el-col>
       <el-col :span="24">
         <el-form-item label="CA标志" prop="caCode">
-          <el-input v-model="ruleForm.caCode" size="medium" placeholder="用户CA标志" :maxlength="20"/>
+          <el-input v-model="ruleForm.caCode" size="medium" placeholder="用户CA标志" :maxlength="20" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -228,10 +228,11 @@ export default {
       //   data.append('id', this.data.id)
       // }
       // return data
-      
+
       let data = JSON.parse(JSON.stringify(this.ruleForm))
       data.departmentId = parseInt(data.departmentId.at(-1))
       data['id'] = this.data.id
+      data['password'] = sha1Hex(this.ruleForm.password)
       // alert(data.id)
       return data
     },