From 43de9e61468d79e7b695059102b1df33b552c24c Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 31 Jul 2025 17:22:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A1=E6=8F=90=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B=E9=BB=98=E8=AE=A4=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/salesCommissionRatio/editForm.vue |  9 +++------
 src/views/emis/salesCommissionRatio/index.vue    | 15 +++++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/emis/salesCommissionRatio/editForm.vue b/src/views/emis/salesCommissionRatio/editForm.vue
index 176cecf7..2ab7b7b9 100644
--- a/src/views/emis/salesCommissionRatio/editForm.vue
+++ b/src/views/emis/salesCommissionRatio/editForm.vue
@@ -51,7 +51,7 @@
               type="datetime"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择结束时间"
-              @change="changeEndDate"
+              default-time="23:59:59"
             />
           </el-form-item>
         </el-col>
@@ -61,8 +61,8 @@
             <!-- 选项水平显示 -->
             <el-radio v-model="form.status" label="1">启用</el-radio>
             <el-radio v-model="form.status" label="0">未启用</el-radio>
-            <el-radio v-model="form.status" label="2">启用已过期</el-radio>
-            <el-radio v-model="form.status" label="3">启用未过期</el-radio>
+            <!-- <el-radio v-model="form.status" label="2">启用已过期</el-radio>
+            <el-radio v-model="form.status" label="3">启用未过期</el-radio> -->
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -148,9 +148,6 @@ export default {
         });
       }
     },
-    changeEndDate(val){
-      this.form.endDate = val.split(' ')[0] + ' 23:59:59';
-    },
     // 取消按钮
     cancel() {
       this.reset();
diff --git a/src/views/emis/salesCommissionRatio/index.vue b/src/views/emis/salesCommissionRatio/index.vue
index 2983019b..7cfb36d6 100644
--- a/src/views/emis/salesCommissionRatio/index.vue
+++ b/src/views/emis/salesCommissionRatio/index.vue
@@ -73,10 +73,10 @@
       </el-table-column>
       <el-table-column label="启用状态" align="center" prop="status" min-width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.status == '1'">启用</span>
-          <span v-else-if="scope.row.status == '0'">未启用</span>
-          <span v-else-if="scope.row.status == '2'">启用已过期</span>
-          <span v-else>启用未过期</span>
+          <el-tag type="success" v-if="scope.row.status == '1' && (queryParams.status == '1' || queryParams.status == null || queryParams.status == '')">启用</el-tag>
+          <el-tag type="danger" v-else-if="scope.row.status == '0'">未启用</el-tag>
+          <el-tag type="warning" v-else-if="scope.row.status == '1' && queryParams.status == '2'">启用已过期</el-tag>
+          <el-tag type="success" v-else-if="scope.row.status == '1' && queryParams.status == '3'">启用未过期</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="开始时间" align="center" prop="startDate" width="170" />
@@ -141,7 +141,14 @@ export default {
       },
     };
   },
+  //监听查询条件
   watch: {
+    queryParams: {
+      handler(newVal, oldVal) {
+        this.getList();
+      },
+      deep: true
+    }
   },
   created() {
     this.getList();