diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue index e0bf2dd84..89b691ad3 100644 --- a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue +++ b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue @@ -151,9 +151,13 @@ export default { { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 }, + { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", - focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")}, + focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier", + this.isFilter("code", this.CreateFormData.supplierCode) + )}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 }, + { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 }, { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, @@ -162,9 +166,13 @@ export default { { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 }, + { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", - focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")}, + focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier", + this.isFilter("code", this.editFormData.supplierCode) + )}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 }, + { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 }, { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, @@ -191,6 +199,18 @@ export default { this.paging(); }, methods: { + //过滤查询条件 + isFilter (val, data) { + let filter = [ + { + logic: "And", + column: val, + action: "==", + value: data + } + ] + return filter + }, addNewDataPush (val) { if (this.theEvent == 'newly') { if (val[1].prop == 'supplierCode' || val[1].prop == 'supplierName') {