From d4037e753add02164561e29bf01c157da7d20b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 8 May 2023 16:51:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E9=A1=B9=E8=B7=B3=E8=BD=AC=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectNonConformance/index.vue           | 70 ++++++++++++++++++-
 .../components/circulationHistory.vue         |  2 +-
 jero-web/vue.config.js                        |  4 +-
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 06d667f8f..138bf8377 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -162,7 +162,7 @@
         :columns="columns"
       >
         <span slot="standard" slot-scope="text,result">
-           <a @click="standardClick(result)" class="textName" :title="text">
+           <a @click="designFlowStatusClick(result)" class="textName" :title="text">
              {{text}}
            </a>
         </span>
@@ -180,19 +180,22 @@
         @showSizeChange="SizeChange"
       />
     </div>
+    <designCompliance ref="designComplianceRef"/>
   </a-card>
 </template>
 
 <script>
   import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance'
   import store from '@/store/'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'projectNonConformance',
     components: {
-      PersonnelSelection
+      PersonnelSelection,
+      designCompliance
     },
     mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
@@ -390,6 +393,69 @@
         this.queryParam[value] = id
         this.queryParam = { ...this.queryParam }
       },
+
+      //流程状态点击事件
+      designFlowStatusClick(row, name) {
+        let query = {}
+        let TaskKey = ''
+        let flowTypeName = ''
+        if (row.prcType == '2') {
+          if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
+            TaskKey = 'zrrqr'
+          } else if (row.flowStatus == 'Results to be submitted') {
+            TaskKey = 'zrrtjjfw'
+          } else if (row.flowStatus == 'Results to be reviewed' ||
+            row.flowStatus == 'Compliance' ||
+            row.flowStatus == 'Non-Compliance' ||
+            row.flowStatus == 'To be tracked' ||
+            row.flowStatus == 'NA') {
+            TaskKey = 'fggcssh'
+          }
+          query = {
+            actiProcInstId: row.prcId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId:row.projectLibraryId,
+            TaskKey: TaskKey,
+            isDisplay: false,
+            flowType: row.prcType,
+            Sponsor: 'regulationOwnerName',
+            personLiable: 'designDutyIdName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+          }
+          flowTypeName = this.$t('designComplianceProcess')
+        } else if(row.prcType == '4'){
+          if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
+            TaskKey = 'zrrqr'
+          } else if (row.flowStatus == 'Results to be submitted') {
+            TaskKey = 'zrrtjjfw'
+          } else if (row.flowStatus == 'Results to be reviewed' ||
+            row.flowStatus == 'Compliance' ||
+            row.flowStatus == 'Non-Compliance' ||
+            row.flowStatus == 'To be tracked' ||
+            row.flowStatus == 'NA') {
+            TaskKey = 'fggcssh'
+          }
+          query = {
+            actiProcInstId: row.prcId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId: row.projectLibraryId,
+            TaskKey: TaskKey,
+            flowType: row.prcType,
+            isDisplay: false,
+            Sponsor: 'regulationOwnerName',
+            personLiable: 'verifyDutyIdName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+          }
+          flowTypeName = this.$t('validationComplianceProcess')
+        }
+        this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), flowTypeName)
+      },
       standardClick(val) {
         let num = val.prcType
         let query = {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
index abcc81102..3528accfb 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -319,7 +319,7 @@
   @import '~@assets/less/common.less';
 
   .box {
-    padding: 0 0 24px 0;
+    padding: 0 0 38px 0;
     box-sizing: border-box;
   }
 
diff --git a/jero-web/vue.config.js b/jero-web/vue.config.js
index 77a5ca337..54040702a 100644
--- a/jero-web/vue.config.js
+++ b/jero-web/vue.config.js
@@ -93,15 +93,15 @@ module.exports = {
          }
        }, */
       '/jero-boot': {
-        // target: 'http://10.0.3.22:8080', //请求本地 jero-boot后台项目
+        target: 'http://localhost:8082', //请求本地 jero-boot后台项目
         // target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目
         // target: 'http://10.0.1.25:8080',
         // target: 'http://10.0.1.5:8080',
-        target: 'http://127.0.0.1:8080',
         ws: false,
         changeOrigin: true
       }
     }
   },
+
   lintOnSave: undefined
 }