diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue index 4bedca798..ad91c5a00 100644 --- a/fe/PC/src/components/StepsCountPlanForm/index.vue +++ b/fe/PC/src/components/StepsCountPlanForm/index.vue @@ -81,6 +81,7 @@ oldSkipCountLocation )" @tableButtonClick="addFormData(arguments)" + @filterColumnChange="filterColumnChange" > @@ -399,6 +400,36 @@ export default { this.session = JSON.parse(JSON.stringify(this.CreateFormData)); }, methods: { + filterColumnChange(item){ + if(item.column == "code"){ + this.filterActionOptions=[{ + value: '==', + label: '等于' + }, { + value: '!=', + label: '不等于' + }, { + value: 'Like', + label: '包含' + }] + this.$nextTick(()=>{ + this.$forceUpdate() + }) + } + else if(item.column == "type"){ + this.filterActionOptions=[{ + value: '==', + label: '等于' + }, { + value: '!=', + label: '不等于' + }] + this.$nextTick(()=>{ + this.$forceUpdate() + }) + } + if(item.action == "Like"){item.action = '=='} + }, // 初始化库位筛选列表数据,目的:pda的库位类型不可以选择线边库位 initSearchPageTableColums(){ // let _list = JSON.parse(JSON.stringify(this.$isTableColumns.Location)); diff --git a/fe/PC/src/components/conditionFilters/index.vue b/fe/PC/src/components/conditionFilters/index.vue index 66ed7b139..09cc420d1 100644 --- a/fe/PC/src/components/conditionFilters/index.vue +++ b/fe/PC/src/components/conditionFilters/index.vue @@ -214,11 +214,9 @@ export default { // } }, watch: { - // InputOrSelect (val) { - // if (val) { - // this.InputOrSelectHide = val - // } - // } + filterActionOptions(data) { + this.options.action = data + } }, computed: { }, @@ -303,6 +301,9 @@ methods: { filterColumnChange(item){ // 筛选对象更改时候,清空value值 item.value = "" + // item.action = this.options.action[0].value + // item.action = "" + this.$emit("filterColumnChange", item) }, tableColumnsOptions(val) { const data = JSON.parse(JSON.stringify(val)); diff --git a/fe/PC/src/components/searchPage/index.vue b/fe/PC/src/components/searchPage/index.vue index 9e776cd78..1c1f998fd 100644 --- a/fe/PC/src/components/searchPage/index.vue +++ b/fe/PC/src/components/searchPage/index.vue @@ -51,6 +51,7 @@ :screenData="screenData" :tableColumns="searchTableColumns" @screenFormClick="screenFormClick" + @filterColumnChange="filterColumnChange" @screenDelete="screenDelete" @screenPush="screenPush" :filterActionOptions="filterActionOptions" @@ -189,6 +190,10 @@ export default { } }, methods: { + // 高级筛选-选择对象更改 + filterColumnChange(item){ + this.$emit("filterColumnChange", item) + }, //table选择当前行数据 prepareFormData (val) { this.$parent.isMoreSelectTable = this.isMoreSelectTable