Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/main-sidebar.vue

@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-14 15:20:28
+ * @LastEditTime: 2022-10-18 15:15:37
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -35,8 +35,9 @@
 
 <script>
 import http from '@/utils/request'
-import SubMenu from './main-sidebar-sub-menu'
+import SubMenu from "./main-sidebar-sub-menu";
-import returnLocationStr from '@/utils/location'
+import returnLocationStr from '@/utils/location';
+import bus from '@/views/bus.js'
 export default {
   data () {
     return {
@@ -48,48 +49,51 @@ export default {
   },
   created () {
     this.getNum()
-    // this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    //this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    //更新我的待办得数量
+    bus.$off('updateTaskNum')
+    bus.$on('updateTaskNum', () => {
+      this.getNum()
+    })
   },
   methods: {
-    getNum () {
+    getNum(){
-      http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
+    http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
-        this.numObject = res.data
+    this.numObject=res.data
-        const menuList = window.SITE_CONFIG.menuList
+   let menuList= window.SITE_CONFIG["menuList"];
-        for (var i = 0; i < menuList.length; i++) {
+   console.log('menuList====>',menuList);
-          const menu = menuList[i]
+   console.log('this.numObject====>',this.numObject);
-          if (menu.id == '1541261628388888578') { // 我的待办
+   for(var i=0;i<menuList.length;i++){
-            let daibanNum = 0
+     let menu=menuList[i];
-            for (let j = 0; j < menu.children.length; j++) {
+      if(menu.id=='1541261628388888578'){//我的待办
-              const children = menu.children[j]
+        let daibanNum=0
-              if (children.id == '1541261780432408577') { // 能力申请 v2
+      for(let j=0;j<menu.children.length;j++){
-                // 西海岸 v2  市局v3
+        let children=menu.children[j]
-                children.total = returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
+        if(children.id=="1541261780432408577"){//能力申请 v2
-                daibanNum = Number(daibanNum) + Number(children.total)
+           //西海岸 v2  市局v3
-              } if (children.id == '1559376285703081986') { // 会议室审核
+          children.total= returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
-                children.total = Number(this.numObject.meetingroom_book)
+         daibanNum=Number(daibanNum)+Number(children.total)
-                daibanNum = Number(daibanNum) + Number(children.total)
+      } if(children.id=="1559376285703081986"){//会议室审核
-              } if (children.id == '1545292602084827138') { // 能力资源上架
+        children.total=Number(this.numObject.meetingroom_book)
-                children.total = Number(this.numObject.resourcemountapply)
+         daibanNum=Number(daibanNum)+Number(children.total)
-                daibanNum = Number(daibanNum) + Number(children.total)
+      }if(children.id=="1545292602084827138"){//能力资源上架
-              } if (children.id == '1545312045695377410') { // 能力需求申请
+        children.total=Number(this.numObject.resourcemountapply)
-                children.total = Number(this.numObject.abilitydemandapply)
+         daibanNum=Number(daibanNum)+Number(children.total)
-                daibanNum = Number(daibanNum) + Number(children.total)
+      }if(children.id=="1545312045695377410"){//能力需求申请
-              } if (children.id == '1545313018614521857') { // 能力需求下架
+        children.total=Number(this.numObject.abilitydemandapply)
-                children.total = Number(this.numObject.resourcundercarriageapply)
+         daibanNum=Number(daibanNum)+Number(children.total)
-                daibanNum = Number(daibanNum) + Number(children.total)
+      }if(children.id=="1545313018614521857"){//能力需求下架
-              } if (children.id == '1545313754106699777') { // 评论审核
+        children.total=Number(this.numObject.resourcundercarriageapply)
-                children.total = Number(this.numObject.comment_review)
+         daibanNum=Number(daibanNum)+Number(children.total)
-                daibanNum = Number(daibanNum) + Number(children.total)
+      }if(children.id=="1545313754106699777"){//评论审核
-              } if (children.id == '1554294862931562498') { // 会议室 暂无
+        children.total=Number(this.numObject.comment_review)
-                children.total = 0
+         daibanNum=Number(daibanNum)+Number(children.total)
-                daibanNum = Number(daibanNum) + Number(children.total)
+      }if(children.id=="1554294862931562498"){//会议室 暂无
-              }
+        children.total=0
-            }
+         daibanNum=Number(daibanNum)+Number(children.total)
-            menu.total = daibanNum
+      } 
-          }
+      }
-        }
+      menu.total=daibanNum
-        this.$store.state.sidebarMenuList = menuList
-      })
     }
   }
 }

back/src/views/modules/myAgent/CompetencyApplication.vue

@@ -47,6 +47,13 @@
             }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="申请人所属部门" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.tAbilityApplicationDTOList[0].unit)
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           :label="$t('process.system')"
           header-align="center"
@@ -161,7 +168,8 @@ export default {
   created () {
     bus.$off('competencyApplicationInit')
     bus.$on('competencyApplicationInit', () => {
-      this.getDataList()
+      this.getDataList();
+      bus.$emit('updateTaskNum')
     })
   }
 }