diff --git a/jeepay-ui-manager/src/views/sysuser/AddOrEdit.vue b/jeepay-ui-manager/src/views/sysuser/AddOrEdit.vue
index d8d67ea140bb2c9f8a049cb0f2ba83da67e140b1..fa472d0c28ef70b5f451936fa5000c0e84b8f608 100644
--- a/jeepay-ui-manager/src/views/sysuser/AddOrEdit.vue
+++ b/jeepay-ui-manager/src/views/sysuser/AddOrEdit.vue
@@ -205,12 +205,14 @@ export default {
               that.$message.success('修改成功')
               that.isShow = false
               that.callbackFunc() // 刷新列表
-              that.resetIsShow = false // 取消展示
-              that.sysPassword.resetPass = false
+              this.resetIsShow = false // 取消重置密码板块展示
+              this.sysPassword.resetPass = false // 是否使用默认密码不展示
+              this.sysPassword.defaultPass = true	// 是否使用默认密码默认为true
             }).catch(res => {
               that.confirmLoading = false
-              that.resetIsShow = false // 取消展示
-              that.sysPassword.resetPass = false
+              this.resetIsShow = false // 取消重置密码板块展示
+              this.sysPassword.resetPass = false // 是否使用默认密码不展示
+              this.sysPassword.defaultPass = true	// 是否使用默认密码默认为true
             })
           }
         }
@@ -220,7 +222,8 @@ export default {
     onClose () {
       this.isShow = false
       this.resetIsShow = false // 取消重置密码板块展示
-      this.sysPassword.resetPass = false
+      this.sysPassword.resetPass = false // 是否使用默认密码不展示
+      this.sysPassword.defaultPass = true	// 是否使用默认密码默认为true
     },
     // 使用默认密码重置是否为true
     isResetPass () {
diff --git a/jeepay-ui-merchant/src/views/sysuser/AddOrEdit.vue b/jeepay-ui-merchant/src/views/sysuser/AddOrEdit.vue
index 40222189c5ba154103161f6da931d93169d72c6a..50209ec9726763d31038fa1bf6558d12c517908d 100644
--- a/jeepay-ui-merchant/src/views/sysuser/AddOrEdit.vue
+++ b/jeepay-ui-merchant/src/views/sysuser/AddOrEdit.vue
@@ -13,77 +13,94 @@
     <a-form-model
       ref="infoFormModel"
       :model="saveObject"
-      :label-col="{span: 8}"
-      :wrapper-col="{span: 12}"
-      :rules="rules">
+      :rules="rules"
+      style="padding-bottom:50px"
+      layout="vertical"
+    >
+      <a-row justify="space-between" type="flex">
+        <a-col :span="10">
+          <a-form-model-item label="用户登录名:" prop="loginUsername">
+            <a-input v-model="saveObject.loginUsername" :disabled="!isAdd" />
+          </a-form-model-item>
+        </a-col>
 
-      <a-form-model-item label="用户登录名:" prop="loginUsername">
-        <a-input v-model="saveObject.loginUsername" :disabled="!isAdd" />
-      </a-form-model-item>
+        <a-col :span="10">
+          <a-form-model-item label="用户姓名：" prop="realname">
+            <a-input v-model="saveObject.realname" />
+          </a-form-model-item>
+        </a-col>
 
-      <a-form-model-item label="用户姓名：" prop="realname">
-        <a-input v-model="saveObject.realname" />
-      </a-form-model-item>
+        <a-col :span="10">
+          <a-form-model-item label="手机号：" prop="telphone">
+            <a-input v-model="saveObject.telphone" />
+          </a-form-model-item>
+        </a-col>
 
-      <a-form-model-item label="手机号：" prop="telphone">
-        <a-input v-model="saveObject.telphone" />
-      </a-form-model-item>
+        <a-col :span="10">
+          <a-form-model-item label="编号：" prop="userNo">
+            <a-input v-model="saveObject.userNo" />
+          </a-form-model-item>
+        </a-col>
 
-      <a-form-model-item label="编号：" prop="userNo">
-        <a-input v-model="saveObject.userNo" />
-      </a-form-model-item>
-
-      <a-form-model-item label="请选择性别：" prop="sex">
-        <a-radio-group v-model="saveObject.sex">
-          <a-radio :value="1">男</a-radio>
-          <a-radio :value="2">女</a-radio>
-        </a-radio-group>
-      </a-form-model-item>
-
-      <a-form-model-item label="是否为超级管理员：" prop="isAdmin">
-        <a-radio-group v-model="saveObject.isAdmin">
-          <a-radio :value="1">是</a-radio>
-          <a-radio :value="0">否</a-radio>
-        </a-radio-group>
-      </a-form-model-item>
-
-      <a-form-model-item label="状态：" prop="state">
-        <a-radio-group v-model="saveObject.state">
-          <a-radio :value="1">启用</a-radio>
-          <a-radio :value="0">停用</a-radio>
-        </a-radio-group>
-      </a-form-model-item>
+        <a-col :span="10">
+          <a-form-model-item label="请选择性别：" prop="sex">
+            <a-radio-group v-model="saveObject.sex">
+              <a-radio :value="1">男</a-radio>
+              <a-radio :value="2">女</a-radio>
+            </a-radio-group>
+          </a-form-model-item>
+        </a-col>
 
+        <a-col :span="10">
+          <a-form-model-item label="状态：" prop="state">
+            <a-radio-group v-model="saveObject.state">
+              <a-radio :value="1">启用</a-radio>
+              <a-radio :value="0">停用</a-radio>
+            </a-radio-group>
+          </a-form-model-item>
+        </a-col>
+      </a-row>
       <a-divider orientation="left" v-if="resetIsShow">
         <a-tag color="#FF4B33">
           账户安全
         </a-tag>
       </a-divider>
-      <a-form-model-item label="重置密码：" v-if="resetIsShow">
-        <a-checkbox v-model="sysPassword.resetPass"></a-checkbox>
-      </a-form-model-item>
 
-      <div v-if="sysPassword.resetPass" style="padding-bottom:50px">
-        <a-form-model-item label="恢复默认密码：">
-          <a-checkbox v-model="sysPassword.defaultPass" @click="isResetPass"></a-checkbox>
-        </a-form-model-item>
-        <div>
-          <!-- <div v-else> -->
-          <div v-show="!this.sysPassword.defaultPass">
-            <a-form-model-item label="新密码：" prop="newPwd">
-              <a-input-password
-                autocomplete="new-password"
-                v-model="sysPassword.newPwd"
-                :disabled="sysPassword.defaultPass" />
+      <div style="display:flex;flex-direction:row;">
+        <a-row justify="space-between" type="flex" style="width:100%">
+          <a-col :span="10">
+            <a-form-model-item label="" v-if="resetIsShow">
+              重置密码：<a-checkbox v-model="sysPassword.resetPass"></a-checkbox>
             </a-form-model-item>
-
-            <a-form-model-item label="确认新密码：" prop="confirmPwd">
-              <a-input-password
-                autocomplete="new-password"
-                v-model="sysPassword.confirmPwd"
-                :disabled="sysPassword.defaultPass" />
+          </a-col>
+          <a-col :span="10">
+            <a-form-model-item label="" v-if="sysPassword.resetPass">
+              恢复默认密码：<a-checkbox v-model="sysPassword.defaultPass" @click="isResetPass"></a-checkbox>
             </a-form-model-item>
-          </div>
+          </a-col>
+        </a-row>
+      </div>
+
+      <div v-if="sysPassword.resetPass">
+        <div v-show="!this.sysPassword.defaultPass">
+          <a-row justify="space-between" type="flex">
+            <a-col :span="10">
+              <a-form-model-item label="新密码：" prop="newPwd">
+                <a-input-password
+                  autocomplete="new-password"
+                  v-model="sysPassword.newPwd"
+                  :disabled="sysPassword.defaultPass" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="10">
+              <a-form-model-item label="确认新密码：" prop="confirmPwd">
+                <a-input-password
+                  autocomplete="new-password"
+                  v-model="sysPassword.confirmPwd"
+                  :disabled="sysPassword.defaultPass" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
         </div>
       </div>
 
@@ -93,7 +110,6 @@
       </div>
 
     </a-form-model>
-
   </a-drawer>
 </template>
 
@@ -186,7 +202,6 @@
 				this.isAdd = !recordId
 				// 数据恢复为默认数据
 				this.saveObject = {
-					isAdmin: 1,
 					state: 1,
 					sex: 1
 				}
@@ -238,10 +253,14 @@
 								that.callbackFunc() // 刷新列表
 								that.resetIsShow = false // 取消展示
 								that.sysPassword.resetPass = false
+								that.sysPassword.defaultPass = true	// 是否使用默认密码默认为true
+								that.resetPassEmpty(that) // 清空密码
 							}).catch(res => {
 								that.confirmLoading = false
 								that.resetIsShow = false // 取消展示
 								that.sysPassword.resetPass = false
+								that.sysPassword.defaultPass = true	// 是否使用默认密码默认为true
+								that.resetPassEmpty(that) // 清空密码
 							})
 						}
 					}
@@ -251,7 +270,9 @@
 			onClose () {
 				this.isShow = false
 				this.resetIsShow = false // 取消重置密码板块展示
-				this.sysPassword.resetPass = false
+				this.resetPassEmpty(this) // 清空密码
+				this.sysPassword.resetPass = false // 关闭密码输入
+				this.sysPassword.defaultPass = true	// 是否使用默认密码默认为true
 			},
 			// 使用默认密码重置是否为true
 			isResetPass () {
@@ -259,6 +280,11 @@
 					this.sysPassword.newPwd = ''
 					this.sysPassword.confirmPwd = ''
 				}
+			},
+			// 保存后清空密码
+			resetPassEmpty (that) {
+				that.sysPassword.newPwd = ''
+				that.sysPassword.confirmPwd = ''
 			}
 		}
 	}