From 7eaa8172f163571725109f663388dbee2f743791 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 9 May 2022 10:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=BE=E8=AE=A1=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/utils/request.js                 |  1 -
 .../processForm/taskListProcess/index.vue     | 33 +++++++++++-
 .../projectManagement/components/TaskList.vue | 52 ++++++++++++++++---
 3 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js
index 43c3e00c2..b447b3d9a 100644
--- a/jero-web/src/utils/request.js
+++ b/jero-web/src/utils/request.js
@@ -149,7 +149,6 @@ service.interceptors.request.use(config => {
       ...config.data
     }
   }
-  console.log(config)
   return config
 }, (error) => {
   return Promise.reject(error)
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index d0796936e..40d900739 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -68,7 +68,7 @@
         queryBy: {},
         queryProject: {},
         loading: false,
-        textLoading:this.$t('dataLoading'),
+        textLoading: this.$t('dataLoading'),
         projectInformationList: [
           {
             title: this.$t('entryName'),
@@ -183,6 +183,10 @@
       }
     },
     mounted() {
+      let _this = this
+      this.queryTaskDetailByTask(function() {
+        _this.queryProjectLawsInventoryInfo()
+      })
     },
     methods: {
       ...mapGetters(['userInfo']),
@@ -194,6 +198,33 @@
       },
       sendBack() {
 
+      },
+      queryTaskDetailByTask(callback) {
+        this.loading = true
+        getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
+          if (res instanceof String) {
+            this.queryBy = JSON.parse(res)
+            callback()
+          } else {
+            this.queryBy = res
+            callback()
+          }
+        })
+      },
+      queryProjectLawsInventoryInfo() {
+        let query = {
+          id: this.queryBy.id,
+          operatorType: 'taskAffirmQuery'
+        }
+        getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
+          if (res.success) {
+            this.queryProject = res.result.projectLawsInventory || {}
+            this.loading = false
+          } else {
+            this.queryProject = {}
+            this.loading = false
+          }
+        })
       }
     }
   }
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 6b4257f52..74c50aacd 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -52,8 +52,8 @@
       >
         <div slot="standardInformation" slot-scope="text,result" class="box-left">
           <div class="content">
-            <a class="box-content">GB-7258-2017</a><br/>
-            <a>及东盟火车大师傅但是</a>
+            <a class="box-content">{{result.serialNumber}}</a><br/>
+            <a>{{result.title}}</a>
           </div>
         </div>
         <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
@@ -63,28 +63,34 @@
           </div>
         </div>
         <div slot="confirmationOfDesignConformity" slot-scope="text,result" class="box-left">
-          <div class="content">
+          <div class="content" v-if="result.designTaskStatus">
             <span class="box-content">截止时间: 2022-06-01</span><br/>
             <span class="box-content">流程状态: 待审核</span><br/>
             <span class="box-content-color">待追踪</span>
           </div>
-          <div class="content-box">
+          <div class="content-box" v-if="result.designTaskStatus == 'NotDone'" @click="verifyTaskClick(result,1)">
             <div class="content-box-jiao"></div>
           </div>
         </div>
         <div slot="PrehomoConfirmation" slot-scope="text,result" class="box-left">
-          <div class="content">
+          <div class="content" v-if="result.prehomoTaskStatus">
             <span class="box-content">截止时间: 2022-06-01</span><br/>
             <span class="box-content">流程状态: 待审核</span><br/>
             <span class="box-content-color">待追踪</span>
           </div>
+          <div class="content-box" v-if="result.prehomoTaskStatus == 'NotDone'" @click="verifyTaskClick(result,2)">
+            <div class="content-box-jiao"></div>
+          </div>
         </div>
         <div slot="verificationAndConformityconfirmation" slot-scope="text,result" class="box-left">
-          <div class="content">
+          <div class="content" v-if="result.verifyTaskStatus">
             <span class="box-content">截止时间: 2022-06-01</span><br/>
             <span class="box-content">流程状态: 待审核</span><br/>
             <span class="box-content-color">待追踪</span>
           </div>
+          <div class="content-box" v-if="result.verifyTaskStatus == 'NotDone'" @click="verifyTaskClick(result,3)">
+            <div class="content-box-jiao"></div>
+          </div>
         </div>
         <div slot="CertificationProgress" slot-scope="text,result">
              <span class="box-content-color box-content-cou" @click="CertificationProgressClick(result)">
@@ -171,6 +177,11 @@
           }
         ],
         selectedRowKeys: [],
+        status: {
+          'NotDone': '待办',
+          'haveDone': '已办',
+          'showData': '展示数据'
+        },
         queryParam: {},
         url: {
           list: '/project/projectTaskInventoryEO/list'
@@ -195,6 +206,31 @@
       },
       handleExport() {
 
+      },
+      verifyTaskClick(val, num) {
+        let query = {}
+        switch (num) {
+          case 1:
+            query = {
+              taskIds: val.designTaskId
+            }
+            break
+          case 2:
+            query = {
+              taskIds: val.prehomoTaskId
+            }
+            break
+          case 3:
+            query = {
+              taskIds: val.verifyTaskId
+            }
+            break
+        }
+        let newUrl = this.$router.resolve({
+          path: '/taskListProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
       },
       CertificationDirectory() {
         this.$refs.certificationDirectoryRef.addModel()
@@ -206,8 +242,8 @@
         }
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            // this.dataSource = res.result
-            this.dataSource = [{}]
+            this.dataSource = res.result
+            // this.dataSource = [{}]
           } else {
             this.dataSource = []
           }