From 9a0f57d14a71a0685075ec349c6d35e99bf9e4fa Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 2 Jun 2022 10:24:06 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/DepartList.vue      | 18 ++++-----
 .../src/views/system/modules/UserModal.vue    | 40 ++++++++++---------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue
index 87e1bea04..869505494 100644
--- a/jero-web/src/views/system/DepartList.vue
+++ b/jero-web/src/views/system/DepartList.vue
@@ -4,13 +4,13 @@
       <a-card :bordered="false" style="padding: 12px 0;">
         <!-- 按钮操作区域 -->
         <a-row style="margin-left: 14px">
-                    <a-button @click="handleAdd(1)" type="primary">{{$t('AddDepartment')}}</a-button>
-                    <a-button @click="handleAdd(2)" type="primary">{{$t('AddSubordinate')}}</a-button>
+<!--                    <a-button @click="handleAdd(1)" type="primary">{{$t('AddDepartment')}}</a-button>-->
+<!--                    <a-button @click="handleAdd(2)" type="primary">{{$t('AddSubordinate')}}</a-button>-->
           <!--          <a-button type="primary" icon="download" @click="handleExportXls($t('DepartmentInformation'))">{{$t('export')}}</a-button>-->
           <!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
           <!--            <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
           <!--          </a-upload>-->
-                    <a-button :title="$t('DeleteMultiplePiecesData')" @click="batchDel" type="default">{{$t('BatchDelete')}}</a-button>
+<!--                    <a-button :title="$t('DeleteMultiplePiecesData')" @click="batchDel" type="default">{{$t('BatchDelete')}}</a-button>-->
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
         <div style="padding-left:16px;height: 100%;">
@@ -78,7 +78,7 @@
                 :wrapperCol="wrapperCol"
                 :label="$t('OrganizationName')">
                 <a-input :placeholder="$t('EnterOrganizationDepartment')"
-                         :disabled="disable"
+                         :disabled="disablecode"
                          v-decorator="['departName', validatorRules.departName ]"/>
               </a-form-item>
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('SuperiorDepartment')">
@@ -87,7 +87,7 @@
                   style="width:100%"
                   :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
                   :treeData="treeData"
-                  :disabled="disable"
+                  :disabled="disablecode"
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   v-model="model.parentId"
                   :placeholder="$t('nothing')">
@@ -107,7 +107,7 @@
                 :label="$t('OrganizationType')">
                 <j-dict-select-tag class="box-input"
                                    v-decorator="['orgCategory',validatorRules.orgCategory]"
-                                   :disabled="disable"
+                                   :disabled="disablecode"
                                    :placeholder="$t('pleaseSelect')+$t('OrganizationType')"
                                    :type="'select'"
                                    triggerChange dictCode="org_category"/>
@@ -137,7 +137,7 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 :label="$t('sort')">
-                <a-input-number :disabled="disable" v-decorator="[ 'departOrder',{'initialValue':0}]"/>
+                <a-input-number :disabled="disablecode" v-decorator="[ 'departOrder',{'initialValue':0}]"/>
               </a-form-item>
               <!--              <a-form-item-->
               <!--                :labelCol="labelCol"-->
@@ -163,8 +163,8 @@
             </a-form>
                         <div class="anty-form-btn">
 <!--                          <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">{{$t('reset')}}</a-button>-->
-                          <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">{{$t('preservation')}}
-                          </a-button>
+<!--                          <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">{{$t('preservation')}}-->
+<!--                          </a-button>-->
                         </div>
           </a-card>
           <a-card v-else :bordered="false" style="height:248px !important;">
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 75dc44749..81bd78685 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -68,16 +68,17 @@
 
         <!--部门分配-->
 <!--        v-show="!departDisabled && !disabled"-->
-        <a-form-item :label="$t('DepartmentAllocation')" :labelCol="labelCol" :wrapperCol="wrapperCol"
-                     >
-          <a-input-search
-            :placeholder="$t('ClickSelectDepartment')"
-            v-model="checkedDepartNameString"
-            readOnly
-            @search="onSearch">
-            <a-button slot="enterButton" icon="search">{{$t('choice')}}</a-button>
-          </a-input-search>
-        </a-form-item>
+<!--        <a-form-item :label="$t('DepartmentAllocation')" :labelCol="labelCol" :wrapperCol="wrapperCol"-->
+<!--                     >-->
+<!--          <a-input-search-->
+<!--            :placeholder="$t('ClickSelectDepartment')"-->
+<!--            v-model="checkedDepartNameString"-->
+<!--            readOnly-->
+<!--            :disabled='isdisabled'-->
+<!--            @search="onSearch">-->
+<!--            <a-button slot="enterButton" icon="search">{{$t('choice')}}</a-button>-->
+<!--          </a-input-search>-->
+<!--        </a-form-item>-->
 
         <!--租户分配-->
         <!--<a-form-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">-->
@@ -136,20 +137,21 @@
         <!--:getCalendarContainer="node => node.parentNode"/>-->
         <!--</a-form-item>-->
 <!--        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 :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>-->
 <!--        v-if="!disabled"-->
         <a-form-item :label="$t('mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]"/>
+          <a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]" :disabled='isdisabled'/>
         </a-form-item>
 <!--        v-if="!disabled"-->
+<!--        :disabled="isDisabledAuth('user:form:phone')"-->
         <a-form-item :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterMobileNumber')" :disabled="isDisabledAuth('user:form:phone')"
+          <a-input :placeholder="$t('enterMobileNumber')" :disabled='isdisabled'
                    v-decorator="[ 'phone', validatorRules.phone]"/>
         </a-form-item>