修改bug

src/components/jeecgbiz/modal/JSelectUserByDepModal.vue

@@ -190,12 +190,17 @@
           this.ipagination.current = 1
         }
         if (this.selectedDepIds && this.selectedDepIds.length > 0) {
-          await this.initQueryUserByDepId(this.selectedDepIds)
+          this.loading = true
+          let params = this.getQueryParams()//查询条件
+          params.id = this.selectedDepIds.join(",");
+          console.log("<><><><",params);
+          await this.initQueryUserByDepId(params);
           // console.log("这边1");
         } else {
           // console.log("这边2");
           this.loading = true
           let params = this.getQueryParams()//查询条件
+          console.log("<><><><",params);
           await getUserList(params).then((res) => {
             if (res.success) {
               this.dataSource = res.result.records
@@ -307,7 +312,7 @@
       // 根据选择的id来查询用户信息
       initQueryUserByDepId(selectedDepIds) {
         this.loading = true
-        return queryUserByDepId({ id: selectedDepIds.toString() }).then((res) => {
+        return queryUserByDepId(selectedDepIds).then((res) => {
           if (res.success) {
             this.dataSource = res.result
             this.ipagination.total = res.result.length

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -167,6 +167,7 @@
   export default {
     name: 'ProcessMaterialWarehousingForm',
     mixins: [JEditableTableMixin],
+    inject:['closeCurrent'],
     components: {
       JFormContainer,
       JDate,
@@ -652,7 +653,8 @@
                     this.$message.success('提交申请成功！')
                     //todo 将表单的数据传给父组件
                     this.$emit('loadData')
-                    this.close()
+                    this.close();
+                    this.closeCurrent();
                   } else {
                     this.$message.error(res.message)
                   }
@@ -753,6 +755,7 @@
                     //todo 将表单的数据传给父组件
                     if(e!=true){
                       this.$emit('afterSubmit', formData)
+                      this.closeCurrent();
                     }
                   } else {
                     this.$message.error(res.message)

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -142,6 +142,7 @@
   export default {
     name: 'ProcessMaterialsAllotForm',
     mixins: [JEditableTableMixin],
+    inject:['closeCurrent'],
     components: {
       JFormContainer,
       JDate,
@@ -970,7 +971,8 @@
                     this.$message.success('提交申请成功！')
                     //todo 将表单的数据传给父组件
                     this.$emit('loadData')
-                    this.close()
+                    this.close();
+                    this.closeCurrent();
                   } else {
                     this.$message.error(res.message)
                   }
@@ -1062,6 +1064,7 @@
                     this.$message.success('保存成功！')
                     //todo 将表单的数据传给父组件
                     this.$emit('afterSubmit', formData)
+                    this.closeCurrent();
                   } else {
                     this.$message.error(res.message)
                   }

src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@@ -155,6 +155,7 @@
   export default {
     name: 'ProcessMaterialsDeliveryForm',
     mixins: [JEditableTableMixin],
+    inject:['closeCurrent'],
     components: {
       JFormContainer,
       JDate,
@@ -1276,7 +1277,9 @@
                     this.$message.success('提交申请成功！')
                     //todo 将表单的数据传给父组件
                     this.$emit('loadData')
-                    this.close()
+                    this.close();
+                    this.closeCurrent();
+                    // this.$store.dispatch( this.activePage, this.$route)
                   } else {
                     this.$message.error(res.message)
                   }
@@ -1349,6 +1352,7 @@
                     //this.$message.success("保存成功！")
                     //todo 将表单的数据传给父组件
                     this.$emit('afterSubmit', formData)
+                    this.closeCurrent();
                   } else {
                     this.$message.error(res.message)
                   }

src/views/activiti/form/ProcessPermissionAuthorizationForm.vue

@@ -119,6 +119,7 @@
   import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
   export default {
     name: 'ProcessPermissionAuthorizationForm',
+    inject:['closeCurrent'],
     components: {
       JFormContainer,
       JDate,
@@ -370,6 +371,7 @@
                     authorizationNumberDays: '',
                     fileId: '',
                   })
+                  this.closeCurrent();
                   // this.close();
                 }else{
                   that.$message.warning(res.message);
@@ -414,7 +416,8 @@
               this.btndisabled = true;
               httpAction(httpurl,formData,method).then((res)=>{
                 if(res.success){
-                  this.$emit('afterSubmit',formData)
+                  this.$emit('afterSubmit',formData);
+                  this.closeCurrent();
                 }else{
                   that.$message.warning(res.message);
                 }

src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@@ -119,6 +119,7 @@
   export default {
     name: 'ProcessSmaterialsScrapForm',
     mixins: [JEditableTableMixin],
+    inject:['closeCurrent'],
     components: {
       JFormContainer,
       JDate,
@@ -405,7 +406,7 @@
     created() {
       //如果是流程中表单，则需要加载流程表单data
       this.showFlowData();
-      console.log("dfgsdf",this.allotBaoNumber);
+      // console.log("dfgsdf",this.allotBaoNumber);
       let company = sessionStorage.getItem('PARENT_ID')
       let userInfo = sessionStorage.getItem('USER_INFORMATION')
       this.department(userInfo);
@@ -932,6 +933,7 @@
                     //todo 将表单的数据传给父组件
                     this.$emit('loadData')
                     this.close();
+                    this.closeCurrent();
                   } else {
                     this.$message.error(res.message)
                   }
@@ -989,6 +991,7 @@
                     this.$message.success('保存成功！')
                     //todo 将表单的数据传给父组件
                     this.$emit('afterSubmit', formData)
+                    this.closeCurrent();
                   } else {
                     this.$message.error(res.message)
                   }

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -231,6 +231,7 @@
   export default {
     name: 'ProcessUdgetPlanForm',
     mixins: [JEditableTableMixin],
+    inject:['closeCurrent'],
     components: {
       Template1,
       JFormContainer,
@@ -1573,7 +1574,8 @@
                     this.$message.success('提交申请成功！')
                     //todo 将表单的数据传给父组件
                     this.$emit('loadData')
-                    this.close()
+                    this.close();
+                    this.closeCurrent();
                   } else {
                     this.$message.error(res.message)
                   }
@@ -1811,6 +1813,7 @@
                     //todo 将表单的数据传给父组件
                     if (e != true) {
                       this.$emit('afterSubmit', formData)
+                      this.closeCurrent();
                     }
                   } else {
                     this.$message.error(res.message)

src/views/system/DepartList.vue

@@ -1,8 +1,7 @@
 <template xmlns:background-color="http://www.w3.org/1999/xhtml">
   <a-row :gutter="10">
-    <a-col :md="12" :sm="24">
+    <a-col :md="12" :sm="24" :style="conheight">
       <a-card :bordered="false">
-
         <!-- 按钮操作区域 -->
         <a-row style="margin-left: 14px">
           <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
@@ -14,7 +13,7 @@
           <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
-        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
+        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px;">
           <a-alert type="info" :showIcon="true">
             <div slot="message">
               当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
@@ -37,6 +36,7 @@
               :checkedKeys="checkedKeys"
               :treeData="departTree"
               :checkStrictly="checkStrictly"
+              :expandedKeys="iExpandedKeys"
               :autoExpandParent="autoExpandParent"
               @expand="onExpand"/>
                 </span>
@@ -69,7 +69,7 @@
       </div>-->
       <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
     </a-col>
-    <a-col :md="12" :sm="24">
+    <a-col :md="12" :sm="24" :style="conheight" style="background: #ffffff">
       <a-tabs defaultActiveKey="1">
         <a-tab-pane tab="基本信息" key="1" >
           <a-card :bordered="false" v-if="selectedKeys.length>0">
@@ -270,6 +270,9 @@
           importExcelUrl: "sys/sysDepart/importExcel",
         },
         orgCategoryDisabled:false,
+        conheight:{
+          height:''
+        }
       }
     },
     computed: {
@@ -277,7 +280,14 @@
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       }
     },
+    mounted() {
+      window.addEventListener('resize', this.getHeight);
+      this.getHeight();
+    },
     methods: {
+      getHeight(){
+        this.conheight.height=window.innerHeight-130+'px';
+      },
       loadData() {
         this.refresh();
       },
@@ -303,7 +313,7 @@
       },
       setThisExpandedKeys(node) {
         if (node.children && node.children.length > 0) {
-          this.iExpandedKeys.push(node.key)
+          // this.iExpandedKeys.push(node.key)
           for (let a = 0; a < node.children.length; a++) {
             this.setThisExpandedKeys(node.children[a])
           }

src/views/system/modules/UserModal.vue

@@ -34,33 +34,37 @@
           </a-col>
 
         <template v-if="!model.id">
-          <a-col :span="12" >
+          <a-col :span="11" >
           <a-form-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" >
             <a-input type="password" placeholder="请输入登录密码" v-decorator="[ 'password',validatorRules.password]" />
           </a-form-item>
           </a-col >
-          <a-col :span="12" >
+          <a-col :span="11" >
           <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" >
             <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
           </a-form-item>
             </a-col >
         </template>
-          <a-col :span="12" >
+          <a-col :span="11" >
         <a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" >
           <a-input placeholder="请输入用户姓名" v-decorator.trim="[ 'realname', validatorRules.realname]"  :disabled = "editMeans"/>
         </a-form-item>
           </a-col>
-            <a-col :span="12" >
+        </a-row>
+        <a-row>
+         <a-col :span="11" >
         <a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入工号" v-decorator.trim="[ 'workNo', validatorRules.workNo]" :disabled = "editMeans"/>
         </a-form-item>
             </a-col>
-              <a-col :span="12" >
+              <a-col :span="11" >
         <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-select-position placeholder="请选择职务" :multiple="true" v-decorator.trim="['post']" :disabled = "editMeans"/>
         </a-form-item>
               </a-col>
-                <a-col :span="12" >
+        </a-row>
+        <a-row>
+        <a-col :span="11" >
         <a-form-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
           <a-select
             mode="multiple"
@@ -76,7 +80,7 @@
           </a-select>
         </a-form-item>
                 </a-col>
-                  <a-col :span="12" >
+                  <a-col :span="11" >
         <!--部门分配-->
         <a-form-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
           <a-input-search
@@ -90,7 +94,7 @@
 <!--          <j-select-depart v-model="checkedDepartNameString" :multi="false" :value="checkedDepartNameString" :trigger-change="true"  ></j-select-depart>-->
         </a-form-item>
                   </a-col>
-
+        </a-row>
         <!--租户分配-->
 <!--        <a-form-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">-->
 
@@ -107,7 +111,8 @@
 <!--        </a-form-item>-->
 
        <!-- update--begin--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
-                    <a-col :span="12" >
+        <a-row>
+                    <a-col :span="11" >
         <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
 <!--          <a-radio-group-->
 <!--            v-model="identity"-->
@@ -134,7 +139,7 @@
           </a-upload>
         </a-form-item>
                     </a-col>
-          <a-col :span="12" >
+          <a-col :span="11" >
             <a-form-item label="签名" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <!--          <a-radio-group-->
               <!--            v-model="identity"-->
@@ -161,7 +166,8 @@
               </a-upload>
             </a-form-item>
           </a-col>
-       <a-col :span="12" >
+        </a-row>
+        <a-row>
         <a-form-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-if="departIdShow==true">
           <a-select
             mode="multiple"
@@ -209,7 +215,7 @@
 <!--            v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"-->
 <!--            :getCalendarContainer="node => node.parentNode"/>-->
 <!--        </a-form-item>-->
-         <a-col :span="12" >
+         <a-col :span="11" >
         <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select v-decorator="[ 'sex', {}]" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode" :disabled = "editMeans">
             <a-select-option :value="1">男</a-select-option>
@@ -217,12 +223,12 @@
           </a-select>
         </a-form-item>
          </a-col>
-           <a-col :span="12" >
+           <a-col :span="11" >
         <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" :disabled = "editMeans" />
         </a-form-item>
            </a-col>
-             <a-col :span="12" >
+             <a-col :span="11" >
         <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
 <!--          <a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')"  v-decorator="[ 'phone', validatorRules.phone]"  />-->
           <a-input placeholder="请输入手机号码"   v-decorator="[ 'phone', validatorRules.phone]" :disabled = "editMeans" />