合并分支 'ProjectThird' 到 'master'

Project third

查看合并请求 JeroBoot/jero-boot!7

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和是否多选，返回选定的元素。
@@ -187,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++){

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() {
+      clearSelectedDepartKeys() {
-      //   this.checkedKeys = [];
+        this.checkedKeys = [];
-      //   this.selectedKeys = [];
+        this.selectedKeys = [];
-      //   this.currentDeptId = '';
+        this.currentDeptId = '';
-      //   this.$refs.DeptUserInfo.currentDeptId='';
+        this.$refs.DeptUserInfo.currentDeptId='';
-      //   this.$refs.DeptRoleInfo.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.onClearSelected();
-        this.$refs.DeptRoleInfo.open(record);
+        // this.$refs.DeptRoleInfo.open(record);
       },
     },
     created() {

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,27 @@
         </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"
+                          :number=1
+                          accept='.png,.PNG,.jpg,.JPG'></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">-->