修改部门问题

src/components/jeecgbiz/modal/JSelectUserByDepModal.vue

@@ -295,8 +295,9 @@
       },
       // 点击树节点,筛选出对应的用户
       onDepSelect(selectedDepIds) {
-        if (selectedDepIds[0] != null) {
+        // console.log("123123",selectedDepIds)
-          this.initQueryUserByDepId(selectedDepIds) // 调用方法根据选选择的id查询用户信息
+        if (!!selectedDepIds[0]) {
+          this.initQueryUserByDepId(selectedDepIds[0]) // 调用方法根据选选择的id查询用户信息
           if (this.selectedDepIds[0] !== selectedDepIds[0]) {
             this.selectedDepIds = [selectedDepIds[0]]
           }
@@ -311,8 +312,12 @@
       },
       // 根据选择的id来查询用户信息
       initQueryUserByDepId(selectedDepIds) {
-        this.loading = true
+        console.log(">>>>",selectedDepIds)
-        return queryUserByDepId(selectedDepIds).then((res) => {
+        this.loading = true;
+        let a= {
+          id : selectedDepIds
+        }
+        return queryUserByDepId(a).then((res) => {
           if (res.success) {
             this.dataSource = res.result
             this.ipagination.total = res.result.length

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -1272,7 +1272,8 @@
           if (val==1 && values.materialType!=6 ){
             this.isIfDirect = true
           }else {
-            this.isIfDirect = false
+            this.isIfDirect = false;
+            this.isIfInspection = false;
           }
         })
 
@@ -1299,6 +1300,18 @@
           if (res.success) {
             // console.log("??????????????",res.result);
             // this.planType = res.result.planType
+            if (res.result.planType ==1 ){
+              this.isIfDirect = true;
+              if (res.result.ifDirect == 1) {
+                this.isIfInspection = true
+              } else {
+                this.isIfInspection = false
+              }
+            }else {
+              this.isIfDirect = false;
+              this.isIfInspection = false;
+            }
+
             let formData = res.result
             formData.tableName = r.tableName
             this.data = formData

src/views/dashboard/HomePage.vue

@@ -388,6 +388,16 @@ export default {
 
     this.colorLists();
   },
+  watch:{
+    $route: {
+      handler:  function (val, oldVal){
+        this.todoList();
+        // console.log("执行了》》》》》》》》》",val);
+      },
+      // 深度观察监听
+      deep:  true
+    }
+  },
 
   methods: {
     getHeight(){
@@ -718,7 +728,6 @@ export default {
     },
     //待办任务查询
     async todoList(){
-
       getAction(this.url.todoManger).then((res) => {
         if (res.success) {
           // console.log("res")

src/views/system/DepartList.vue

@@ -22,9 +22,10 @@
           </a-alert>
           <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
           <!-- 树-->
-          <a-col :md="10" :sm="24">
+          <a-col >
-            <template>
+            <div style="background: #fff;overflow-y: auto;height: 60vh;width: 100%">
-              <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
+              <template>
+                <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
                <span style="user-select: none">
             <a-tree
               checkable
@@ -40,14 +41,15 @@
               :autoExpandParent="autoExpandParent"
               @expand="onExpand"/>
                 </span>
-                <!--新增右键点击事件,和增加添加和删除功能-->
+                  <!--新增右键点击事件,和增加添加和删除功能-->
-                <a-menu slot="overlay">
+                  <a-menu slot="overlay">
-                  <a-menu-item @click="handleAdd(3)" key="1">添加</a-menu-item>
+                    <a-menu-item @click="handleAdd(3)" key="1">添加</a-menu-item>
-                  <a-menu-item @click="handleDelete" key="2">删除</a-menu-item>
+                    <a-menu-item @click="handleDelete" key="2">删除</a-menu-item>
-                  <a-menu-item @click="closeDrop" key="3">取消</a-menu-item>
+                    <a-menu-item @click="closeDrop" key="3">取消</a-menu-item>
-                </a-menu>
+                  </a-menu>
-              </a-dropdown>
+                </a-dropdown>
-            </template>
+              </template>
+            </div>
           </a-col>
         </div>
       </a-card>
@@ -387,8 +389,11 @@
             if (res.success) {
               that.departTree = []
               for (let i = 0; i < res.result.length; i++) {
-                let temp = res.result[i]
+                if(res.result[i].orgType != '3'){
-                that.departTree.push(temp)
+                  let temp = res.result[i]
+                  that.departTree.push(temp)
+                }
+
               }
             } else {
               that.$message.warning(res.message)

src/views/system/DepartUserList.vue

@@ -154,14 +154,14 @@
             }
             this.loading = false
           }
-          console.log("biaoshiii",res.message);
+          // console.log("biaoshiii",res.message);
           that.userIdentity = res.message
         })
       },
       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++) {
@@ -227,14 +227,13 @@
         if (this.selectedKeys[0] !== selectedKeys[0]) {
           this.selectedKeys = [selectedKeys[0]];
         }
-        console.log("12312")
+        // console.log("12312")
         let record = e.node.dataRef;
         this.checkedKeys.push(record.id);
         this.$refs.DeptBaseInfo.open(record);
         this.$refs.DeptUserInfo.onClearSelected();
         this.$refs.DeptUserInfo.open(record);
-        console.log("" +
+        // console.log("" +"123123",this.userIdentity)
-          "123123",this.userIdentity)
         if(this.userIdentity !== '1'){
           this.$refs.DeptRoleInfo.onClearSelected();
           this.$refs.DeptRoleInfo.open(record);