From b46670349c57ef68b52aa71bb3752f5f8c8e48ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 20 Mar 2023 16:34:36 +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

---
 .../components/circulationHistory.vue         | 54 +++++++++++++++++++
 .../components/designCompliance.vue           |  8 ++-
 .../reviewedByThePersonInCharge.vue           |  7 ++-
 3 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
new file mode 100644
index 000000000..39f2d3e18
--- /dev/null
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{title}}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'circulationHistory',
+    props: {
+      //  需要参数urlFrom，获取数据去显示内容
+      url: {
+        type: Object,
+        default: {}
+      },
+      projectInformationId: {
+        type: String,
+        default: ''
+      },
+      queryProject: {
+        type: Object,
+        default: {}
+      },
+      title: {
+        type: String,
+        default: ''
+      }
+    },
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 80px;
+    line-height: 80px;
+
+    .header-text {
+      font-size: 18px;
+      font-weight: 400;
+      color: #000F16;
+    }
+  }
+</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 67199f91d..ef4c417f5 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -31,6 +31,10 @@
         :query="queryData"
         :queryBy="queryBy"
         :queryPersonInCharge="queryPersonInCharge"/>
+
+      <circulationHistory
+        :title="$t('Processhistory')"
+      />
       <div class="drawer-bootom-button">
         <footerProcess
           v-if="isDisplay"
@@ -54,6 +58,7 @@
   import standardContent from '../../../processCenter/components/standardContent'
   import footerProcess from '../../../processCenter/components/footerProcess'
   import reviewedByThePersonInCharge from './reviewedByThePersonInCharge'
+  import circulationHistory from './circulationHistory'
   import { getAction, postAction, deleteAction, downloadFile, putAction } from '@/api/manage'
 
   import { mapGetters } from 'vuex'
@@ -64,7 +69,8 @@
       projectInformation,
       standardContent,
       reviewedByThePersonInCharge,
-      footerProcess
+      footerProcess,
+      circulationHistory
     },
     data() {
       return {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 5d0ea3fa3..24939325e 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -84,7 +84,6 @@
       </a-row>
     </a-form-model>
     <uploadFile ref="uploadFile"
-                :disabled="!query.isDisplay?true:false"
                 @uploadSuccess="uploadSuccess"/>
     <SelectedBy ref="SelectedByRef" :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
   </div>
@@ -199,7 +198,11 @@
       },
       //转办接口
       SelectedByForm(userIds) {
-        this.formInline.secondChargePersonUserId = userIds
+        if (this.query.TaskKey == 'zrrtjjfw'){
+          this.formInline.dezrrSubmitUserId = userIds
+        }else{
+          this.formInline.secondChargePersonUserId = userIds
+        }
         this.$refs.SelectedByRef.visible = false
       },
       submitNoRule(callBack) {