对接任务确认流程
This commit is contained in:
@@ -6,9 +6,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="header-content">
|
||||
<!-- v-if="$route.query.TaskKey == 'zrrclrw'"-->
|
||||
<div class="operator-text"
|
||||
@click="distributionEngineerClick($t('distributionEngineer'))">
|
||||
v-if="$route.query.TaskKey == 'zrrclrw'"
|
||||
@click="distributionEngineerClick($t('distributionEngineer'),1)">
|
||||
<a-icon type="audit"/>
|
||||
{{ $t('distributionEngineer') }}
|
||||
</div>
|
||||
@@ -19,8 +19,8 @@
|
||||
{{ $t('reminderHandling') }}
|
||||
</div>
|
||||
<div class="operator-text"
|
||||
v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
|
||||
@click="distributionEngineerClick($t('addFeedback'))">
|
||||
v-if="$route.query.TaskKey == 'zrrclrw'"
|
||||
@click="distributionEngineerClick($t('addFeedback'),2)">
|
||||
<a-icon type="plus-circle"/>
|
||||
{{ $t('addFeedback') }}
|
||||
</div>
|
||||
@@ -384,7 +384,7 @@
|
||||
]
|
||||
},
|
||||
visibleDetails: false,
|
||||
columns: [
|
||||
columnsAll: [
|
||||
{
|
||||
title: this.$t('serialNumber'),
|
||||
dataIndex: 'index',
|
||||
@@ -450,6 +450,20 @@
|
||||
mounted() {
|
||||
this.getList()
|
||||
},
|
||||
computed: {
|
||||
columns() {
|
||||
let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
|
||||
if (this.$route.query.TaskKey != 'zrrclrw') {
|
||||
for (var i = 0; i < columnResult.length; i++) {
|
||||
if (columnResult[i].title === this.$t('operation')) {
|
||||
columnResult.splice(i, 1)
|
||||
i--
|
||||
}
|
||||
}
|
||||
}
|
||||
return columnResult
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
pageOnChange(page, pageSize) {
|
||||
this.pageNo = page
|
||||
@@ -525,10 +539,13 @@
|
||||
handleCancel() {
|
||||
this.visible = false
|
||||
},
|
||||
distributionEngineerClick(title) {
|
||||
distributionEngineerClick(title, num) {
|
||||
this.title = title
|
||||
this.visible = true
|
||||
this.formInline = {}
|
||||
if (num == 1) {
|
||||
this.getReminderHandlingList(1)
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
this.$refs.ruleForm.validateField()
|
||||
})
|
||||
@@ -563,9 +580,9 @@
|
||||
},
|
||||
reminderHandling() {
|
||||
this.visibleTable = true
|
||||
this.getReminderHandlingList()
|
||||
this.getReminderHandlingList(2)
|
||||
},
|
||||
getReminderHandlingList() {
|
||||
getReminderHandlingList(num) {
|
||||
this.loadingTable = true
|
||||
let query = {
|
||||
taskDefinitionKey: 'dreDispose',
|
||||
@@ -574,6 +591,24 @@
|
||||
getAction(this.url.queryByActiProcInstId, query).then((res) => {
|
||||
if (res.success) {
|
||||
this.dataSourceTable = res.result || []
|
||||
if (num == 1) {
|
||||
this.distributionEngineerList = []
|
||||
let userName = []
|
||||
let userId = []
|
||||
if (this.dataSourceTable && this.dataSourceTable.length > 0) {
|
||||
this.dataSourceTable.forEach(val => {
|
||||
this.distributionEngineerList.push({
|
||||
name: val.userName,
|
||||
userId: val.userId,
|
||||
deliveryInstructions: val.deliveryInstructions
|
||||
})
|
||||
userName.push(val.userName)
|
||||
userId.push(val.userId)
|
||||
})
|
||||
}
|
||||
this.formInline.userId = userId.join(',')
|
||||
this.formInline.userName = userName.join(',')
|
||||
}
|
||||
this.loadingTable = false
|
||||
} else {
|
||||
this.dataSourceTable = []
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
<a-button class="header-btn termin" v-if="isSendBack" @click="sendBackCkick" type="danger" ghost>
|
||||
{{$t('sendBack')}}
|
||||
</a-button>
|
||||
<a-button class="header-btn submit" v-if="isAdopt" @click="adopt" type="primary">{{$t('adopt')}}</a-button>
|
||||
<a-button class="header-btn submit" v-if="isResubmit" @click="Resubmit" type="primary">{{$t('Resubmit')}}</a-button>
|
||||
<a-button class="header-btn submit" v-if="isAdopt" @click="adopt" type="primary">{{$t('submit')}}</a-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -59,7 +60,11 @@
|
||||
isAdopt: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
isResubmit:{
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
terminationProcess() {
|
||||
@@ -82,6 +87,10 @@
|
||||
},
|
||||
backTo() {
|
||||
|
||||
},
|
||||
Resubmit(){
|
||||
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
||||
this.$emit('Resubmit', handlingTime)
|
||||
},
|
||||
adopt() {
|
||||
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
||||
@@ -108,7 +117,8 @@
|
||||
.header-btn {
|
||||
margin-right: 10px;
|
||||
}
|
||||
.header-btn:last-child{
|
||||
|
||||
.header-btn:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<span class="text-header">
|
||||
爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑
|
||||
{{formInline.deliveryRequirements}}
|
||||
</span>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -117,7 +117,7 @@
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<span class="text-header">
|
||||
爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑
|
||||
{{formInline.approvalOpinion}}
|
||||
</span>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -155,7 +155,7 @@
|
||||
components: {
|
||||
uploadFile
|
||||
},
|
||||
props: ['queryBy'],
|
||||
props: ['queryBy','queryPersonInCharge'],
|
||||
data() {
|
||||
return {
|
||||
formInline: {},
|
||||
@@ -191,6 +191,11 @@
|
||||
this.formInline.approvalOpinion = ''
|
||||
this.formInline = { ...this.formInline }
|
||||
}
|
||||
if (this.queryPersonInCharge){
|
||||
this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements
|
||||
this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent
|
||||
this.formInline.fileId = this.queryPersonInCharge.fileId
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
submit(callBack) {
|
||||
|
||||
Reference in New Issue
Block a user