Browse Source

提交调整筛选

wenmenghao 9 months ago
parent
commit
51f737d1fc
2 changed files with 29 additions and 8 deletions
  1. 15 4
      src/views/order/orderReview.vue
  2. 14 4
      src/views/order/salesOrderMakeUp.vue

+ 15 - 4
src/views/order/orderReview.vue

@@ -44,16 +44,25 @@ export default {
     pageChange() {
     pageChange() {
       this.selectName = []
       this.selectName = []
     },
     },
-    emptyFilter(val) { // 清空筛选
+    emptyFilter(val) { // 重置筛选
       if (val) {
       if (val) {
         this.filter.salePerson = ''// 发起人
         this.filter.salePerson = ''// 发起人
         this.filter.orderCode = ''// 订单编号
         this.filter.orderCode = ''// 订单编号
-        this.filter.auditStatus = "" // 审核状态
+        if(this.initequity){
+          this.filter.auditStatus = this.initequity
+        }else{
+          this.filter.auditStatus = "" // 审核状态
+        }  
       }
       }
     },
     },
     flushAuditStatus() {
     flushAuditStatus() {
       if (this.filter.salePerson === '' && this.filter.orderCode === '') {
       if (this.filter.salePerson === '' && this.filter.orderCode === '') {
-        this.filter.auditStatus = ''
+        if(this.initequity){
+          this.filter.auditStatus = this.initequity
+        }else{
+          this.filter.auditStatus = ''
+        }
+  
       } else {
       } else {
         this.filter.auditStatus = '-1'
         this.filter.auditStatus = '-1'
       }
       }
@@ -104,7 +113,8 @@ export default {
           }) 
           }) 
         }
         }
         if(res.data.equity){ // 审核默认筛选项回显
         if(res.data.equity){ // 审核默认筛选项回显
-          this.filter.auditStatus = res.data.equity + ''
+          this.initequity = res.data.equity + ''
+          this.filter.auditStatus = this.initequity
         }
         }
         this.flushList()
         this.flushList()
       }).post()
       }).post()
@@ -165,6 +175,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      initequity:'',
       saleDis: false,
       saleDis: false,
       saleCodeModel: [],
       saleCodeModel: [],
       saleDeplist: [],//部门数据
       saleDeplist: [],//部门数据

+ 14 - 4
src/views/order/salesOrderMakeUp.vue

@@ -66,7 +66,8 @@ export default {
       this.$request(url).data({
       this.$request(url).data({
       }).success((res) => {
       }).success((res) => {
         if(res.data.equity){ // 审核状态默认筛选项回显
         if(res.data.equity){ // 审核状态默认筛选项回显
-          this.filter.state = res.data.equity + ''
+          this.initequity = res.data.equity + ''
+          this.filter.state = this.initequity
         }
         }
         this.flushList()
         this.flushList()
       }).post()
       }).post()
@@ -77,16 +78,24 @@ export default {
     pageChange() {
     pageChange() {
       this.selectName = []
       this.selectName = []
     },
     },
-    emptyFilter(val) { // 清空筛选
+    emptyFilter(val) { // 重置
       if (val) {
       if (val) {
         this.filter.salePerson = ''// 发起人
         this.filter.salePerson = ''// 发起人
         this.filter.orderCode = ''// 订单编号
         this.filter.orderCode = ''// 订单编号
-        this.filter.state = "" // 审核状态
+        if(this.initequity){
+          this.filter.state = this.initequity
+        }else{
+          this.filter.state = ''
+        } 
       }
       }
     },
     },
     flushAuditStatus() {
     flushAuditStatus() {
       if (this.filter.salePerson === '' && this.filter.orderCode === '') {
       if (this.filter.salePerson === '' && this.filter.orderCode === '') {
-        this.filter.state = ''
+        if(this.initequity){
+          this.filter.state = this.initequity
+        }else{
+          this.filter.state = ''
+        }     
       } else {
       } else {
         this.filter.state = '-1'
         this.filter.state = '-1'
       }
       }
@@ -109,6 +118,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      initequity:'',
       loading: false,
       loading: false,
       filterStyle: {
       filterStyle: {
         filterReset: 1, //是否展示重置
         filterReset: 1, //是否展示重置