update 稽查计划-强制撤回
This commit is contained in:
+13
-8
@@ -281,6 +281,7 @@ export default {
|
|||||||
const processAll = data.processAll || {}
|
const processAll = data.processAll || {}
|
||||||
const processApprovalRecord = data.processApprovalRecord || {}
|
const processApprovalRecord = data.processApprovalRecord || {}
|
||||||
this.info = data
|
this.info = data
|
||||||
|
this.$refs.inspectionPlanTable.setData(data.processEsInspectPlanList || [])
|
||||||
// 页面回显
|
// 页面回显
|
||||||
this.processInfoForm && this.processInfoForm.setFieldsValue({
|
this.processInfoForm && this.processInfoForm.setFieldsValue({
|
||||||
prcName: processAll.prcName,
|
prcName: processAll.prcName,
|
||||||
@@ -309,7 +310,10 @@ export default {
|
|||||||
if (this.isInitiate) {
|
if (this.isInitiate) {
|
||||||
this.draftInitPersonInfo(personInfo)
|
this.draftInitPersonInfo(personInfo)
|
||||||
}
|
}
|
||||||
// 回显业务信息(需要等后端调整)
|
// 回显业务信息,如果有标识属性就是强制撤回
|
||||||
|
if (Object.hasOwnProperty.call(draftData, 'revocation')) {
|
||||||
|
this.$refs.inspectionPlanTable.setData(draftData)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
@@ -420,6 +424,14 @@ export default {
|
|||||||
params.processApprovalRecord = Object.assign({}, this.info.processApprovalRecord, formDataList[2], {
|
params.processApprovalRecord = Object.assign({}, this.info.processApprovalRecord, formDataList[2], {
|
||||||
projectId: this.projectId
|
projectId: this.projectId
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// 保存草稿信息
|
||||||
|
params.infoJsonStr = JSON.stringify({
|
||||||
|
// 人员信息(要重新获取,流程里的信息不能直接用,后端需要多选人员处理成数组了)
|
||||||
|
personInfo: this.$refs.personnelInfo.getDataObj(),
|
||||||
|
// 业务表格数据,用于强制撤回后回显
|
||||||
|
draftData: params.processEsInspectPlanList
|
||||||
|
})
|
||||||
return params
|
return params
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
@@ -456,13 +468,6 @@ export default {
|
|||||||
if (this.loading) return
|
if (this.loading) return
|
||||||
this.loading = true
|
this.loading = true
|
||||||
this.getPageParams(false).then(res => {
|
this.getPageParams(false).then(res => {
|
||||||
// 保存草稿信息
|
|
||||||
res.infoJsonStr = JSON.stringify({
|
|
||||||
// 人员信息(要重新获取,流程里的信息不能直接用,后端需要多选人员处理成数组了)
|
|
||||||
personInfo: this.$refs.personnelInfo.getDataObj()
|
|
||||||
// 业务数据(需要等后端调整)
|
|
||||||
// draftData:
|
|
||||||
})
|
|
||||||
// 1待办 2草稿
|
// 1待办 2草稿
|
||||||
res.saveSource = (this.$route.query.draftId || !this.$route.query.projectId) ? 2 : 1
|
res.saveSource = (this.$route.query.draftId || !this.$route.query.projectId) ? 2 : 1
|
||||||
console.log(res)
|
console.log(res)
|
||||||
|
|||||||
+4
-15
@@ -99,7 +99,7 @@ export default {
|
|||||||
EsInspectionPlan,
|
EsInspectionPlan,
|
||||||
disableMixinCreated: true,
|
disableMixinCreated: true,
|
||||||
url: {
|
url: {
|
||||||
list: '/process/processEsInspectPlan/list',
|
// list: '/process/processEsInspectPlan/list',
|
||||||
delete: '/process/processEsInspectPlan/delete',
|
delete: '/process/processEsInspectPlan/delete',
|
||||||
deleteBatch: '/process/processEsInspectPlan/deleteBatch',
|
deleteBatch: '/process/processEsInspectPlan/deleteBatch',
|
||||||
// 默认是发起节点的导入和 下载模板,如果是节点2就用没有 征求意见对象 的模板和导入接口
|
// 默认是发起节点的导入和 下载模板,如果是节点2就用没有 征求意见对象 的模板和导入接口
|
||||||
@@ -234,20 +234,6 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
// 列表查询带上项目id
|
|
||||||
projectId: {
|
|
||||||
immediate: true,
|
|
||||||
handler (val) {
|
|
||||||
if (!val) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
this.filters.projectId = this.projectId
|
|
||||||
if (this.currentNode === EsInspectionPlan.fillInComments.value) {
|
|
||||||
this.filters.nodeId = this.$route.query.nodeId
|
|
||||||
}
|
|
||||||
this.loadData()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// 监听当前节点变化
|
// 监听当前节点变化
|
||||||
currentNode: {
|
currentNode: {
|
||||||
immediate: true,
|
immediate: true,
|
||||||
@@ -294,6 +280,9 @@ export default {
|
|||||||
this.filters.taskId = this.$route.query.taskId
|
this.filters.taskId = this.$route.query.taskId
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
setData (list) {
|
||||||
|
this.dataSource = list || []
|
||||||
|
},
|
||||||
// 父组件获取删除的ids
|
// 父组件获取删除的ids
|
||||||
getDelIds () {
|
getDelIds () {
|
||||||
return Array.from(new Set(this.delIds)).filter(item => item).join(',')
|
return Array.from(new Set(this.delIds)).filter(item => item).join(',')
|
||||||
|
|||||||
Reference in New Issue
Block a user