对接任务确认流程

jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="doc-detail">
-<!--    认证参数收集——清单信息-->
+    <!--    认证参数收集——清单信息-->
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
           <span style="line-height: 74px;display: inline-block;float: left">
@@ -65,144 +65,144 @@
 </template>
 
 <script>
-import TaskList from '@/views/projectManagement/components/TaskList'
-import listOfRegulations from '@/views/projectManagement/components/listOfRegulations'
-import ProjectDetailsName from '@/views/projectManagement/components/ProjectDetails'
-import ParameterItemCollectionList from '../../components/ParameterItemCollectionList'
-import nonConformance from '@/views/projectManagement/components/nonConformance'
-import updateLog from '@/components/UpdateLog/index'
-import historicalVersionList from '@/views/projectManagement/components/historicalVersionList'
-import commentList from '@/views/projectManagement/components/commentList'
+  import TaskList from '@/views/projectManagement/components/TaskList'
+  import listOfRegulations from '@/views/projectManagement/components/listOfRegulations'
+  import ProjectDetailsName from '@/views/projectManagement/components/ProjectDetails'
+  import ParameterItemCollectionList from '../../components/ParameterItemCollectionList'
+  import nonConformance from '@/views/projectManagement/components/nonConformance'
+  import updateLog from '@/components/UpdateLog/index'
+  import historicalVersionList from '@/views/projectManagement/components/historicalVersionList'
+  import commentList from '@/views/projectManagement/components/commentList'
 
-export default {
-  name: 'ProjectDetails',
-  components: {
-    TaskList,
-    listOfRegulations,
-    ProjectDetailsName,
-    ParameterItemCollectionList,
-    nonConformance,
-    updateLog,
-    historicalVersionList,
-    commentList
-  },
-  data() {
-    return {
-      title: this.$t('projectDetails'),
-      textTitle: '认证参数收集',
-      url: {
-        logList: '',
-        historicalVersionUrl: ''
+  export default {
+    name: 'ProjectDetails',
+    components: {
+      TaskList,
+      listOfRegulations,
+      ProjectDetailsName,
+      ParameterItemCollectionList,
+      nonConformance,
+      updateLog,
+      historicalVersionList,
+      commentList
+    },
+    data() {
+      return {
+        title: this.$t('projectDetails'),
+        textTitle: '认证参数收集',
+        url: {
+          logList: '/project/projectLawsInventoryLogEO/page',
+          historicalVersionUrl: ''
+        },
+        paramsManifest: {}
+      }
+    },
+    mounted() {
+      this.textColor()
+      // 清单信息
+      this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
+    },
+    methods: {
+      textColor() {
+        let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+        if (textColor && textColor.length > 0) {
+          textColor[0].classList.remove('Virtual-detail-left-text-color')
+        }
+        let text = document.getElementsByClassName('Virtual-detail-left-text')
+        if (text && text.length > 0) {
+          text[4].classList.add('Virtual-detail-left-text-color')
+        }
       },
-      paramsManifest: {},
-    }
-  },
-  mounted() {
-    this.textColor()
-    // 清单信息
-    this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
-  },
-  methods: {
-    textColor() {
-      let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
-      if (textColor && textColor.length > 0) {
-        textColor[0].classList.remove('Virtual-detail-left-text-color')
+      textClick(num, name) {
+        this.textTitle = name
+        let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
+        if (textColor && textColor.length > 0) {
+          textColor[0].classList.remove('Virtual-detail-left-text-color')
+        }
+        let text = document.getElementsByClassName('Virtual-detail-left-text')
+        text[num].classList.add('Virtual-detail-left-text-color')
+      },
+      UpdateLogClick() {
+        this.$refs.updateLogRef.getList({ projectLibraryId: this.$route.query.id })
+      },
+      historicalVersionClick() {
+        this.$refs.historicalVersionListRef.getList()
+      },
+      commentClick() {
+        this.$refs.commentListRef.getData()
       }
-      let text = document.getElementsByClassName('Virtual-detail-left-text')
-      if (text && text.length > 0) {
-        text[4].classList.add('Virtual-detail-left-text-color')
-      }
-    },
-    textClick(num, name) {
-      this.textTitle = name
-      let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
-      if (textColor && textColor.length > 0) {
-        textColor[0].classList.remove('Virtual-detail-left-text-color')
-      }
-      let text = document.getElementsByClassName('Virtual-detail-left-text')
-      text[num].classList.add('Virtual-detail-left-text-color')
-    },
-    UpdateLogClick() {
-      this.$refs.updateLogRef.getList()
-    },
-    historicalVersionClick() {
-      this.$refs.historicalVersionListRef.getList()
-    },
-    commentClick() {
-      this.$refs.commentListRef.getData()
     }
   }
-}
 </script>
 
 <style lang="less" scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
-.doc-detail {
-  background: #fff;
-  height: 100%;
-
-  .Virtual-detail-header {
-    width: 100%;
-    height: 68px;
-    line-height: 68px;
-    padding: 0 32px 0 32px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 2px #eff1f3 solid;
+  .doc-detail {
     background: #fff;
-
-    .Virtual-detail-title {
-      display: inline-block;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-      font-size: 20px;
-      font-weight: 400;
-      color: #040B29;
-      line-height: 68px;
-    }
-
-    .doc-detail-right {
-      width: 800px;
-      line-height: 68px;
-      display: flex;
-    }
-  }
-
-  .Virtual-detail-left {
-    width: 240px;
-    padding: 16px 24px;
-    box-sizing: border-box;
-    font-size: 16px;
-    line-height: 3;
-    float: left;
-
-    .Virtual-detail-left-text {
-      padding: 2px 12px;
-      cursor: pointer;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-
-  .Virtual-detail-right {
-    border-left: 2px #eff1f3 solid;
-    width: calc(100% - 240px);
     height: 100%;
-    float: left;
-    overflow: auto;
+
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-left {
+      width: 240px;
+      padding: 16px 24px;
+      box-sizing: border-box;
+      font-size: 16px;
+      line-height: 3;
+      float: left;
+
+      .Virtual-detail-left-text {
+        padding: 2px 12px;
+        cursor: pointer;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+
+    .Virtual-detail-right {
+      border-left: 2px #eff1f3 solid;
+      width: calc(100% - 240px);
+      height: 100%;
+      float: left;
+      overflow: auto;
+    }
   }
-}
 
-.Virtual-detail-left-text-color {
-  background: #eff1f3;
-  border-radius: 4px;
-}
+  .Virtual-detail-left-text-color {
+    background: #eff1f3;
+    border-radius: 4px;
+  }
 
-.Virtual-detail-text-right {
+  .Virtual-detail-text-right {
 
-}
+  }
 </style>

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -90,7 +90,7 @@
         title: this.$t('projectDetails'),
         textTitle: '项目详情',
         url: {
-          logList: '',
+          logList: '/project/projectLawsInventoryLogEO/page',
           historicalVersionUrl: ''
         }
       }
@@ -119,7 +119,7 @@
         text[num].classList.add('Virtual-detail-left-text-color')
       },
       UpdateLogClick() {
-        this.$refs.updateLogRef.getList()
+        this.$refs.updateLogRef.getList({projectLibraryId: this.$route.query.id})
       },
       historicalVersionClick() {
         this.$refs.historicalVersionListRef.getList()

jero-web/src/views/projectManagement/components/TaskList.vue

@@ -273,6 +273,8 @@
       },
       verifyTaskClick(val, num, isTrue) {
         let query = {}
+        console.log(typeof isTrue)
+        return
         switch (num) {
           case 1:
             query = {
@@ -284,6 +286,7 @@
               studioEngineer: this.$route.query.studioEngineer,
               serialNumber: val.serialNumber,
               TaskKey: val.designTaskDefinitionKey,
+              isDisplay: isTrue,
               flowType: 2,
               Sponsor: 'designInitiatorName',
               personLiable: 'designDutyName',
@@ -306,6 +309,7 @@
               serialNumber: val.serialNumber,
               TaskKey: val.prehomoTaskDefinitionKey,
               flowType: 3,
+              isDisplay: isTrue,
               id: this.$route.query.id,
               Sponsor: 'prehomoInitiatorName',
               personLiable: 'prehomoDutyName',
@@ -329,6 +333,7 @@
               projectTaskInventoryId: val.projectLawsInventoryId,
               TaskKey: val.verifyTaskDefinitionKey,
               flowType: 4,
+              isDisplay: isTrue,
               Sponsor: 'verifyInitiatorName',
               personLiable: 'verifyDutyName',
               typeOfDeliverables: 'verifyDeliverableType_dictText',