FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-04-26 13:57:54 +08:00
parent 32600d3fc0 091fc34b5f
commit 92e6fbdb04
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
+2 -2
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="ZQYJAddFileDetails"> <div class="ZQYJAddFileDetails" style="overflow: auto">
<div class="left"> <div class="left" style="overflow: auto">
<loading :loading="iframeLoading">正在加载文档</loading> <loading :loading="iframeLoading">正在加载文档</loading>
<iframe name = "iframeMap" id="iframeMapViewComponent" v-bind:src="iframeUrl" <iframe name = "iframeMap" id="iframeMapViewComponent" v-bind:src="iframeUrl"
width="100%" height="100%" width="100%" height="100%"
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+2
View File
@@ -452,6 +452,8 @@ export default {
json.directorFlag = '0' json.directorFlag = '0'
json.onlyKey = this.onlyKey json.onlyKey = this.onlyKey
json.commentText = this.commentText8 json.commentText = this.commentText8
json.presidentUser = this.form.presidentUser
json.presidentUserName = this.form.presidentUserName
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+3 -3
View File
@@ -180,7 +180,7 @@
<div class="seeItem">{{historySeeForm.responsibleUnit}}</div> <div class="seeItem">{{historySeeForm.responsibleUnit}}</div>
</el-form-item> </el-form-item>
<el-form-item class="add-form-item" label="责任工程师:"> <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>
<el-form-item class="add-form-item" label="要求关闭时间:"> <el-form-item class="add-form-item" label="要求关闭时间:">
<div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div> <div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
@@ -273,7 +273,7 @@
</div> </div>
<div class="typeitems"> <div class="typeitems">
<div class="itemsLeft">责任工程师:</div> <div class="itemsLeft">责任工程师:</div>
<div class="itemsRight">{{item.responseEnginShow}}</div> <div class="itemsRight">{{item.dutyEngineerName}}</div>
</div> </div>
</div> </div>
</div> </div>
@@ -294,7 +294,7 @@
</div> </div>
<div class="typeitems"> <div class="typeitems">
<div class="itemsLeft">责任工程师:</div> <div class="itemsLeft">责任工程师:</div>
<div class="itemsRight">{{item.responseEnginShow}}</div> <div class="itemsRight">{{item.dutyEngineerName}}</div>
</div> </div>
<div class="typeitems"> <div class="typeitems">
<div class="itemsLeft">验证时间:</div> <div class="itemsLeft">验证时间:</div>