From 8859ccac50de531ffd46e802f077f33bc9f7d5cf Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 25 May 2022 10:19:25 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/modules/UserModal.vue    | 107 +++++++++---------
 1 file changed, 55 insertions(+), 52 deletions(-)

diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 953820d4b..b86cf873a 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -21,26 +21,26 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-
-        <a-form-item v-if="!disabled" :label="$t('userAccount')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]"
+<!--        v-if="!disabled"-->
+        <a-form-item :label="$t('userAccount')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]" disabled=true
                    :readOnly="!!model.id"/>
         </a-form-item>
-
-        <template v-if="!model.id && !disabled">
-          <a-form-item :label="$t('LoginPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input type="password" :placeholder="$t('enterLoginPassword')" autocomplete='new-password'
-                     v-decorator="[ 'password',validatorRules.password]"/>
-          </a-form-item>
-
-          <a-form-item v-if="!disabled" :label="$t('ConfirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('reenterLoginPassword')"
-                     v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
-          </a-form-item>
+<!--        v-if="!model.id && !disabled"-->
+        <template>
+<!--          <a-form-item :label="$t('LoginPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--            <a-input type="password" :placeholder="$t('enterLoginPassword')" autocomplete='new-password'-->
+<!--                     v-decorator="[ 'password',validatorRules.password]"/>-->
+<!--          </a-form-item>-->
+<!--          v-if="!disabled"-->
+<!--          <a-form-item :label="$t('ConfirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--            <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('reenterLoginPassword')"-->
+<!--                     v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>-->
+<!--          </a-form-item>-->
         </template>
-
-        <a-form-item v-if="!disabled" :label="$t('userName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterUserName')" v-decorator.trim="[ 'realname', validatorRules.realname]"/>
+<!--        v-if="!disabled"-->
+        <a-form-item :label="$t('userName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input :placeholder="$t('enterUserName')" disabled=true v-decorator.trim="[ 'realname', validatorRules.realname]"/>
         </a-form-item>
 
         <!--<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@@ -50,9 +50,9 @@
         <!--<a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
         <!--<j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]"/>-->
         <!--</a-form-item>-->
-
+<!--        v-show="!roleDisabled"-->
         <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol"
-                     v-show="!roleDisabled">
+                     >
           <a-select
             mode="multiple"
             style="width: 100%"
@@ -67,8 +67,9 @@
         </a-form-item>
 
         <!--部门分配-->
+<!--        v-show="!departDisabled && !disabled"-->
         <a-form-item :label="$t('DepartmentAllocation')" :labelCol="labelCol" :wrapperCol="wrapperCol"
-                     v-show="!departDisabled && !disabled">
+                     >
           <a-input-search
             :placeholder="$t('ClickSelectDepartment')"
             v-model="checkedDepartNameString"
@@ -94,32 +95,34 @@
         <!--</a-form-item>-->
 
         <!-- update--begin--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
-        <a-form-item v-if="!disabled" :label="$t('identity')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group
-            v-model="identity"
-            @change="identityChange">
-            <a-radio value="1">{{$t('OrdinaryUsers')}}</a-radio>
-            <a-radio value="2">{{$t('superior')}}</a-radio>
-          </a-radio-group>
-        </a-form-item>
-        <a-form-item :label="$t('ResponsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol"
-                     v-if="departIdShow==true && !disabled">
-          <a-select
-            :disabled="disabled"
-            mode="multiple"
-            style="width: 100%"
-            :placeholder="$t('selectResponsibleDepartment')"
-            v-model="departIds"
-            optionFilterProp="children"
-            :getPopupContainer="(target) => target.parentNode"
-            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-          >
-            <a-select-option v-for="item in resultDepartOptions" :key="item.key" :value="item.key"
-            >{{item.title}}
-            </a-select-option
-            >
-          </a-select>
-        </a-form-item>
+<!--        v-if="!disabled"-->
+<!--        <a-form-item  :label="$t('identity')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <a-radio-group-->
+<!--            v-model="identity"-->
+<!--            @change="identityChange">-->
+<!--            <a-radio value="1">{{$t('OrdinaryUsers')}}</a-radio>-->
+<!--            <a-radio value="2">{{$t('superior')}}</a-radio>-->
+<!--          </a-radio-group>-->
+<!--        </a-form-item>-->
+<!--        v-if="departIdShow==true && !disabled"-->
+<!--        <a-form-item :label="$t('ResponsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol"-->
+<!--                     >-->
+<!--          <a-select-->
+<!--            :disabled="disabled"-->
+<!--            mode="multiple"-->
+<!--            style="width: 100%"-->
+<!--            :placeholder="$t('selectResponsibleDepartment')"-->
+<!--            v-model="departIds"-->
+<!--            optionFilterProp="children"-->
+<!--            :getPopupContainer="(target) => target.parentNode"-->
+<!--            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"-->
+<!--          >-->
+<!--            <a-select-option v-for="item in resultDepartOptions" :key="item.key" :value="item.key"-->
+<!--            >{{item.title}}-->
+<!--            </a-select-option-->
+<!--            >-->
+<!--          </a-select>-->
+<!--        </a-form-item>-->
         <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
         <!--        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
         <!--          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList" ></j-image-upload>-->
@@ -132,20 +135,20 @@
         <!--v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"-->
         <!--:getCalendarContainer="node => node.parentNode"/>-->
         <!--</a-form-item>-->
-
-        <a-form-item v-if="!disabled" :label="$t('Gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--        v-if="!disabled"-->
+        <a-form-item :label="$t('Gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select v-decorator="[ 'sex', {}]" :placeholder="$t('selectGender')"
                     :getPopupContainer="(target) => target.parentNode">
             <a-select-option :value="1">{{$t('male')}}</a-select-option>
             <a-select-option :value="2">{{$t('female')}}</a-select-option>
           </a-select>
         </a-form-item>
-
-        <a-form-item v-if="!disabled" :label="$t('mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--        v-if="!disabled"-->
+        <a-form-item :label="$t('mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]"/>
         </a-form-item>
-
-        <a-form-item v-if="!disabled" :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--        v-if="!disabled"-->
+        <a-form-item :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input :placeholder="$t('enterMobileNumber')" :disabled="isDisabledAuth('user:form:phone')"
                    v-decorator="[ 'phone', validatorRules.phone]"/>
         </a-form-item>