fix 79317

This commit is contained in:
danshihao
2023-12-19 11:07:57 +08:00
parent 08b209b6a8
commit ecee848592
8 changed files with 34 additions and 18 deletions
@@ -65,7 +65,7 @@
type="radio"
dictCode="yn"
@change="changeIsCountersign"
v-decorator="['pass', validatorRules.isCountersign]" />
v-decorator="['countersignTag', validatorRules.isCountersign]" />
</a-form-item>
</div>
<div class="form-flex-item custom-flex-form-item">
@@ -290,7 +290,7 @@ export default {
// 回显会签表单
this.$nextTick(() => {
this.countersignForm && this.countersignForm.setFieldsValue({
pass: data.countersignTag,
countersignTag: data.countersignTag,
involveList: data.countersign || ''
})
})
@@ -359,9 +359,9 @@ export default {
// 处理其他参数
params.map = Object.assign({}, formDataList[1], getPersonInfo)
// 节点三:会签表单放到对象最外层单独存储业务信息,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)
if (this.currentNode === EsInspectionPlan.liaisonCollect.value && Object.hasOwnProperty.call(params.map, 'countersignTag')) {
params.countersignTag = params.map.countersignTag
// params.map.pass = this.convertPass(params.map.pass)
}
if (params.map.involveList && typeof params.map.involveList === 'string') {
params.countersign = params.map.involveList
@@ -482,10 +482,15 @@ export default {
if (this.loading) return
this.loading = true
this.getPageParams().then(res => {
// 同意和提交一直传true
res.map.pass = true
// 节点三,pass决定是否跳过会签
if (this.currentNode === EsInspectionPlan.liaisonCollect.value) {
res.map.pass = this.convertPass(res.map.countersignTag)
} else {
// 其他情况一直传true
res.map.pass = true
}
// 不是提交按钮
if (!isSubmitBtn) {
if (isSubmitBtn !== true) {
// 没有填写注释,就默认同意
if (!res.processApprovalRecord.commitText) {
res.processApprovalRecord.commitText = '同意'