Merge tag 'Hotfix-102' into develop

Finish Hotfix-102

src/views/finance/components/rebate_list-edit.vue

@@ -91,7 +91,7 @@
           </el-table-column>
           <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-select @change="changeCustomerFn($event, scope.$index, scope.row)" v-model="scope.row.customerId" placeholder="请选择">
+              <el-select filterable @change="changeCustomerFn($event, scope.$index, scope.row)" v-model="scope.row.customerId" placeholder="请选择">
                 <el-option v-for="item in customerData" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>

src/views/finance/components/rebate_list-review.vue

@@ -94,6 +94,11 @@
     <span>返利单复核及办理折让</span>
     <el-divider></el-divider>
     <!-- 列表 -->
+    <el-radio-group @change="changeRadioFn" v-model="examine" size="mini">
+      <el-radio-button :label="1">已确认</el-radio-button>
+      <el-radio-button :label="2">已确认待复核</el-radio-button>
+      <el-radio-button :label="3">未确认</el-radio-button>
+    </el-radio-group>
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList2" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="selectionChangeFn">
@@ -187,6 +192,10 @@ export default {
   computed: { ...mapGetters(["name"]) },
   data() {
     return {
+      trueList: [],
+      falseList: [],
+      trueOKList: [],
+      examine: 1,
       examineRemark: "",
       examineStatus: "OK",
       searchForm: {
@@ -200,12 +209,24 @@ export default {
       dataList2: [],
       selectArr: [],
       listLoading: false, // 列表加载loading
+      trueList: [],
+      falseList: [],
     };
   },
   created() {
     this.getDataList();
   },
   methods: {
+    //table切换事件
+    changeRadioFn(v) {
+      if (v == 1) {
+        this.dataList2 = this.trueList;
+      } else if (v == 2) {
+        this.dataList2 = this.trueOKList;
+      } else {
+        this.dataList2 = this.falseList;
+      }
+    },
     //选择项发生改变
     selectionChangeFn(row) {
       console.log(row);
@@ -241,7 +262,14 @@ export default {
       this.searchForm.examineBy = res.data.examineBy;
       this.searchForm.examineTime = res.data.examineTime;
       this.dataList = res.data.items;
-      this.dataList2 = res.data.items;
+      this.trueList = res.data.items.filter((v) => v.customerIsConfirm == true);
+      this.falseList = res.data.items.filter(
+        (v) => v.customerIsConfirm == false
+      );
+      this.trueOKList = res.data.items.filter(
+        (v) => v.customerIsConfirm == true && v.examineStatus == "OK_ONE"
+      );
+      this.dataList2 = this.trueList;
     },
     goBack() {
       this.$parent.showPage = 1;