From 7573ef5d7c72589c282c1a09a103c126620d9da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=A1=E5=A4=8D=E4=B9=A0?= <2353956224@qq.com>
Date: Tue, 15 Jul 2025 13:47:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B2=89=E4=B8=9D=E5=8A=A9?=
 =?UTF-8?q?=E6=89=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.local                                          |  4 ++--
 .../EmployeeBigBrotherForm.vue                      | 12 +++++++-----
 src/views/server/manageemployeebigbrother/index.vue | 13 +++----------
 src/views/server/manageemployeehosts/index.vue      |  2 +-
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.env.local b/.env.local
index ba999c8..7b2e052 100644
--- a/.env.local
+++ b/.env.local
@@ -4,8 +4,8 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://192.168.1.174:48080'
-# VITE_BASE_URL='http://47.79.98.113:48080'
+# VITE_BASE_URL='http://192.168.1.174:48080'
+VITE_BASE_URL='http://47.79.98.113:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/views/server/manageemployeebigbrother/EmployeeBigBrotherForm.vue b/src/views/server/manageemployeebigbrother/EmployeeBigBrotherForm.vue
index 2632e90..0698ae8 100644
--- a/src/views/server/manageemployeebigbrother/EmployeeBigBrotherForm.vue
+++ b/src/views/server/manageemployeebigbrother/EmployeeBigBrotherForm.vue
@@ -1,7 +1,7 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
-      <el-form-item label="大哥的display_id" prop="displayId">
+      <!-- <el-form-item label="大哥的display_id" prop="displayId">
         <el-input v-model="formData.displayId" placeholder="请输入大哥的display_id" />
       </el-form-item>
       <el-form-item label="大哥的用户id" prop="userIdStr">
@@ -36,11 +36,12 @@
       </el-form-item>
       <el-form-item label="该数据所属的账号id" prop="userId">
         <el-input v-model="formData.userId" placeholder="请输入该数据所属的账号id" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="是否洽谈" prop="operationStatus">
-        <el-radio-group v-model="formData.operationStatus">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
+        <el-select v-model="formData.operationStatus" placeholder="请选择状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BIGBIOTHER_NEGOTIATION)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -51,6 +52,7 @@
 </template>
 <script setup lang="ts">
 import { EmployeeBigBrotherApi, EmployeeBigBrotherVO } from '@/api/server/employeebigbrother'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 
 /** 大哥数据员工业务 表单 */
 defineOptions({ name: 'EmployeeBigBrotherForm' })
diff --git a/src/views/server/manageemployeebigbrother/index.vue b/src/views/server/manageemployeebigbrother/index.vue
index 300bcd1..8520a15 100644
--- a/src/views/server/manageemployeebigbrother/index.vue
+++ b/src/views/server/manageemployeebigbrother/index.vue
@@ -130,18 +130,11 @@
           <dict-tag :type="DICT_TYPE.BIGBIOTHER_NEGOTIATION" :value="scope.row.operationStatus" />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="操作" align="center" min-width="120px">
+      <el-table-column :label="$t('employee.action')" align="center" min-width="120px">
         <template #default="scope">
-          <el-button link type="primary" @click="openForm('update', scope.row.id)"
-            v-hasPermi="['server:employee-big-brother:update']">
-            编辑
-          </el-button>
-          <el-button link type="danger" @click="handleDelete(scope.row.id)"
-            v-hasPermi="['server:employee-big-brother:delete']">
-            删除
-          </el-button>
+          <el-button link type="primary" @click="openForm('update', scope.row.id)">{{ $t('employee.edit') }}</el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
diff --git a/src/views/server/manageemployeehosts/index.vue b/src/views/server/manageemployeehosts/index.vue
index 8be962a..a074357 100644
--- a/src/views/server/manageemployeehosts/index.vue
+++ b/src/views/server/manageemployeehosts/index.vue
@@ -133,7 +133,7 @@
       <el-table-column :label="$t('employee.remark')" align="center" prop="remake" />
       <el-table-column :label="$t('employee.operationStatus')" align="center" prop="operationStatus">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.x" :value="scope.row.operationStatus" />
+          <dict-tag :type="DICT_TYPE.OPERATION_STATE" :value="scope.row.operationStatus" />
         </template>
       </el-table-column>
       <el-table-column :label="$t('employee.createTime')" align="center" prop="createTime" :formatter="dateFormatter"