From 9cdfa01d33ac5c50de081583147fa2ac8bcfac51 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 11 Nov 2024 15:19:53 +0800
Subject: [PATCH] sc

---
 .env.base                                       |  4 ++--
 src/views/Basic/Role/Comp/RoleEmployee.vue      | 12 ++++++++++++
 src/views/Home/Comp/DialogSalerReportDetail.vue |  1 +
 src/views/Home/SalesReport.vue                  |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.env.base b/.env.base
index b37d409..d470c46 100644
--- a/.env.base
+++ b/.env.base
@@ -4,8 +4,8 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='http://118.31.23.45:48080'
-VITE_BASE_URL='http://114.55.169.15:48080'
+VITE_BASE_URL='http://118.31.23.45:48080'
+# VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
diff --git a/src/views/Basic/Role/Comp/RoleEmployee.vue b/src/views/Basic/Role/Comp/RoleEmployee.vue
index 5360843..d14f7f6 100644
--- a/src/views/Basic/Role/Comp/RoleEmployee.vue
+++ b/src/views/Basic/Role/Comp/RoleEmployee.vue
@@ -9,6 +9,18 @@
         :label="col.label"
         :width="col.width"
       />
+      <el-table-column label="状态" key="status">
+        <template #default="scope">
+          <el-switch
+            v-model="scope.row.status"
+            :active-value="0"
+            active-text="在职"
+            inactive-text="离职"
+            :inactive-value="1"
+            disabled
+          />
+        </template>
+      </el-table-column>
     </el-table>
     <Pagination
       v-model:limit="pageSize"
diff --git a/src/views/Home/Comp/DialogSalerReportDetail.vue b/src/views/Home/Comp/DialogSalerReportDetail.vue
index 3804b7a..2b4688c 100644
--- a/src/views/Home/Comp/DialogSalerReportDetail.vue
+++ b/src/views/Home/Comp/DialogSalerReportDetail.vue
@@ -19,6 +19,7 @@
           :props="defaultProps"
           check-strictly
           clearable
+          filterable
           node-key="sourceId"
           placeholder="请选择渠道"
           @change="sourceChange"
diff --git a/src/views/Home/SalesReport.vue b/src/views/Home/SalesReport.vue
index 29fd990..b5a2870 100644
--- a/src/views/Home/SalesReport.vue
+++ b/src/views/Home/SalesReport.vue
@@ -22,6 +22,7 @@
           :props="defaultProps"
           check-strictly
           clearable
+          filterable
           node-key="sourceId"
           placeholder="请选择渠道"
         />