Merge branch 'feature/hcd' into 'develop-3.18.0'

优化筛选

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!320

src/views/goods/order-detail.vue

@@ -44,16 +44,13 @@
               </template>
             </el-table-column>
           <el-table-column
-            prop="status"
+            prop="goodsShowStatusStr"
             label="状态"
             min-width="100"
             align="center"
-            :filters="getFilterStatusArr('status','showStatusStr')"
+            :filters="getFilterArr('goodsShowStatusStr')"
             :filter-method="filterStatusHandler"
           >
-            <template slot-scope="scope">
-              <span>{{scope.row.goodsShowStatusStr}}</span>
-            </template>
           </el-table-column>
           <el-table-column prop="expressCompany" label="物流公司" min-width="100" align="center">
             <template slot-scope="scope">
@@ -70,7 +67,7 @@
             label="所属包裹"
             min-width="100"
             align="center"
-            :filters="getFilterPackageArr('belongPackage')"
+            :filters="getFilterArr('belongPackage')"
             :filter-method="filterPackageHandler"
           >
             <template slot-scope="scope">
@@ -520,17 +517,18 @@
             }
           });
       },
-       getFilterStatusArr(value,valueStr) {
+    getFilterArr(value) {
       let newFilterArr = [];
       for (const newItem of this.tableData) {
+        let flag = true;
         for (const item  of newFilterArr) {
-         if(item.text == this.orderDetailData[valueStr]) {
-            return newFilterArr;
-         }
+          if(item.text == newItem[value]) {
+            flag = false;
+          }
         }
-        if (newItem[value]) {
+        if(newItem[value] && flag) {
           newFilterArr.push({
-            text: this.orderDetailData[valueStr],
+            text: newItem[value],
             value: newItem[value]
           })
         }
@@ -538,24 +536,7 @@
       return newFilterArr;
     },
     filterStatusHandler(value, row, column) {
-      return row.status === value;
-    },
-    getFilterPackageArr(value) {
-      let newFilterArr = [];
-      for (const newItem of this.tableData) {
-        for (const item  of newFilterArr) {
-         if(item.text == newItem[value]) {
-            return newFilterArr;
-         }
-        }
-        if (newItem[value]) {
-          newFilterArr.push({
-            text: newItem[value],
-            value: newItem[value]
-          })
-        }
-      }
-      return newFilterArr;
+      return row.goodsShowStatusStr === value;
     },
     filterPackageHandler(value, row, column) {
       return row.belongPackage === value;