Merge remote-tracking branch 'origin/develop' into develop

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%"

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,

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>