From 9d0e5156ee97a9274d58755bb840c81435cdd1b7 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sat, 16 Apr 2022 23:02:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90fix=E3=80=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=E5=8F=AF=E4=BB=A5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/modules/UserModal.vue    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 3878b72c..3d4bd49b 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -23,7 +23,7 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules">
 
         <a-form-model-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
-          <a-input placeholder="请输入用户账号" v-model="model.username" :readOnly="!!model.id"/>
+          <a-input placeholder="请输入用户账号" v-model="model.username" :readOnly="!!model.id" :disabled="disableSubmit"/>
         </a-form-model-item>
 
         <template v-if="!model.id">
@@ -37,7 +37,7 @@
         </template>
 
         <a-form-model-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="realname">
-          <a-input placeholder="请输入用户姓名" v-model="model.realname" />
+          <a-input placeholder="请输入用户姓名" v-model="model.realname" :disabled="disableSubmit"/>
         </a-form-model-item>
 
         <!--<a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@@ -59,7 +59,13 @@
 
         <!--部门分配-->
         <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
+          <j-select-depart
+            :disabled="disableSubmit"
+            v-model="model.selecteddeparts"
+            :multi="true"
+            @back="backDepartInfo"
+            :backDepart="true"
+            :treeOpera="true">></j-select-depart>
         </a-form-model-item>
 
         <!--租户分配
@@ -74,7 +80,7 @@
         -->
 
        <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group  v-model="model.userIdentity"  @change="identityChange">
+          <a-radio-group  v-model="model.userIdentity"  @change="identityChange" :disabled="disableSubmit">
             <a-radio :value="1">普通用户</a-radio>
             <a-radio :value="2">上级</a-radio>
           </a-radio-group>
@@ -89,22 +95,22 @@
         </a-form-model-item>
         <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
           <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
+          <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" :disabled="disableSubmit"></j-image-upload>
         </a-form-model-item>
 
         <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select  v-model="model.sex"  placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
+          <a-select  v-model="model.sex"  placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode" :disabled="disableSubmit">
             <a-select-option :value="1">男</a-select-option>
             <a-select-option :value="2">女</a-select-option>
           </a-select>
         </a-form-model-item>
 
         <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
-          <a-input placeholder="请输入邮箱" v-model="model.email" />
+          <a-input placeholder="请输入邮箱" v-model="model.email" :disabled="disableSubmit"/>
         </a-form-model-item>
 
         <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-          <a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-model="model.phone" />
+          <a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone') || disableSubmit" v-model="model.phone" />
         </a-form-model-item>
 
 <!--        <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">-->

From ce95a3bc755aa9d02a10dea38459c56a1af7bb8b Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sat, 16 Apr 2022 23:11:33 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90fix=E3=80=91=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8A=E4=BC=A0=E4=BB=BB=E6=84=8F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/modules/UserModal.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 3d4bd49b..b9e56274 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -95,7 +95,11 @@
         </a-form-model-item>
         <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
           <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" :disabled="disableSubmit"></j-image-upload>
+          <j-image-upload class="avatar-uploader"
+                          text="上传"
+                          v-model="model.avatar"
+                          :disabled="disableSubmit"
+                          accept='.png,.PNG,.jpg,.JPG'></j-image-upload>
         </a-form-model-item>
 
         <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">

From 0350f909d2dec887c4afe6cec62c620317a881d9 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sat, 16 Apr 2022 23:24:06 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90fix=E3=80=91=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=8F=AA=E8=83=BD=E4=B8=8A=E4=BC=A0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JImageUpload.vue   | 3 +--
 jero-web/src/views/system/modules/UserModal.vue | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/jero/JImageUpload.vue b/jero-web/src/components/jero/JImageUpload.vue
index 6eb18b5d..779821d1 100644
--- a/jero-web/src/components/jero/JImageUpload.vue
+++ b/jero-web/src/components/jero/JImageUpload.vue
@@ -10,7 +10,6 @@
       :fileList="fileList"
       :beforeUpload="beforeUpload"
       :disabled="disabled"
-      :isMultiple="isMultiple"
       v-bind="$attrs"
       v-on="childListeners"
       @change="handleChange"
@@ -141,7 +140,7 @@
         this.picUrl = false;
         let fileList = info.fileList
         //update-begin-author:wangshuai date:20201022 for:LOWCOD-969 判断number是否大于0和是否多选，返回选定的元素。
-        if(this.number>0 && this.isMultiple){
+        if(this.number>0){
           fileList = fileList.slice(-this.number);
         }
         //update-end-author:wangshuai date:20201022 for:LOWCOD-969 判断number是否大于0和是否多选，返回选定的元素。
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index b9e56274..325fcaf3 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -99,6 +99,7 @@
                           text="上传"
                           v-model="model.avatar"
                           :disabled="disableSubmit"
+                          number=1
                           accept='.png,.PNG,.jpg,.JPG'></j-image-upload>
         </a-form-model-item>
 

From 3c496456b490eef0876e53513a3c3c542628eb50 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sat, 16 Apr 2022 23:32:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90fix=E3=80=91=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=E6=97=B6=E5=80=99=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JImageUpload.vue |  2 +-
 jero-web/src/views/system/DepartUserList.vue  | 24 +++++++++----------
 .../src/views/system/modules/UserModal.vue    |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/components/jero/JImageUpload.vue b/jero-web/src/components/jero/JImageUpload.vue
index 779821d1..410670e7 100644
--- a/jero-web/src/components/jero/JImageUpload.vue
+++ b/jero-web/src/components/jero/JImageUpload.vue
@@ -186,7 +186,7 @@
           path = ''
         }
         let arr = [];
-        if(!this.isMultiple){
+        if(!this.isMultiple && uploadFiles && uploadFiles.length > 0){
           arr.push(uploadFiles[uploadFiles.length-1].url)
         }else{
           for(let a=0;a<uploadFiles.length;a++){
diff --git a/jero-web/src/views/system/DepartUserList.vue b/jero-web/src/views/system/DepartUserList.vue
index 29921e04..61394f94 100644
--- a/jero-web/src/views/system/DepartUserList.vue
+++ b/jero-web/src/views/system/DepartUserList.vue
@@ -51,13 +51,13 @@
   import DeptUserInfo from './modules/DeptUserInfo'
   import { queryMyDepartTreeList, searchByKeywords } from '@/api/api'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
-  import DeptRoleInfo from './modules/DeptRoleInfo'
+  // import DeptRoleInfo from './modules/DeptRoleInfo'
 
   export default {
     name: 'DepartUserList',
     mixins: [JeroListMixin],
     components: {
-      DeptRoleInfo,
+      // DeptRoleInfo,
       DeptBaseInfo,
       DeptUserInfo,
     },
@@ -106,13 +106,13 @@
       loadData() {
         this.refresh();
       },
-      // clearSelectedDepartKeys() {
-      //   this.checkedKeys = [];
-      //   this.selectedKeys = [];
-      //   this.currentDeptId = '';
-      //   this.$refs.DeptUserInfo.currentDeptId='';
-      //   this.$refs.DeptRoleInfo.currentDeptId='';
-      // },
+      clearSelectedDepartKeys() {
+        this.checkedKeys = [];
+        this.selectedKeys = [];
+        this.currentDeptId = '';
+        this.$refs.DeptUserInfo.currentDeptId='';
+        // this.$refs.DeptRoleInfo.currentDeptId='';
+      },
       loadTree() {
         var that = this
         that.treeData = []
@@ -185,7 +185,7 @@
 
         this.$refs.DeptBaseInfo.open(record);
         this.$refs.DeptUserInfo.open(record);
-        this.$refs.DeptRoleInfo.open(record);
+        // this.$refs.DeptRoleInfo.open(record);
         // }
         // else {
         //   this.checkedKeys = [];
@@ -205,8 +205,8 @@
         this.$refs.DeptBaseInfo.open(record);
         this.$refs.DeptUserInfo.onClearSelected();
         this.$refs.DeptUserInfo.open(record);
-        this.$refs.DeptRoleInfo.onClearSelected();
-        this.$refs.DeptRoleInfo.open(record);
+        // this.$refs.DeptRoleInfo.onClearSelected();
+        // this.$refs.DeptRoleInfo.open(record);
       },
     },
     created() {
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 325fcaf3..accaa21b 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -99,7 +99,7 @@
                           text="上传"
                           v-model="model.avatar"
                           :disabled="disableSubmit"
-                          number=1
+                          :number=1
                           accept='.png,.PNG,.jpg,.JPG'></j-image-upload>
         </a-form-model-item>