WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改法规清单

Browse Source
This commit is contained in:
范强强
2023-03-21 11:52:19 +08:00
parent a5c919f34c
commit c6a9c695b5
4 changed files with 157 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+36 -17
View File
@@ -40,16 +40,20 @@
@showSizeChange="SizeChange"
/>
</div>
<designCompliance ref="designComplianceRef"/>
</div>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import designCompliance from './designCompliance'
export default {
name: 'SentList',
mixins:[ResizeHeader, ResizeColumnProvide],
components:{
designCompliance
},
data() {
return {
dataSource: [],
@@ -79,19 +83,33 @@
width: 170
},
{
title: this.$t('LastProcessor'),
title: this.$t('Tasknode'),
align: 'left',
dataIndex: 'lastAssigneeName',
dataIndex: 'taskDefinitionKeyName',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'assigneeName',
dataIndex: 'createBy',
ellipsis: true,
width: 170
},
// {
// title: this.$t('LastProcessor'),
// align: 'left',
// dataIndex: 'lastAssigneeName',
// ellipsis: true,
// width: 170
// },
// {
// title: this.$t('CurrentProcessor'),
// align: 'left',
// dataIndex: 'assigneeName',
// ellipsis: true,
// width: 170
// },
{
title: this.$t('TaskCutOffTime'),
align: 'left',
@@ -99,13 +117,13 @@
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
// {
// title: this.$t('taskStatus'),
// align: 'left',
// dataIndex: 'statusShow',
// ellipsis: true,
// width: 170
// },
{
title: this.$t('operation'),
align: 'left',
@@ -219,11 +237,12 @@
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
// let newUrl = this.$router.resolve({
// path: '/taskListProcess',
// query: query
// })
// window.open(newUrl.href, '_blank')
this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
} else if (row.flowType == '3') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+81 -9
View File
@@ -12,12 +12,12 @@
<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
{{index+1}}
</span>
</span>
<span v-else-if="item.status == 3" class="process-content-left">
<span class="process-content-left-last">
5
{{index+1}}
</span>
</span>
<div class="process-content-right">
@@ -41,8 +41,8 @@
</span>
<span slot="approvalFile" slot-scope="text,result">
<span class="viewFile"
@click="viewFileClick(record.approvalFile)"
v-if="record.approvalFile">
@click="viewFileClick(result.approvalFile)"
v-if="result.approvalFile">
{{$t('viewFile')}}
</span>
<span v-else>--</span>
@@ -109,7 +109,7 @@
},
{
title: this.$t('Tasknode'),
dataIndex: 'name',
dataIndex: 'taskDefinitionKeyName',
align: 'left',
width: 180,
ellipsis: true
@@ -126,11 +126,10 @@
},
{
title: this.$t('resultofhandling'),
dataIndex: 'approvalResult',
dataIndex: 'operatorResultName',
align: 'left',
width: 200,
ellipsis: true,
scopedSlots: { customRender: 'approvalResult' }
},
{
title: this.$t('feedback'),
@@ -162,6 +161,76 @@
getAction('/wkflow/processHistoryEO/list', query).then((res) => {
if (res.success) {
this.dataSource = res.result || []
if (this.dataSource.length > 0) {
let taskData = this.dataSource[this.dataSource.length - 1]
if (this.queryProject.TaskKey == 'fqlc'){
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '2'
} else if (val.name == this.$t('Taskresponsibilityrecognition')) {
val.status = '3'
} else {
val.status = '3'
}
})
}
if (this.queryProject.TaskKey == 'zrrqr' || this.queryProject.TaskKey == 'dezrrqr') {
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '1'
} else if (val.name == this.$t('Taskresponsibilityrecognition')) {
val.status = '2'
} else {
val.status = '3'
}
})
}
if (this.queryProject.TaskKey == 'zrrtjjfw' || this.queryProject.TaskKey == 'dezrrtjjfw') {
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '1'
} else if (val.name == this.$t('Taskresponsibilityrecognition')) {
val.status = '1'
} else if (val.name == this.$t('designComplianceReview')) {
val.status = '2'
} else {
val.status = '3'
}
})
}
if (this.queryProject.TaskKey == 'fggcssh') {
if (taskData.operatorResult == 'Adopt'){
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '1'
} else if (val.name == this.$t('Taskresponsibilityrecognition')) {
val.status = '1'
} else if (val.name == this.$t('designComplianceReview')) {
val.status = '1'
} else if (val.name == this.$t('designComplianceReviewAdmin')) {
val.status = '1'
} else {
val.status = '1'
}
})
}else{
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '1'
} else if (val.name == this.$t('Taskresponsibilityrecognition')) {
val.status = '1'
} else if (val.name == this.$t('designComplianceReview')) {
val.status = '1'
} else if (val.name == this.$t('designComplianceReviewAdmin')) {
val.status = '2'
} else {
val.status = '3'
}
})
}
}
this.regulatoryCertificationTaskPlanList = [...this.regulatoryCertificationTaskPlanList]
}
this.loading = false
} else {
this.dataSource = []
@@ -204,10 +273,12 @@
margin-top: 8px;
position: relative;
margin-bottom: 26px;
.process-content-top{
.process-content-top {
display: flex;
justify-content: space-between;
}
.process-content-content {
background: #fff;
z-index: 1000;
@@ -228,7 +299,8 @@
line-height: 32px;
text-align: center;
}
.process-content-left-last{
.process-content-left-last {
width: 32px;
height: 32px;
border-radius: 50%;
jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+13 -2
View File
@@ -26,15 +26,16 @@
:url="url"
:standardContentQuery="queryProject"
/>
<div style="margin-bottom: 436px">
<div :class="{'circulationHistory':this.queryData.isDisplay,'circulationHistoryOne':!this.queryData.isDisplay}">
<circulationHistory
v-if="isDisplay"
:title="$t('Processhistory')"
:queryProject="queryData"
/>
</div>
<div class="drawer-review">
<div class="drawer-review" v-if="this.queryData.isDisplay">
<reviewedByThePersonInCharge
v-if="isDisplay"
ref="reviewedByThePersonInChargeRef"
@@ -130,6 +131,9 @@
return true
},
isConfirm() {
if (!this.queryData.isDisplay){
return false
}
return true
}
},
@@ -172,6 +176,7 @@
},
getList(row, title) {
this.queryData = row
this.queryData.isDisplay = JSON.parse(this.queryData.isDisplay)
this.loading = true
this.visible = true
this.title = title
@@ -289,4 +294,10 @@
background: #fff;
border-radius: 0 0 2px 2px;
}
.circulationHistory{
margin-bottom: 436px;
}
.circulationHistoryOne{
margin-bottom: 30px;
}
</style>
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+27 -20
View File
@@ -42,15 +42,19 @@
@showSizeChange="SizeChange"
/>
</div>
<designCompliance ref="designComplianceRef"/>
</div>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import designCompliance from './designCompliance'
export default {
name: 'doneList',
components:{
designCompliance
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
@@ -84,6 +88,13 @@
ellipsis: true,
width: 170
},
{
title: this.$t('Tasknode'),
align: 'left',
dataIndex: 'taskDefinitionKeyName',
ellipsis: true,
width: 170
},
{
title: this.$t('Sponsor'),
align: 'left',
@@ -91,13 +102,13 @@
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
// {
// title: this.$t('CurrentProcessor'),
// align: 'left',
// dataIndex: 'assigneeName',
// ellipsis: true,
// width: 170
// },
{
title: this.$t('TaskCutOffTime'),
align: 'left',
@@ -105,13 +116,13 @@
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
// {
// title: this.$t('taskStatus'),
// align: 'left',
// dataIndex: 'statusShow',
// ellipsis: true,
// width: 170
// },
{
title: this.$t('operation'),
align: 'left',
@@ -221,11 +232,7 @@
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
}else if(row.flowType == '3'){
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {