fix 79311
This commit is contained in:
+12
-15
@@ -228,7 +228,7 @@ export default {
|
||||
// 发起、草稿进来没有nodeId,就默认发起节点
|
||||
this.currentNode = nodeId || EsInspectionPlan.initiate.value
|
||||
this.currentNodeName = taskName || EsInspectionPlan.initiate.text
|
||||
this.projectId = projectId
|
||||
this.projectId = projectId || ''
|
||||
this.btn = EsInspectionPlan.propertyOfValue('btn', this.currentNode) || []
|
||||
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
|
||||
if (nodeId && !EsInspectionPlan.keyOfValue(nodeId)) {
|
||||
@@ -358,8 +358,8 @@ export default {
|
||||
|
||||
// 处理其他参数
|
||||
params.map = Object.assign({}, formDataList[1], getPersonInfo)
|
||||
// 会签表单放到对象最外层单独存储业务信息,params.map里是流程用的
|
||||
if (params.map.pass) {
|
||||
// 节点三:会签表单放到对象最外层单独存储业务信息,params.map里是流程用的
|
||||
if (this.currentNode === EsInspectionPlan.liaisonCollect.value && Object.hasOwnProperty.call(params.map, 'pass')) {
|
||||
params.countersignTag = params.map.pass
|
||||
params.map.pass = this.convertPass(params.map.pass)
|
||||
}
|
||||
@@ -460,8 +460,6 @@ export default {
|
||||
this.loading = true
|
||||
this.getPageParams().then(res => {
|
||||
console.log(res)
|
||||
// 审批意见
|
||||
res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
|
||||
return startInspectPlan(res)
|
||||
}).then(res => {
|
||||
if (res.success) {
|
||||
@@ -484,18 +482,17 @@ export default {
|
||||
if (this.loading) return
|
||||
this.loading = true
|
||||
this.getPageParams().then(res => {
|
||||
// pass在这里有两种可能
|
||||
// 1.联络人汇总节点,选择是否会签,是true,否false;
|
||||
// 2.其他节点按钮区分,同意传true,驳回传false
|
||||
if (res.map.pass === undefined) {
|
||||
// 不是提交按钮
|
||||
if (!isSubmitBtn) {
|
||||
// 不是提交按钮就一直传true 同意
|
||||
res.map.pass = true
|
||||
// 没有填写注释,就默认同意
|
||||
if (!res.processApprovalRecord.commitText) {
|
||||
res.processApprovalRecord.commitText = '同意'
|
||||
}
|
||||
// 审批意见
|
||||
res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
|
||||
}
|
||||
// 不是提交按钮 且 如果没有填写注释,就默认同意
|
||||
if (!isSubmitBtn && !res.processApprovalRecord.commitText) {
|
||||
res.processApprovalRecord.commitText = '同意'
|
||||
}
|
||||
// 审批意见
|
||||
res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
|
||||
return approvalInspectPlan(res)
|
||||
}).then(res => {
|
||||
if (res.success) {
|
||||
|
||||
Reference in New Issue
Block a user