From 832a01d4e232904ee638a0ee61d7d8acc5a095ba Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Tue, 26 Apr 2022 10:34:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052669=20=E6=9C=AA?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E5=BA=93-=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E6=9F=A5=E7=9C=8B=20=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E4=BA=BA=E5=90=8D?=
 =?UTF-8?q?=E5=90=A7=EF=BC=88=E9=97=AE=E9=97=AE=E5=A4=8F=E6=99=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonConfomity/pages/historicalData.vue                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index f2c5ffc12..144a3a54e 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -180,7 +180,7 @@
               <div class="seeItem">{{historySeeForm.responsibleUnit}}</div>
             </el-form-item>
             <el-form-item class="add-form-item" label="责任工程师:">
-              <div class="seeItem">{{historySeeForm.dutyEngineer}}</div>
+              <div class="seeItem">{{historySeeForm.dutyEngineerName}}</div>
             </el-form-item>
             <el-form-item class="add-form-item" label="要求关闭时间:">
               <div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
@@ -273,7 +273,7 @@
             </div>
             <div class="typeitems">
               <div class="itemsLeft">责任工程师:</div>
-              <div class="itemsRight">{{item.responseEnginShow}}</div>
+              <div class="itemsRight">{{item.dutyEngineerName}}</div>
             </div>
           </div>
         </div>
@@ -294,7 +294,7 @@
             </div>
             <div class="typeitems">
               <div class="itemsLeft">责任工程师:</div>
-              <div class="itemsRight">{{item.responseEnginShow}}</div>
+              <div class="itemsRight">{{item.dutyEngineerName}}</div>
             </div>
             <div class="typeitems">
               <div class="itemsLeft">验证时间:</div>

From 724cc9eecf10e3f1dcb8e2a7a7f55849d74987d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 26 Apr 2022 11:07:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=94=BE=E5=88=B0?=
 =?UTF-8?q?=E5=A4=96=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 5dab77961..84c0d93a9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -452,6 +452,8 @@ export default {
         json.directorFlag = '0'
         json.onlyKey = this.onlyKey
         json.commentText = this.commentText8
+        json.presidentUser = this.form.presidentUser
+        json.presidentUserName = this.form.presidentUserName
         this.$http.post('lawss/activiti/completeTask', {
           json: JSON.stringify(json),
           taskId: this.taskIds,

From 635d0da8d3489b68fd6b0d5de65292637bbeb0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 26 Apr 2022 13:47:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
index 670a3ebc9..09d882850 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="ZQYJAddFileDetails">
-        <div class="left">
+    <div class="ZQYJAddFileDetails" style="overflow: auto">
+        <div class="left" style="overflow: auto">
           <loading :loading="iframeLoading">正在加载文档</loading>
             <iframe name = "iframeMap" id="iframeMapViewComponent"  v-bind:src="iframeUrl"
                     width="100%" height="100%"