Merge branch 'develop' of http://94.191.100.41/inet-two/web into develop

applications/architecture-dee/src/layout/components/Navbar.vue

@@ -101,7 +101,7 @@ export default {
       if (obj.name) {
         return obj.name
       } else if (obj.id === 'todoTask') {
-        return '待办任务'
+        return '我的任务'
       } else if (obj.id === 'myMessage') {
         return '我的消息'
       }

applications/dee-project/src/privateComponents/components/SelectUser/index.vue

@@ -69,34 +69,29 @@ export default {
     value: {
       immediate: true,
       handler(val) {
-        this.getUsers()
-        // console.log('valueKey', this.valueKey)
-        // if (val) {
-        //   let cloneValue = this.getValue(this.value)
-        //   let userIds = cloneValue
-        //   if (this.valueKey) {
-        //     cloneValue = val
-        //     userIds = [val.id]
-        //   }
-        //   this.cloneValue = cloneValue
-        //   this.getUsers(this.valueKey ? userIds : [userIds])
-        // } else {
-        //   this.cloneValue = ''
-        //   this.change('')
-        // }
-      }
-    }
+        if (val) {
+          let cloneValue = this.getValue(this.value)
+          let userIds = cloneValue
+          if (this.valueKey) {
+            cloneValue = val
+            userIds = [val.id]
+          }
+          this.cloneValue = cloneValue
+          this.getUsers(this.valueKey ? userIds : [userIds])
+        } else {
+          this.cloneValue = ''
+          this.change('')
+        }
+      } }
   },
   mounted() {
-    // this.getUsers()
+
   },
   methods: {
     getValue(val) {
       return Object.prototype.toString.call(val) === '[object Object]' ? (val.id ? Number(val.id) : '') : Number(val)
     },
     getUsers(userArr) {
-      // console.log('this.searchItems', this.searchItems)
-      // console.log('userArr', userArr)
       const params = {
         'indices': [
           'USERS'
@@ -127,7 +122,6 @@ export default {
           }
         ]
       }
-
       getAllUsers(params).then(res => {
         if (res.items && res.items.content) {
           this.userListOptions = res.items.content.map(n => {
@@ -137,7 +131,6 @@ export default {
               data: n
             }
           })
-          console.log('userListOptions', this.userListOptions)
         } else {
           this.userListOptions = []
         }
@@ -147,7 +140,6 @@ export default {
       })
     },
     remoteMethod(query) {
-      console.log('query', query)
       if (query.length > 1) {
         const params = {
           userAccount: query.trim()
@@ -166,7 +158,6 @@ export default {
       }
     },
     change(val) {
-      console.log('this.valueKey', this.valueKey)
       if (this.valueKey) {
         this.$emit('getUser', val)
         this.$emit('input', val)

applications/dee-project/src/privateComponents/components/createIEDPlanTask/index.vue

@@ -2,7 +2,7 @@
  * @Author: zhangtianfeng 3232807530@qq.com
  * @Date: 2024-09-24 16:32:32
  * @LastEditors: zhangtianfeng 3232807530@qq.com
- * @LastEditTime: 2024-09-25 10:14:30
+ * @LastEditTime: 2024-10-12 15:16:16
  * @FilePath: \inet-two\applications\dee-project\src\privateComponents\components\createIEDPlanTask\index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -40,6 +40,7 @@ export default {
     },
     changeIEDStatus() {
       const id = this.selectionRows[0].id
+
       post(`/ExtIEDPlan/lifecycle/changeStatus?id=${id}&status=unfinished&isValid=true`).then(res => {
         this.$emit('completeEven')
         this.$utils.showMessageSuccess('启动成功')
@@ -47,9 +48,16 @@ export default {
     },
     createIEDPlanTask() {
       const params = this.selectionRows[0]
-      post('/ExtIEDPlan/createIEDPlanTask', params).then(res => {
-        this.changeIEDStatus()
-      })
+      const state = this.selectionRows[0].state
+      const planName = this.selectionRows[0].fileNumber
+      if (state === 'unopened') {
+        console.log('进来了')
+        post('/ExtIEDPlan/createIEDPlanTask', params).then(res => {
+          this.changeIEDStatus()
+        })
+      } else {
+        this.$message.warning(`${planName}计划不是未开启状态`)
+      }
     }
 
   }

applications/dee-project/src/privateComponents/components/editProject/index.vue

@@ -50,7 +50,13 @@ export default {
           'operator': 'AND'
         },
         'openProps': [
-          { 'name': 'extProgramProjectLinks', 'openProps': [{ 'name': 'target' }] }]
+          { 'name': 'extProgramProjectLinks', 'openProps': [{ 'name': 'target' }] },
+          { 'name': 'header' },
+          { 'name': 'managerOrg' },
+          { 'name': 'manager' },
+          { 'name': 'extProject' },
+          { 'name': 'extProgram' }
+        ]
       }
       post(`/${this.subTypeName}/search`, params).then(res => {
         this.form = res.items.content[0]

applications/dee-task-center/src/business-components/tabCom/task-detail.vue

@@ -589,7 +589,6 @@ export default {
               }
             ]
           }
-          console.log('layoutId', res.items.layoutId)
           this.layoutId = res.items.layoutId || ''
           if (res.items.otherFormInfo && res.items.otherFormInfo.length) {
             this.editableTabs = this.editableTabs.concat(res.items.otherFormInfo.filter(r => r.isShow).map((r, index) => {
@@ -649,10 +648,9 @@ export default {
           // 定义addExaminationflag，subExaminationFlag，最终值为true时显示按钮，false时不显示按钮
           let addExaminationFlag = false
           let subExaminationFlag = false
-          // let delegateTaskFlag = false
+          let delegateTaskFlag = false
           // 当模板中配置了加签减签时，addExaminationflag，subExaminationFlag的值变为true，显示按钮
           const operationInfo = res.items.operationInfo
-          console.log('res.items.operationInfo', res.items.operationInfo)
           if (operationInfo) {
             operationInfo.forEach(x => {
               if (x.name === 'signAddTask') {
@@ -662,7 +660,7 @@ export default {
                 subExaminationFlag = true
               }
               if (x.name === 'delegateTask') {
-                // delegateTaskFlag = true
+                delegateTaskFlag = true
               }
             })
           }
@@ -684,10 +682,6 @@ export default {
           // 获取PBO
           getInstancePbo(instanceId).then(res => {
             const businessObject = res.items
-            console.log('basicInfo.state', basicInfo.state)
-            console.log('basicInfo.endTime', basicInfo.endTime)
-            console.log('basicInfo.assignee', basicInfo.assignee)
-            console.log("basicInfo.assignee.split(',').indexOf(localStorage.getItem('userId')) > -1", basicInfo.assignee.split(',').indexOf(localStorage.getItem('userId')) > -1)
             const canDeal = basicInfo.state !== 'BE_RECEIVED' && !basicInfo.endTime && (basicInfo.assignee && basicInfo.assignee.split(',').indexOf(localStorage.getItem('userId')) > -1)
             // 任务详情插入流程信息变量
             basicInfo.processInstVO = this.processInstVO
@@ -699,7 +693,6 @@ export default {
               this.typeName = businessObject.subTypeName
             }
             this.$set(this.basicData, 'canDeal', canDeal)
-            console.log('this.basicData看看这个里面有没有canDeal', this.basicData, canDeal)
             this.modelName = businessObject && businessObject.dxClassname ? this.$utils.getModelName4dxClassName(businessObject.dxClassname) : ''
             if (this.layoutId && businessObject && businessObject.subTypeName) {
               this.pageData = {
@@ -711,21 +704,21 @@ export default {
                   }
                 }
               }
-            // this.initTabs(businessObject.subTypeName, this.layoutId)
+              // this.initTabs(businessObject.subTypeName, this.layoutId)
             // this.initTabs('3', 'xform')
             }
             if (this.basicData.canDeal) {
-              // if (delegateTaskFlag) {
-              this.tools.push({
-                name: '委派',
-                icon: '/icons/b-assign.png',
-                handler: {
-                  click: () => {
-                    this.showReDesignateDia = true
+              if (delegateTaskFlag) {
+                this.tools.push({
+                  name: '委派',
+                  icon: '/icons/b-assign.png',
+                  handler: {
+                    click: () => {
+                      this.showReDesignateDia = true
+                    }
                   }
-                }
-              })
-              // }
+                })
+              }
               // 满足减签按钮显示条件时，将减签按钮加入
               if (subExaminationFlag) {
                 this.tools.unshift({
@@ -814,6 +807,7 @@ export default {
     // 完成任务
     // 反馈计划完成任务之前要先判断是否绑定反馈信息
     finishPlanReplyTask(flag, params, callback, errCallBack) {
+      this.initExtPlanReplyForm()
       if (this.isExtPlanReplyLinkBindSuccess) {
         this.finishTaskhandle(flag, params, callback, errCallBack)
       } else {
@@ -899,7 +893,7 @@ export default {
         }
       })
     },
-    // 初始化进度计划反馈信息表格
+    // 初始化进度计划反馈信息表格  判断是否绑定了反馈信息
     initExtPlanReplyForm() {
       const params = {
         'pageFrom': 1,
@@ -930,7 +924,6 @@ export default {
       }
       post('/ExtPlanReplyLink/search', params).then(res => {
         if (res.items.content.length > 0 && res.items.content[0].target) {
-          console.log('查询的接口', res.items.content)
           this.isExtPlanReplyLinkBindSuccess = true
           this.ExtPlanReplyLinkform = res.items.content[0].target || {}
         }
@@ -943,7 +936,6 @@ export default {
         sourceId: this.basicData.businessObject.id,
         opertar: 'AND'
       }
-      console.log('计划反馈信息', params)
       post('/ExtPlanReplyLink/recursion', params).then(res => {
         this.$utils.showMessageSuccess('保存成功')
       })

applications/dee-task-center/src/routes.js

@@ -28,7 +28,7 @@ export default [
         path: 'index',
         name: 'newhome',
         component: () => import('@/views/workflow/task-center/newhome'),
-        meta: { title: '新的任务中心' }
+        meta: { title: '我的任务' }
       },
       {
         path: '/message',

applications/dee-task-center/src/views/myTask/index.vue

@@ -50,22 +50,22 @@ export default {
       countOfType(params).then(res => {
         this.module = {
           id: 1,
-          title: '任务',
+          title: '我的任务',
           icon: '/images/navagations/task-icon.png',
           total: res.items.todoTask + res.items.unClaimedTask,
           name: '我的任务',
-          route: 'dee-task-center/workflow/task-center/home',
+          route: 'dee-task-center/workflow/task-center/newhome',
           serverName: 'dee-task-center',
           showMenu: false,
           list: [
             {
               name: '待办',
               value: res.items.todoTask
-            },
-            {
-              name: '待领取',
-              value: res.items.unClaimedTask
             }
+            // {
+            //   name: '待领取',
+            //   value: res.items.unClaimedTask
+            // }
           ]
         }
       })
@@ -94,7 +94,7 @@ export default {
       this.$store.dispatch('menu/activeModel', {
         appId: 'todoTask',
         pageInfo: {
-          path: '/dee-task-center/workflow/task-center/home'
+          path: '/dee-task-center/workflow/task-center/newhome'
         }
       })
       // this.$store.dispatch('app/toggleSideBar')

applications/dee-task-center/src/views/workflow/task-center/home/components/my-task.vue

@@ -13,7 +13,7 @@
         <i class="el-icon-refresh" style="margin-right:10px" title="刷新" @click="getTasks(1)" />
         <span @click="jumpList">更多<i class="el-icon-arrow-right" title="更多" /></span>
       </div>
-      <span class="more-text" @click="jumpNew">新的任务中心<i class="el-icon-arrow-right" title="更多" /></span>
+      <!-- <span class="more-text" @click="jumpNew">新的任务中心<i class="el-icon-arrow-right" title="更多" /></span> -->
     </div>
     <el-scrollbar class="task-content">
       <div v-for="(item, index) in taskList" :key="index" :class="['task-item', {'active-item': clickTask && clickTask.id === item.id,'unClaimed-type':item.unClaimedFlag}]" @click="goInfo(item)">
@@ -280,13 +280,13 @@ export default {
         query: { title: '任务查询' }
       })
     },
-    jumpNew() {
-      // console.log('点击了')
-      this.$router.push({
-        path: '/dee-task-center/workflow/task-center/newhome',
-        query: { title: '新的任务中心' }
-      })
-    },
+    // jumpNew() {
+    //   // console.log('点击了')
+    //   this.$router.push({
+    //     path: '/dee-task-center/workflow/task-center/home',
+    //     query: { title: '我的任务中心' }
+    //   })
+    // },
     goInfo(item) {
       this.clickTask = item
       this.$emit('getTaskDetail', item ? { id: item.id, processInstanceId: item.processInstanceId, title: item.title } : null)

applications/dee-task-center/src/views/workflow/task-center/message/index.vue

@@ -36,10 +36,10 @@ import { msgDetail, getTemplateDetail } from '@/api/message/message'
 export default {
   components: {},
   props: {
-    // id: {
-    //   type: Number,
-    //   default: 0
-    // }
+    id: {
+      type: Number,
+      default: 0
+    }
   },
   data() {
     return {
@@ -47,30 +47,31 @@ export default {
       showObjFlag: false,
       taskTitle: '',
       formSetting: null,
-      businessObject: null,
-      id: 0
+      businessObject: null
+      // id: 0
     }
   },
   computed: {
 
   },
-  // watch: {
-  //   id: {
-  //     immediate: true,
-  //     handler: function(val) {
-
-  //     }
-  //   }
-  // },
-  mounted: function() {
-    this.id = this.$route.query.id
-    if (this.id) {
-      this.getDetail()
+  watch: {
+    id: {
+      immediate: true,
+      handler: function(val) {
+        // this.id = val
+        this.getDetail(val)
+      }
     }
   },
+  // mounted: function() {
+  //   this.id = this.$route.query.id
+  //   if (this.id) {
+  //     this.getDetail()
+  //   }
+  // },
   methods: {
-    getDetail() {
-      msgDetail(this.id).then(res => {
+    getDetail(val) {
+      msgDetail(val).then(res => {
         this.message = res.items
         this.businessObject = JSON.parse(res.items.businessObject)
         res.items.templateId && this.getTemplate(res.items.templateId)

applications/dee-task-center/src/views/workflow/task-center/newhome/components/MessageTable.vue

@@ -8,6 +8,7 @@
     /> -->
 
     <dee-table
+      v-if="!ifShow"
       ref="messageTable"
       :columns="tableColums"
       :index-row="indexRow"
@@ -21,14 +22,22 @@
     >
       <dee-tools slot="header" :tools="tools" mode="normal" :collapse="false" />
     </dee-table>
+
+    <div v-if="ifShow" class="message-detail">
+      <img class="down-pic" src="/icons/d-down.png" @click="handleCloseDetail">
+      <messageDetail :id="messageId" />
+    </div>
+
   </div>
 </template>
 
 <script>
+import messageDetail from '../../message/index'
 import { setMsgStatus } from '@/api/message/message'
 import { post } from '@/utils/http'
 export default {
   name: 'MagList',
+  components: { messageDetail },
   props: {
     initdata: {
       type: Object,
@@ -37,6 +46,8 @@ export default {
   },
   data() {
     return {
+      ifShow: false,
+      messageId: 0,
       // seachForm: [
       //   {
       //     key: 'title',
@@ -170,6 +181,7 @@ export default {
       handler(val) {
         // console.log('类型', val)
         if (val) {
+          this.ifShow = false
           this.messageState = val === 'unread' ? 0 : 1
           this.getTableData(this.messageState)
         }
@@ -186,10 +198,12 @@ export default {
   methods: {
     linkToMsgDetail(item) {
       setMsgStatus(item).then(res => {
-        this.$router.push({
-          path: `/dee-task-center/workflow/task-center/message`,
-          query: { id: item.id, title: `消息详情` }
-        })
+        this.ifShow = true
+        this.messageId = item.id
+        // this.$router.push({
+        //   path: `/dee-task-center/workflow/task-center/message`,
+        //   query: { id: item.id, title: `消息详情` }
+        // })
       })
     },
     getTableData(state) {
@@ -246,6 +260,9 @@ export default {
       this.pagination.pageSize = pageSize
       this.pagination.currentPage = 1
       this.getTableData(this.messageState)
+    },
+    handleCloseDetail() {
+      this.ifShow = null
     }
   }
 }
@@ -261,5 +278,34 @@ export default {
     color: #2a75ce;
     cursor: pointer;
   }
+  .message-detail{
+    width: 100%;
+    height: 100%;
+    position: relative;
+    right: 0;
+    border-top: 1px solid #ddd;
+    background: #Fff;
+    overflow: auto;
+    .down-pic{
+      position: absolute;
+      left:0;
+      right: 0;
+      top: 0;
+      margin:0 auto;
+      cursor: pointer;
+    }
+    .icon-box {
+    display: flex;
+    width: 100%;
+    justify-content: flex-end;
+  }
+  .icon-btn {
+      font-size: 18px;
+      margin-left: 6px;
+      margin-top: 5px;
+      cursor: pointer;
+      color: #2f90e2;
+    }
+  }
 }
 </style>

applications/dee-task-center/src/views/workflow/task-center/newhome/components/MyProcessPlanTable.vue

@@ -2,17 +2,17 @@
 <template>
   <div class="processTask-list-page ">
 
-    <div class="processTask-table">
-      <div v-if="searchQuery">这里是高级搜索的表格
+    <div v-if="!ifShow" class="processTask-table">
+      <!-- <div v-if="searchQuery">这里是高级搜索的表格
         <dee-search-box
           :form-data="formData"
           v-bind="searchQueryForm"
           @searchEvent="searchEvent"
         />
-      </div>
+      </div> -->
       <div class="table-tool">
         <dee-tools :tools="tools" mode="normal" :collapse="false" />
-        <dee-tools :tools="searchTools" mode="normal" :collapse="false" />
+        <!-- <dee-tools :tools="searchTools" mode="normal" :collapse="false" /> -->
       </div>
       <dee-table
         ref="processTaskTable"
@@ -23,14 +23,11 @@
         :pagination="pagination"
         @pagination-current-change="paginationCurrentChange"
         @pagination-size-change="handleSizeChange"
-        @selection-change="selectionChange"
       />
-      <dee-drawer
-        title="流程信息"
-        :dialog-visible.sync="drawerDialogVisible"
-      >
-        <processInfo :click-item="clickItem" />
-      </dee-drawer>
+    </div>
+    <div v-if="ifShow" class="detail-container">
+      <img class="down-pic" src="/icons/d-down.png" @click="handleCloseDetail">
+      <processInfo :click-item="clickItem" />
     </div>
   </div>
 
@@ -44,7 +41,6 @@ import processInfo from '../../task/components/processInfo.vue'
 export default {
   name: 'MyProcessTaskTable',
   components: { processInfo },
-
   props: {
     initdata: {
       type: Object,
@@ -181,6 +177,7 @@ export default {
                   class: 'link-style',
                   on: {
                     click: () => {
+                      console.log('params', params)
                       this.gotoTaskDeatil(params)
 
                       // this.detailTitle = ''
@@ -212,6 +209,7 @@ export default {
       handler(val) {
         console.log('类型', val)
         this.taskState = val
+        this.ifShow = false
         this.getTableData(val)
         // const
         // const url = val ? `/workflow/task/${val}` : '/workflow/task/'
@@ -272,7 +270,9 @@ export default {
     },
     gotoTaskDeatil(params) {
       this.clickItem = JSON.parse(JSON.stringify(params))
-      this.drawerDialogVisible = true
+      // this.drawerDialogVisible = true
+      // this.itemData = params
+      this.ifShow = true
     }
   }
 }
@@ -302,11 +302,12 @@ export default {
     display: flex;
     justify-content: space-between;
   }
-  .detail-content{
+  .detail-container{
     width: 100%;
     height: 100%;
     position: relative;
     right: 0;
+    padding: 14px;
     border-top: 1px solid #ddd;
     background: #Fff;
     z-index: 10;

applications/dee-task-center/src/views/workflow/task-center/newhome/components/ProcessTaskTable.vue

@@ -2,16 +2,16 @@
 <template>
   <div class="processTask-list-page ">
     <div v-if="!ifShow" class="processTask-table">
-      <div v-if="searchQuery">这里是高级搜索的表格
+      <!-- <div v-if="searchQuery">这里是高级搜索的表格
         <dee-search-box
           :form-data="formData"
           v-bind="searchQueryForm"
           @searchEvent="searchEvent"
         />
-      </div>
+      </div> -->
       <div class="table-tool">
         <dee-tools :tools="tools" mode="normal" :collapse="false" />
-        <dee-tools :tools="searchTools" mode="normal" :collapse="false" />
+        <!-- <dee-tools :tools="searchTools" mode="normal" :collapse="false" /> -->
       </div>
       <dee-table
         ref="processTaskTable"
@@ -349,7 +349,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .processTask-list-page{
 
   height: 100%;