YangJian0701 1 年間 前
コミット
ce588428b6

BIN
dist.rar


+ 15 - 3
src/views/ManagingUsers/index.vue

@@ -19,6 +19,11 @@
 						<span>{{ scope.row.T_name}}</span>
 					</template>
 				</el-table-column>
+				<el-table-column label="登录账号" width="180">
+					<template slot-scope="scope">
+						{{ scope.row.T_user}}
+					</template>
+				</el-table-column>
 				<el-table-column label="权限" width="180">
 					<template slot-scope="scope">
 						{{ scope.row.T_power_name}}
@@ -55,7 +60,7 @@
 						<el-input v-model="form.T_user" autocomplete="off"></el-input>
 					</el-form-item>
 					<el-form-item label="密码" :label-width="LabelWidth" prop="T_pass">
-						<el-input v-model="form.T_pass" autocomplete="off" show-password></el-input>
+						<el-input v-model="form.T_pass" autocomplete="off" maxlength="18" show-password></el-input>
 					</el-form-item>
 					<el-form-item :label-width="LabelWidth">
 						<el-button type="primary"  @click="submitForm('ruleForm')">
@@ -131,7 +136,14 @@
 				this.$refs[formName].validate((valid) => {
 			 	if (valid) {
 						var obj = {...this.form}
-						obj.T_pass = this.$md5(obj.T_pass)
+						console.log('提交1',obj.T_pass.length==32,obj.T_pass.length,obj.T_pass)
+
+						if(obj.T_pass=='********' || obj.T_pass.length==32){
+							obj.T_pass=''
+						}else{
+							obj.T_pass = this.$md5(obj.T_pass)
+						}
+						console.log('提交',obj)
 						if(this.bl==1){//新增提交
 							this.GetAdminAddApi(obj)
 						}else{//编辑提交
@@ -166,7 +178,7 @@
 				this.form.T_name = e.T_name
 				this.form.T_power = e.T_power
 				this.form.T_user = e.T_user
-				this.form.T_pass = '*********'
+				this.form.T_pass = '********'
 				this.form.T_uuid = e.T_uuid
 			},
 			GetUserPowerAllApi() { //权限select

+ 1 - 1
src/views/companyManagement/index.vue

@@ -15,7 +15,7 @@
 		</div>
 		<div class="companyManagement2">
 			<el-table :data="tableData" border size="small">
-				<el-table-column label="公司名称" width="250">
+				<el-table-column label="公司名称" width="350">
 					<template slot-scope="scope">
 						<span>{{ scope.row.T_name }}</span>
 					</template>

+ 3 - 3
src/views/layout/Topmenu.vue

@@ -54,7 +54,7 @@
 		},
 		methods: {
 			SetMenu(e){
-				this.$notify.error({
+				this.$notify.info({
 					title: '错误提示',
 					message: '功能正在更新中,敬请留意',
 					offset: 100
@@ -64,14 +64,14 @@
 				console.log(e)
 				switch(e){
 					case 'a':
-						this.$notify.error({
+						this.$notify.info({
 							title: '错误提示',
 							message: '功能正在更新中,敬请留意',
 							offset: 100
 						});
 						break
 					case 'b':
-						this.$notify.error({
+						this.$notify.info({
 							title: '错误提示',
 							message: '功能正在更新中,敬请留意',
 							offset: 100