Merge branch 'ch/ht_3.0' of eta_mini/eta_mini_crm_front into debug_ht

src/views/order/OrderList.vue

@@ -194,6 +194,9 @@ function handleSortChange({order,prop}){
 }
 
 function handleSelectChange() {
+    if (tableQuery.orderStatus !== 'refund' && tableQuery.refundStatus !== '') {
+        tableQuery.refundStatus = '';
+    }
     getTableData();
 }
 
@@ -276,7 +279,7 @@ function success() {
                             :value="item.value">
                         </el-option>
                     </el-select>
-                    <el-select v-model="tableQuery.refundStatus" clearable @change="handleSelectChange()" placeholder="售后状态" style="width: 150px; margin-right: 20px;">
+                    <el-select v-model="tableQuery.refundStatus" clearable @change="handleSelectChange()" placeholder="售后状态" style="width: 150px; margin-right: 20px;" :disabled="tableQuery.orderStatus !== 'refund'">
                         <el-option
                         v-for="item in refundListStatusList"
                         :key="item.value"