From 275595c743744d49d1927f7c489f1f85d96026b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 21 Mar 2023 10:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../components/circulationHistory.vue         | 150 +++++++++++++++---
 .../components/designCompliance.vue           |  10 +-
 .../components/projectInformation.vue         |   2 +-
 .../reviewedByThePersonInCharge.vue           |   8 +-
 .../components/standardContent.vue            |   2 +-
 7 files changed, 147 insertions(+), 29 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index bcbef9056..55df1c4f6 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1671,5 +1671,7 @@ module.exports = {
   thePersonResponsibleForDesignCannotBeBlank:'The person responsible for designing the compliance process cannot be empty',
   recordmaintenance:'Record maintenance',
   module:'module',
+  designComplianceReviewAdmin:'Design Compliance Review',
+  missionAccomplished:'Mission Accomplished',
 
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 67efb250f..fdbe640a5 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1771,4 +1771,6 @@ module.exports = {
   thePersonResponsibleForDesignCannotBeBlank:'设计符合性流程的责任人不能为空',
   recordmaintenance:'备案维护',
   module:'模块',
+  designComplianceReviewAdmin:'设计符合性审查',
+  missionAccomplished:'任务完成',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
index 22873d08a..0ed128549 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -5,6 +5,28 @@
         {{title}}
       </div>
     </div>
+    <div class="process-content">
+
+      <div class="process-content-top">
+        <div class="process-content-content" v-for="(item,index) in regulatoryCertificationTaskPlanList" :key="index">
+          <img v-if="item.status == 1" src="../../../../assets/wancheng.png" class="process-content-left" alt="">
+          <span v-else-if="item.status == 2" class="process-content-left">
+             <span class="process-content-left-yuan">
+                   4
+             </span>
+          </span>
+          <span v-else-if="item.status == 3" class="process-content-left">
+             <span class="process-content-left-last">
+                   5
+             </span>
+          </span>
+          <div class="process-content-right">
+            <div class="process-content-right-top" :title="item.name">{{item.name}}</div>
+          </div>
+        </div>
+      </div>
+      <div class="process-content-right-xian"></div>
+    </div>
     <div style="width: 100%">
       <a-table
         ref="table"
@@ -38,19 +60,10 @@
 
   export default {
     name: 'circulationHistory',
-    components:{
+    components: {
       viewFileModel
     },
     props: {
-      //  需要参数urlFrom，获取数据去显示内容
-      url: {
-        type: Object,
-        default: {}
-      },
-      projectInformationId: {
-        type: String,
-        default: ''
-      },
       queryProject: {
         type: Object,
         default: {}
@@ -64,24 +77,49 @@
       return {
         loading: false,
         dataSource: [],
+        regulatoryCertificationTaskPlanList: [
+          {
+            status: '1',
+            name: this.$t('initiatingProcess')
+          },
+          {
+            status: '1',
+            name: this.$t('Taskresponsibilityrecognition')
+          },
+          {
+            status: '1',
+            name: this.$t('designComplianceReview')
+          },
+          {
+            status: '2',
+            name: this.$t('designComplianceReviewAdmin')
+          },
+          {
+            status: '3',
+            name: this.$t('missionAccomplished')
+          }
+        ],
         columns: [
           {
             title: this.$t('Operator'),
             dataIndex: 'assignee',
             align: 'left',
-            width: 200
+            width: 200,
+            ellipsis: true
           },
           {
             title: this.$t('Tasknode'),
             dataIndex: 'name',
             align: 'left',
-            width: 180
+            width: 180,
+            ellipsis: true
           },
           {
             title: this.$t('OperationTime'),
             dataIndex: 'createTime',
             align: 'left',
             width: 200,
+            ellipsis: true,
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }
@@ -91,19 +129,22 @@
             dataIndex: 'approvalResult',
             align: 'left',
             width: 200,
+            ellipsis: true,
             scopedSlots: { customRender: 'approvalResult' }
           },
           {
             title: this.$t('feedback'),
             dataIndex: 'approvalOpinion',
             align: 'left',
-            width: 200
+            width: 200,
+            ellipsis: true
           },
           {
             title: this.$t('enclosure'),
             dataIndex: 'approvalFile',
             align: 'left',
             width: 100,
+            ellipsis: true,
             scopedSlots: { customRender: 'approvalFile' }
           }
         ]
@@ -115,11 +156,17 @@
     methods: {
       getList() {
         let query = {
-          prcNum: this.$route.query.prcNum,
-          prcType: this.$route.query.prcType
+          actiProcInstId: this.queryProject.actiProcInstId || this.queryProject.prcId
         }
-        getAction('/workFlow/get_list_by_instance', query).then((res) => {
-          this.dataSource = res
+        this.loading = true
+        getAction('/wkflow/processHistoryEO/list', query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result || []
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.loading = false
+          }
         })
       },
       viewFileClick(item) {
@@ -131,7 +178,7 @@
 
 <style scoped lang="less">
   .box {
-    padding: 0 24px 24px 24px;
+    padding: 0 0 24px 0;
     box-sizing: border-box;
   }
 
@@ -152,4 +199,71 @@
     color: #00B3BE;
     cursor: pointer;
   }
+
+  .process-content {
+    margin-top: 8px;
+    position: relative;
+    margin-bottom: 26px;
+    .process-content-top{
+      display: flex;
+      justify-content: space-between;
+    }
+    .process-content-content {
+      background: #fff;
+      z-index: 1000;
+      padding: 0;
+
+      .process-content-left {
+        float: left;
+        display: inline-block;
+
+        .process-content-left-yuan {
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+          background: #00B3BE;
+          color: #fff;
+          display: inline-block;
+          font-size: 14px;
+          line-height: 32px;
+          text-align: center;
+        }
+        .process-content-left-last{
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+          border: 1px solid #E6E7EC;
+          color: #040B29;
+          display: inline-block;
+          font-size: 14px;
+          line-height: 32px;
+          text-align: center;
+        }
+      }
+
+      .process-content-right {
+        float: left;
+        margin-left: 7px;
+        margin-top: 7px;
+
+        .process-content-right-top {
+          font-size: 14px;
+          font-weight: lighter;
+          color: #040B29;
+          max-width: 155px;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+        }
+      }
+    }
+
+    .process-content-right-xian {
+      height: 2px;
+      width: calc(100% - 27px);
+      background: #E6E6E9;
+      position: absolute;
+      top: 16px;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index 214b844e4..f7d6c57c8 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -3,7 +3,7 @@
     <a-drawer
       :title="title"
       :maskClosable="false"
-      :width="1000"
+      :width="1100"
       placement="right"
       :closable="true"
       @close="handleCancel"
@@ -29,6 +29,7 @@
      <div style="margin-bottom: 436px">
        <circulationHistory
          :title="$t('Processhistory')"
+         :queryProject="queryData"
        />
      </div>
 
@@ -267,7 +268,7 @@
   .drawer-bootom-button {
     position: absolute;
     bottom: 0;
-    z-index: 100;
+    z-index: 1002;
     width: 100%;
     border-top: 1px solid #e8e8e8;
     padding: 10px 16px;
@@ -280,11 +281,10 @@
   .drawer-review {
     position: absolute;
     bottom: 40px;
-    z-index: 100;
-    height: 384px;
+    z-index: 1001;
+    height: 404px;
     width: 100%;
     border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
     left: 0;
     background: #fff;
     border-radius: 0 0 2px 2px;
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
index 1967e44dd..fb6e95f39 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
@@ -100,7 +100,7 @@
 
 <style scoped lang="less">
   .box {
-    padding: 0 24px 24px 24px;
+    padding: 0 0 24px 0;
     box-sizing: border-box;
   }
 
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 8d45acc9a..f6f2f86e0 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -27,7 +27,7 @@
               <a-radio value="Rejected" v-if="query.TaskKey == 'zrrqr'">
                 {{$t('refuse')}}
               </a-radio>
-              <a-radio value="adopt" v-if="query.TaskKey == 'fggcssh'">
+              <a-radio value="Adopt" v-if="query.TaskKey == 'fggcssh'">
                 {{$t('adopt')}}
               </a-radio>
               <a-radio value="Returned" v-if="query.TaskKey == 'dezrrqr' || query.TaskKey == 'dezrrtjjfw' ||
@@ -245,7 +245,7 @@
 
 <style scoped lang="less">
   .box {
-    padding: 0 24px 24px 24px;
+    padding: 24px 24px 24px 24px;
     box-sizing: border-box;
   }
 
@@ -269,7 +269,7 @@
   }
 
   .title-text {
-    width: 88px;
+    /*width: 88px;*/
     text-align: left;
     display: inline-block;
     font-weight: 500;
@@ -284,7 +284,7 @@
   }
 
   .title-text-fq {
-    width: 130px;
+    /*width: 130px;*/
     text-align: left;
     display: inline-block;
     font-weight: 500;
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/standardContent.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/standardContent.vue
index eb70934c9..91ef29610 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/standardContent.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/standardContent.vue
@@ -106,7 +106,7 @@
 
 <style scoped lang="less">
   .box {
-    padding: 0 24px 24px 24px;
+    padding: 0 0 24px 0;
     box-sizing: border-box;
   }