diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index a213c30..9a249ea 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -2889,10 +2889,12 @@ export default { } } } else { - //非采购事前流程 - flowStatus["other"].setStatus(item.other_flow_status??1) - if (item.other_flow_status === 1 || !item.other_flow_status) { - flowStatus["other"].setExecutable(true) + if (item.flow_mod_id) { + //非采购事前流程 + flowStatus["other"].setStatus(item.other_flow_status??1) + if (item.other_flow_status === 1 || !item.other_flow_status) { + flowStatus["other"].setExecutable(true) + } } } if (item.is_end === 0) { diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue index 9a0772b..b3cb84b 100644 --- a/src/views/contract/seeContract.vue +++ b/src/views/contract/seeContract.vue @@ -471,9 +471,10 @@ //搜索 select: { - keyword: '', - showDatePicker: '', + keyword: "", + showDatePicker: "", pageIndex: 1, + pageSize: 10, startDate: "", endDate: "", type: "", @@ -483,20 +484,18 @@ status: "", year: "", plan_id: "", + outcome_type: 1, plan_name: "请选择预算计划", - start_plan_price: null, - end_plan_price: null, - assurance_status: 0, - start_assurance_money: null, - end_assurance_money: null, - showDatePickerBao: "", - start_assurance_expire: "", - end_assurance_expire: "" + start_plan_price: undefined, + end_plan_price: undefined, + is_myself: 0, + is_purchase: 1, }, selectCopy: { - keyword: '', - showDatePicker: '', + keyword: "", + showDatePicker: "", pageIndex: 1, + pageSize: 10, startDate: "", endDate: "", type: "", @@ -506,15 +505,12 @@ status: "", year: "", plan_id: "", + outcome_type: 1, plan_name: "请选择预算计划", - start_plan_price: null, - end_plan_price: null, - assurance_status: 0, - start_assurance_money: null, - end_assurance_money: null, - showDatePickerBao: "", - start_assurance_expire: "", - end_assurance_expire: "" + start_plan_price: undefined, + end_plan_price: undefined, + is_myself: 0, + is_purchase: 1, }, types: [{ label: '服务',