From e22bb7bbf5e4a87fba33366f348c981fcb3559c3 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 25 Mar 2026 11:02:30 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=A0=91=EF=BC=9A=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=90=AF=E7=94=A8/=E5=81=9C=E7=94=A8=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=A0=87=E7=AD=BE=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=202=E3=80=81=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4-=E5=B0=86=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E6=9B=B4=E5=A4=9A=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E9=83=BD=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=98=BE=E7=A4=BA=E5=9C=A8=E6=9C=80=E5=A4=96=E5=B1=82?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=9B=B4=E5=A4=9A=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=90=AF=E7=94=A8=E3=80=81=E5=81=9C=E7=94=A8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=203=E3=80=81=E5=91=98=E5=B7=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF=EF=BC=9A?=
 =?UTF-8?q?=E5=AF=B9=E2=80=9C=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E2=80=9D?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9=204=E3=80=81=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=9A=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=88=97=E8=A1=A8=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=AE=BD=E5=BA=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=205=E3=80=81=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=EF=BC=9A=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employeesapply/EmployeesApplyList.vue     | 14 +--
 .../bizEmployeesInfo/BizEmployeesInfoList.vue |  3 +-
 .../EmployeesServiceTagModal.vue              |  2 +-
 .../ConfigServiceDirectiveList.vue            | 95 +++++++++++++------
 4 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/src/views/admin/employeesapply/EmployeesApplyList.vue b/src/views/admin/employeesapply/EmployeesApplyList.vue
index c9082a9..0daf9e3 100644
--- a/src/views/admin/employeesapply/EmployeesApplyList.vue
+++ b/src/views/admin/employeesapply/EmployeesApplyList.vue
@@ -7,20 +7,20 @@
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item name="name">
-              <template #label><span title="姓名">姓名</span></template>
-              <JInput v-model:value="queryParam.name" placeholder="请输入姓名" />
+              <template #label><span title="员工姓名">员工姓名</span></template>
+              <JInput v-model:value="queryParam.name" placeholder="请输入员工姓名" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="tel">
-              <template #label><span title="电话">电话</span></template>
-              <JInput v-model:value="queryParam.tel" placeholder="请输入电话" />
+              <template #label><span title="联系电话">联系电话</span></template>
+              <JInput v-model:value="queryParam.tel" placeholder="请输入联系电话" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="status">
               <template #label><span title="审核状态">审核状态</span></template>
-              <a-select v-model:value="queryParam.status" placeholder="请选择审核状态" style="width: 200px" :disabled="false">
+              <a-select v-model:value="queryParam.status" placeholder="请选择审核状态" :disabled="false">
                 <a-select-option value="1">待审核</a-select-option>
                 <a-select-option value="2">审核通过</a-select-option>
                 <a-select-option value="3">审核驳回</a-select-option>
@@ -122,7 +122,7 @@ const labelCol = reactive({
   xs: 24,
   sm: 4,
   xl: 6,
-  xxl: 4
+  xxl: 6
 });
 const wrapperCol = reactive({
   xs: 24,
@@ -188,7 +188,7 @@ function getTableAction(record) {
     {
       label: '员工入驻审核',
       onClick: handleEdit.bind(null, record),
-      ifShow: record.status == '1' && (record.modifyStatus == null || record.modifyStatus == undefined  || record.modifyStatus == '') && record.izHistory == 'N'
+      ifShow: record.status == '1' && (record.modifyStatus == null || record.modifyStatus == undefined || record.modifyStatus == '') && record.izHistory == 'N'
     },
     {
       label: '信息变更审核',
diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
index cfb75b9..e46ec68 100644
--- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
+++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
@@ -299,7 +299,8 @@ async function handleCzmm(record) {
   createConfirm({
     iconType: 'warning',
     title: '密码重置操作确认',
-    content: '确认重置用户【' + record.name + '】的密码为"123456"？<br/>操作后已登录设备将被强制下线，旧密码即刻失效。请及时通知该员工。',
+    // content: '确认重置用户【' + record.name + '】的密码为"123456"？<br/>操作后已登录设备将被强制下线，旧密码即刻失效。请及时通知该员工。',
+    content: '确认将员工【' + record.name + '】的密码重置为初始密码：123456吗？',
     okText: '确认',
     cancelText: '取消',
     onOk: async () => {
diff --git a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagModal.vue b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagModal.vue
index 694b92b..e11bdf1 100644
--- a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagModal.vue
+++ b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagModal.vue
@@ -16,7 +16,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<string>('1400px');
+  const width = ref<string>('1600px');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();
diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
index ed35135..eb8d49a 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
@@ -11,9 +11,9 @@
               <JInput v-model:value="queryParam.directiveName" placeholder="请输入服务指令名称" allowClear />
             </a-form-item>
           </a-col>
-          <a-col :lg="8" >
+          <a-col :lg="8">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6" >
+              <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
                   style="margin-left: 8px">重置</a-button>
@@ -256,9 +256,10 @@
         <BasicTable @register="registerTable">
           <!--插槽:table标题-->
           <template #tableTitle>
-            <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-        
+            <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+            <j-upload-button type="primary" preIcon="ant-design:import-outlined"
+              @click="onImportXls">导入</j-upload-button>
+
             <a-button type="primary" @click="directiveSyncCodeMangeFunc" v-show="!!ownOrgCode"
               preIcon="ant-design:setting-outlined">镜像码管理</a-button>
             <a-button type="primary" @click="handleDirectiveMainOpen" preIcon="ant-design:profile-outlined">
@@ -388,7 +389,7 @@
         <a-row style="width: 100%;">
           <a-col :span="3" style="display: flex; align-items: center;">
             <span style="font-weight: bold;font-size: 16px;">镜像码：<span style="color: #1890FF;">{{ syncCode
-                }}</span></span>
+            }}</span></span>
           </a-col>
           <a-col :span="3" style="display: flex; align-items: center; justify-content: flex-end;">
             <a-button @click="copySyncCodeFunc()" type="primary" style="margin-right: 8px;">复制</a-button>
@@ -514,7 +515,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       pageSizeOptions: ['15', '50', '70', '100'],
     },
     actionColumn: {
-      width: 120,
+      width: 160,
       fixed: 'right',
     },
     beforeFetch: async (params) => {
@@ -586,6 +587,32 @@ function getTableAction(record) {
       label: '详情',
       onClick: handleDetail.bind(null, record),
     },
+    {
+      label: '编辑',
+      onClick: editDirective.bind(null, { key: record.id }),
+    },
+    // {
+    //   label: '编辑资源',
+    //   onClick: editMedia.bind(null, { key: record.id }),
+    // },
+    {
+      label: '启用',
+      // onClick: usingDirective.bind(null, { key: record.id }),
+      ifShow: record.izEnabled == 'N',
+      popConfirm: {
+        title: '是否启用指令',
+        confirm: usingDirective.bind(null, { key: record.id }),
+      },
+    },
+    {
+      label: '停用',
+      // onClick: stopDirective.bind(null, { key: record.id }),
+      ifShow: record.izEnabled == 'Y',
+      popConfirm: {
+        title: '是否停用指令',
+        confirm: stopDirective.bind(null, { key: record.id }),
+      },
+    },
   ];
 }
 
@@ -594,24 +621,32 @@ function getTableAction(record) {
  */
 function getDropDownAction(record) {
   return [
-    {
-      label: '编辑指令',
-      onClick: editDirective.bind(null, { key: record.id }),
-    },
     // {
-    //   label: '编辑资源',
-    //   onClick: editMedia.bind(null, { key: record.id }),
+    //   label: '编辑指令',
+    //   onClick: editDirective.bind(null, { key: record.id }),
+    // },
+    // // {
+    // //   label: '编辑资源',
+    // //   onClick: editMedia.bind(null, { key: record.id }),
+    // // },
+    // {
+    //   label: '启用指令',
+    //   // onClick: usingDirective.bind(null, { key: record.id }),
+    //   ifShow: record.izEnabled == 'N',
+    //   popConfirm: {
+    //     title: '是否启用指令',
+    //     confirm: usingDirective.bind(null, record),
+    //   },
+    // },
+    // {
+    //   label: '停用指令',
+    //   // onClick: stopDirective.bind(null, { key: record.id }),
+    //   ifShow: record.izEnabled == 'Y',
+    //   popConfirm: {
+    //     title: '是否停用指令',
+    //     confirm: stopDirective.bind(null, record),
+    //   },
     // },
-    {
-      label: '启用指令',
-      onClick: usingDirective.bind(null, { key: record.id }),
-      ifShow: record.izEnabled == 'N'
-    },
-    {
-      label: '停用指令',
-      onClick: stopDirective.bind(null, { key: record.id }),
-      ifShow: record.izEnabled == 'Y'
-    },
   ]
 }
 
@@ -830,7 +865,7 @@ function usingInstruction(data) {
   createConfirm({
     iconType: 'warning',
     title: '操作确认',
-    content: '此操作会同时启用分类标签“' + data.title + '”下所有服务类别、服务类型、服务指令！' + '是否确认启用分类标签“' + data.title + '”!',
+    content: '此操作将启用“' + data.title + '”分类标签下所有服务类别、服务类型、服务指令，' + '确认要执行此操作吗？',
     okText: '启用',
     cancelText: '取消',
     onOk: () => {
@@ -846,7 +881,7 @@ function stopInstruction(data) {
   createConfirm({
     iconType: 'warning',
     title: '操作确认',
-    content: '此操作会同时停用分类标签“' + data.title + '”下所有服务类别、服务类型、服务指令！' + '是否确认停用分类标签“' + data.title + '”!',
+    content: '此操作将停用“' + data.title + '”分类标签下所有服务类别、服务类型、服务指令，' + '确认要执行此操作吗？',
     okText: '停用',
     cancelText: '取消',
     onOk: () => {
@@ -871,7 +906,7 @@ function usingCategory(data) {
   createConfirm({
     iconType: 'warning',
     title: '操作确认',
-    content: '此操作会同时启用服务类别“' + data.title + '”下所有服务类型、服务指令！' + '是否确认启用服务类别“' + data.title + '”!',
+    content: '此操作将启用“' + data.title + '”服务类别下所有服务类型、服务指令，' + '确认要执行此操作吗？',
     okText: '启用',
     cancelText: '取消',
     onOk: () => {
@@ -886,7 +921,7 @@ function stopCategory(data) {
   createConfirm({
     iconType: 'warning',
     title: '操作确认',
-    content: '此操作会同时停用服务类别“' + data.title + '”下所有服务类型、服务指令！' + '是否确认停用服务类别“' + data.title + '”!',
+    content: '此操作将停用“' + data.title + '”服务类别下所有服务类型、服务指令，' + '确认要执行此操作吗？',
     okText: '停用',
     cancelText: '取消',
     onOk: () => {
@@ -911,7 +946,7 @@ function usingType(data) {
   createConfirm({
     iconType: 'warning',
     title: '操作确认',
-    content: '此操作会同时启用服务类型“' + data.title + '”下所有服务指令！' + '是否确认启用服务类型“' + data.title + '”!',
+    content: '此操作将启用“' + data.title + '”服务类型下所有服务指令，' + '确认要执行此操作吗？',
     okText: '启用',
     cancelText: '取消',
     onOk: () => {
@@ -925,7 +960,7 @@ function stopType(data) {
   createConfirm({
     iconType: 'warning',
     title: '操作确认',
-    content: '此操作会同时停用服务类型“' + data.title + '”下所有服务指令！' + '是否确认停用服务类型“' + data.title + '”!',
+    content: '此操作将停用“' + data.title + '”服务类型下所有服务指令，' + '确认要执行此操作吗？',
     okText: '停用',
     cancelText: '取消',
     onOk: () => {
@@ -1295,8 +1330,6 @@ audio::-webkit-media-controls-time-remaining-display {
 :where(.css-dev-only-do-not-override-9m98ij) .ant-image-preview-operations-operation {
   display: none !important;
 }
-
-
 </style>
 <style>
 .ant-image-preview-body .ant-image-preview-operations {