diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 1d34edb..fb192bc 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -201,6 +201,9 @@ export default { { tableItem.filter(i => !i.hidden).map((item, index) => { + if ($scopedSlots[item.prop]) { + return $scopedSlots[item.prop](item, index); + } //自定义表格内容 if (item.customFn) { return ( diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue index 8504f19..cabcd69 100644 --- a/src/views/contract/contractEdit.vue +++ b/src/views/contract/contractEdit.vue @@ -1,862 +1,879 @@ @@ -908,9 +942,15 @@ import { getBudget } from "@/api/budget/budget"; import { getInfo } from "@/api/me.js"; import { listdeptNoAuth } from '@/api/system/department' import { deepCopy } from "@/utils"; +import { + listCommonuser +} from "@/api/common.js"; export default { data() { return { + showTypes:true, + showEdit:false, + isWeixiu:false, myPurchaseType: 1, // 1政府采购 2一般采购 //事前流程 flowIds: [{"name":"政府采购流转","id":71,"type":2},{"name":"公务接待","id":86,"type":1},{"name":"会议费用","id":87,"type":1},{"name":"培训费","id":88,"type":1},{"name":"用印","id":76,"type":1},{"name":"仪器设备维修流转","id":84,"type":1},{"name":"请休假","id":68,"type":1},{"name":"仪器设备购置流转","id":82,"type":1},{"name":"安装、维修流转","id":96,"type":1},{"name":"车船维修保养流转","id":97,"type":1}], @@ -945,6 +985,7 @@ export default { group_type: "", plan_price: 0, name: "", + apply_user_id:'', contract_plan_links: [], is_simple: 0, supply: "", @@ -962,6 +1003,7 @@ export default { common_type: '' }, commonPurchaseTypes: [], + commonPurchasePeople:[], planTypes: [], departments: [], purchaseType: [], @@ -1117,18 +1159,18 @@ export default { trigger: "blur", }, ], - money_way_id: [ - { - validator: (rule, value, callback) => { - if (!this.hasValue(value)) { - callback(new Error("必填")); - } else { - callback(); - } - }, - trigger: "change", - }, - ], + // money_way_id: [ + // { + // validator: (rule, value, callback) => { + // if (!this.hasValue(value)) { + // callback(new Error("必填")); + // } else { + // callback(); + // } + // }, + // trigger: "change", + // }, + // ], contract_plan_links: [ { validator: (rule, value, callback) => { @@ -1384,6 +1426,17 @@ export default { } }, + // 一般采购 申购人 + async getCommonPurchasePeople() { + try { + this.commonPurchasePeople = (await listCommonuser({ + page:1, + page_size:999 + }))?.data || [] + } catch (err) { + + } + }, //获取购买方式 async getPurchaseWay() { this.purchaseWay = @@ -1703,6 +1756,7 @@ export default { this.window.top = (window.screen.height - 30 - this.window.height) / 2; this.window.left = (window.screen.width - 10 - this.window.width) / 2; this.getCommonPurchaseType(); + this.getCommonPurchasePeople() this.getGroupType(); this.getPlanTypes(); this.getDepartment(); @@ -1763,22 +1817,25 @@ export default { } }) } else { - MessageBox.confirm("请选择类型", "提示", { - confirmButtonText: "预算计划支出", - cancelButtonText: "一般采购" - }).then(_ => { - next(vm => { - vm.myPurchaseType = 1 - vm.form.is_common_purchase = 0 - }) - }).catch(_ => { - next(vm => { - vm.step = 2 - vm.myPurchaseType = 2 - vm.form.is_common_purchase = 1 - vm.form.flow_mod_id = 99 - }) + next(vm=>{ + vm.showTypes = true }) + // MessageBox.confirm("请选择类型", "提示", { + // confirmButtonText: "预算计划支出", + // cancelButtonText: "一般采购", + // }).then(_ => { + // next(vm => { + // vm.myPurchaseType = 1 + // vm.form.is_common_purchase = 0 + // }) + // }).catch(_ => { + // next(vm => { + // vm.step = 2 + // vm.myPurchaseType = 2 + // vm.form.is_common_purchase = 1 + // vm.form.flow_mod_id = 99 + // }) + // }) } } } diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index f20a179..d8c117c 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -19,6 +19,26 @@ /> +
+ 申购人 + + + + +
流程状态 +
@@ -300,6 +321,31 @@ @delete="(row) => deleteContract(row.id)" @editor="" > +