diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 5d0247b5f..d04204a21 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.29" + "version": "1.0.31" } \ No newline at end of file diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue index 5a2cc5347..3eff0ca7e 100644 --- a/fe/PC/src/components/StepsCountPlanForm/index.vue +++ b/fe/PC/src/components/StepsCountPlanForm/index.vue @@ -412,17 +412,6 @@ export default { //确定筛选 advancedFilter(url, list, TotalCount, data, oldSkipCount) { return () => { - // 盘点库存 过滤线边仓数据 20230417 - // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1),过滤线边仓数据 20230626 - list.condition.filters = [] - if (data == 'locationData' && this.CreateFormData.requestType != 1) { - list.condition.filters.push({ - action: "!=", - column: "type", - logic: "And", - value: "5" - }) - } list.SkipCount = (oldSkipCount - 1) * list.MaxResultCount; this.tableLoading = true; getPageList(list, url) @@ -540,6 +529,7 @@ export default { // 下一步 editFormClick(val) { // Moment(this.CreateFormData.arriveTime).format() + console.log(543,val) if (val[0] == 0) { if (this.active == 0) { this.close(0); @@ -551,6 +541,17 @@ export default { if (valid) { // 总体信息 if (this.active == 0) { + this.pageListLocation.condition.filters = [] + // 盘点库存 过滤线边仓数据 20230417 + // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1),过滤线边仓数据 20230626 + if ( this.CreateFormData.requestType != 1) { + this.pageListLocation.condition.filters.push({ + action: "!=", + column: "type", + logic: "And", + value: "5" + }) + } const Function = this.advancedFilter( // "basedata/item-basic", // this.pageListItemBasic,