From 8cceb6858a8acb2724e6e4806294264c375dd4fe Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Mon, 27 Oct 2025 15:22:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=95=BF=E8=80=85=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E9=95=BF=E8=80=85=E4=BF=A1=E6=81=AF-=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=8F=98=E6=9B=B4=E4=B8=BA=E6=8A=A4=E7=90=86?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=9F=A5=E8=AF=A2=E3=80=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BANUID=E5=AD=97=E6=AE=B5=E3=80=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=EF=BC=88=E5=90=8D=E7=A7=B0=EF=BC=89=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/elder/elderinfo/ElderInfo.data.ts     |  7 ++++++-
 src/views/elder/elderinfo/ElderInfoList.vue     | 17 +++++++++++++----
 .../elderinfo/components/ElderInfoForm.vue      | 15 +++++++++------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/views/elder/elderinfo/ElderInfo.data.ts b/src/views/elder/elderinfo/ElderInfo.data.ts
index 5ef47fe..fc48164 100644
--- a/src/views/elder/elderinfo/ElderInfo.data.ts
+++ b/src/views/elder/elderinfo/ElderInfo.data.ts
@@ -6,10 +6,15 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '护理单元',
+    title: 'NUID',
     align: 'center',
     dataIndex: 'nuId',
   },
+  {
+    title: '护理单元',
+    align: 'center',
+    dataIndex: 'nuId_dictText',
+  },
   {
     title: '长者姓名',
     align: 'center',
diff --git a/src/views/elder/elderinfo/ElderInfoList.vue b/src/views/elder/elderinfo/ElderInfoList.vue
index 18ca848..5604bec 100644
--- a/src/views/elder/elderinfo/ElderInfoList.vue
+++ b/src/views/elder/elderinfo/ElderInfoList.vue
@@ -5,16 +5,24 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
         :wrapper-col="wrapperCol">
         <a-row :gutter="24">
+          <!-- <a-col :lg="6">
+            <a-form-item name="nuId">
+              <template #label><span title="NUID">NUID</span></template>
+              <JInput v-model:value="queryParam.nuId" placeholder="请输入NUID" />
+            </a-form-item>
+          </a-col> -->
           <a-col :lg="6">
             <a-form-item name="nuId">
-              <template #label><span title="nuId">nuId</span></template>
-              <JInput v-model:value="queryParam.nuId" />
+              <template #label><span title="护理单元">护理单元</span></template>
+              <j-dict-select-tag v-model:value="queryParam.nuId"
+                :dictCode="`nu_base_info,nu_name,nu_id,del_flag = 0  order by nu_id asc`" placeholder="请选择护理单元"
+                allowClear :ignoreDisabled="true" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="name">
               <template #label><span title="姓名">姓名</span></template>
-              <JInput v-model:value="queryParam.name" />
+              <JInput v-model:value="queryParam.name" placeholder="请输入长者姓名" />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -30,7 +38,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" >
+    <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
       </template>
@@ -59,6 +67,7 @@ import { downloadFile } from '/@/utils/common/renderUtils';
 import ElderInfoModal from './components/ElderInfoModal.vue'
 import { useUserStore } from '/@/store/modules/user';
 import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
 const formRef = ref();
 const queryParam = reactive<any>({});
diff --git a/src/views/elder/elderinfo/components/ElderInfoForm.vue b/src/views/elder/elderinfo/components/ElderInfoForm.vue
index e2ecc8f..2cb027d 100644
--- a/src/views/elder/elderinfo/components/ElderInfoForm.vue
+++ b/src/views/elder/elderinfo/components/ElderInfoForm.vue
@@ -13,12 +13,14 @@
                 <!-- <a-input v-model:value="formData.nuId" placeholder="请输入护理单元"  allow-clear ></a-input> -->
                 <span>{{ formData.nuId }}</span>
               </a-form-item>
-              <!-- <a-form-item label="护理单元名称"> -->
-              <!-- <a-input v-model:value="formData.nuId" placeholder="请输入护理单元"  allow-clear ></a-input> -->
-              <!-- <j-dict-select-tag type='list' v-model:value="formData.nuId" :dictCode="`nu_base_info,nu_name,nu_id`"
-                  placeholder="请选择分类标签" allowClear @upDictCode="upNuNameFunc" />
-                <span>{{ nuNameTextFunc(formData.nuId) }}</span>
-              </a-form-item> -->
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="护理单元">
+                <!-- <a-input v-model:value="formData.nuId" placeholder="请输入护理单元"  allow-clear ></a-input> -->
+                <!-- <j-dict-select-tag type='list' v-model:value="formData.nuId" :dictCode="`nu_base_info,nu_name,nu_id`"
+                  placeholder="请选择分类标签" allowClear @upDictCode="upNuNameFunc" />-->
+                <span>{{ formData.nuId_dictText }}</span>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="姓名" v-bind="validateInfos.name" id="ElderInfoForm-name" name="name">
@@ -171,6 +173,7 @@ const emit = defineEmits(['register', 'ok']);
 const formData = reactive<Record<string, any>>({
   id: '',
   nuId: '',
+  nuId_dictText: '',
   name: '',
   sex: '',
   age: '',

From 89a6923f5cfaad5be29baa23407958cfd3bcf2d4 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Mon, 27 Oct 2025 16:37:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E6=B0=B4=E8=A1=A8=E3=80=81=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E6=B8=A9=E6=B9=BF=E5=BA=A6=E8=AE=A1=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=BE=B9=E8=B7=9D=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tq/ApiRequestLog/ApiRequestLogList.vue    | 386 +++++++++---------
 .../tq/ApiRequestLog/ApiRequestLogList2.vue   |   2 +-
 .../tq/ApiRequestLog/ApiRequestLogList3.vue   |   2 +-
 .../iot/tq/electricity/apilog/ApiLogList.vue  | 122 +++---
 .../iot/tq/electricity/apilog/ApiLogModal.vue | 109 ++---
 .../tq/electricity/apilog/WaterApiLogList.vue | 123 +++---
 .../electricity/apilog/WaterApiLogModal.vue   |   2 +-
 .../yiweilian/components/ApiLogAlarmList.vue  | 110 +++--
 .../yiweilian/components/ApiLogAlarmModal.vue | 109 ++---
 .../iot/yiweilian/components/ApiLogList.vue   |  29 ++
 10 files changed, 540 insertions(+), 454 deletions(-)

diff --git a/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
index 579d26f..06b4458 100644
--- a/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
+++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <!--引用表格-->
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
@@ -7,14 +7,14 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
         <template v-if="column.dataIndex === 'requestValue'">
-          <span >{{ (text == null || text == undefined) ? '-' : ((text == '0' || text == '0.00') ? 0 : text ) }}</span>
+          <span>{{ (text == null || text == undefined) ? '-' : ((text == '0' || text == '0.00') ? 0 : text) }}</span>
         </template>
         <template v-if="column.dataIndex === 'resolveValue'">
-          <span >{{ (text == null || text == undefined) ? '-' : ((text == '0' || text == '0.00') ? 0 : text ) }}</span>
+          <span>{{ (text == null || text == undefined) ? '-' : ((text == '0' || text == '0.00') ? 0 : text) }}</span>
         </template>
       </template>
     </BasicTable>
@@ -24,206 +24,212 @@
 </template>
 
 <script lang="ts" name="ApiRequestLog-ApiRequestLog" setup>
-  import { ref, reactive } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './ApiRequestLog.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ApiRequestLog.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import ApiRequestLogModal from './components/ApiRequestLogModal.vue'
-  import { useUserStore } from '/@/store/modules/user';
-  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './ApiRequestLog.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ApiRequestLog.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import ApiRequestLogModal from './components/ApiRequestLogModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
 
-  const formRef = ref();
-  const queryParam = reactive<any>({});
-  const toggleSearchStatus = ref<boolean>(false);
-  const registerModal = ref();
-  const userStore = useUserStore();
-  //注册table数据
-  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-    tableProps: {
-      title: 'api请求日志',
-      api: list,
-      columns,
-      canResize:false,
-      useSearchForm: false,
-      immediate: false,
-      showActionColumn: false,
-      actionColumn: {
-        width: 120,
-        fixed: 'right',
-      },
-      beforeFetch: async (params) => {
-        return Object.assign(params, queryParam);
-      },
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const userStore = useUserStore();
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: 'api请求日志',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    immediate: false,
+    showActionColumn: false,
+    actionColumn: {
+      width: 120,
+      fixed: 'right',
     },
-    exportConfig: {
-      name: "api请求日志",
-      url: getExportUrl,
-      params: queryParam,
+    beforeFetch: async (params) => {
+      return Object.assign(params, queryParam);
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
-  });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-  const labelCol = reactive({
-    xs:24,
-    sm:8,
-    xl:6,
-    xxl:8
-  });
-  const wrapperCol = reactive({
-    xs: 24,
-    sm: 16,
-  });
+  },
+  exportConfig: {
+    name: "api请求日志",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+});
+const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+const labelCol = reactive({
+  xs: 24,
+  sm: 8,
+  xl: 6,
+  xxl: 8
+});
+const wrapperCol = reactive({
+  xs: 24,
+  sm: 16,
+});
 
-  // 高级查询配置
-  const superQueryConfig = reactive(superQuerySchema);
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
 
-  /**
-   * 高级查询事件
-   */
-  function handleSuperQuery(params) {
-    Object.keys(params).map((k) => {
-      queryParam[k] = params[k];
-    });
-    searchQuery();
-  }
+/**
+ * 高级查询事件
+ */
+function handleSuperQuery(params) {
+  Object.keys(params).map((k) => {
+    queryParam[k] = params[k];
+  });
+  searchQuery();
+}
 
-  /**
-   * 新增事件
-   */
-  function handleAdd() {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.add();
-  }
-  
-  /**
-   * 编辑事件
-   */
-  function handleEdit(record: Recordable) {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.edit(record);
-  }
-   
-  /**
-   * 详情
-   */
-  function handleDetail(record: Recordable) {
-    registerModal.value.disableSubmit = true;
-    registerModal.value.edit(record);
-  }
-   
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
-  }
-   
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-  }
-   
-  /**
-   * 成功回调
-   */
-  function handleSuccess() {
-    (selectedRowKeys.value = []) && reload();
-  }
-   
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-        auth: 'nuIotTqApiRequestLog:nu_iot_tq_api_request_log:edit'
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.add();
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  registerModal.value.disableSubmit = true;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({ id: record.id }, handleSuccess);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+      auth: 'nuIotTqApiRequestLog:nu_iot_tq_api_request_log:edit'
+    },
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
       },
-    ];
-  }
-   
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      }, {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-        auth: 'nuIotTqApiRequestLog:nu_iot_tq_api_request_log:delete'
-      }
-    ]
-  }
+      auth: 'nuIotTqApiRequestLog:nu_iot_tq_api_request_log:delete'
+    }
+  ]
+}
 
-  /**
-   * 查询
-   */
-  function searchQuery() {
-    reload();
-  }
-  
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
-  }
-  
-  function init(record) { 
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+function init(record) {
   console.log("🚀 ~ init ~ record:", record)
-    queryParam.cid = record.cid;
-    queryParam.type = record.type;
-    reload();
-  }
+  queryParam.cid = record.cid;
+  queryParam.type = record.type;
+  reload();
+}
 
-  defineExpose({
-    init,
-  });
+defineExpose({
+  init,
+});
 
 
 </script>
 
 <style lang="less" scoped>
-  .jeecg-basic-table-form-container {
-    padding: 0;
-    .table-page-search-submitButtons {
-      display: block;
-      margin-bottom: 24px;
-      white-space: nowrap;
-    }
-    .query-group-cust{
-      min-width: 100px !important;
-    }
-    .query-group-split-cust{
-      width: 30px;
-      display: inline-block;
-      text-align: center
-    }
-    .ant-form-item:not(.ant-form-item-with-help){
-      margin-bottom: 16px;
-      height: 32px;
-    }
-    :deep(.ant-picker),:deep(.ant-input-number){
-      width: 100%;
-    }
+.jeecg-basic-table-form-container {
+  padding: 0;
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
   }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 16px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
 </style>
diff --git a/src/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue
index fe89e26..ae150aa 100644
--- a/src/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue
+++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <!--引用表格-->
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
diff --git a/src/views/iot/tq/ApiRequestLog/ApiRequestLogList3.vue b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList3.vue
index 1e09ba5..badfb28 100644
--- a/src/views/iot/tq/ApiRequestLog/ApiRequestLogList3.vue
+++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList3.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <!--引用表格-->
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
diff --git a/src/views/iot/tq/electricity/apilog/ApiLogList.vue b/src/views/iot/tq/electricity/apilog/ApiLogList.vue
index b024de7..c230250 100644
--- a/src/views/iot/tq/electricity/apilog/ApiLogList.vue
+++ b/src/views/iot/tq/electricity/apilog/ApiLogList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="p-2">
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
-      <a-tab-pane key="3" tab="抄表" >
+      <a-tab-pane key="3" tab="抄表">
         <ApiRequestLogList ref="ApiRequestLogListModal3"></ApiRequestLogList>
       </a-tab-pane>
       <a-tab-pane key="9" tab="清零" force-render>
@@ -18,76 +18,86 @@
 </template>
 
 <script lang="ts" name="departUtils-sysDepart" setup>
-  import { ref, reactive } from 'vue';
+import { ref, reactive } from 'vue';
 
-  import ApiRequestLogList from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue';
-  import ApiRequestLogList2 from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue';
+import ApiRequestLogList from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue';
+import ApiRequestLogList2 from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue';
 
-const activeKey= ref('3');
+const activeKey = ref('3');
 const dbsbInfo = ref<any>({});
 const ApiRequestLogListModal9 = ref();
 const ApiRequestLogListModal3 = ref();
 const ApiRequestLogListModal10 = ref();
 const ApiRequestLogListModal11 = ref();
-  function initLog(record){
-    activeKey.value = "3";
-    getDataList(activeKey.value, record);
-    dbsbInfo.value = record;
-  }
+function initLog(record) {
+  activeKey.value = "3";
+  getDataList(activeKey.value, record);
+  dbsbInfo.value = record;
+}
 
-  function getDataList(type, record) {
-    console.log("🚀 ~ getDataList ~ type, record:", type, record)
-    var params = {
-      type: type,
-      cid: record.cid
-    }
-    if(type == '9'){
-      ApiRequestLogListModal9.value.init(params);
-    }else if(type == '3'){
-      ApiRequestLogListModal3.value.init(params);
-    }else if(type == '10'){
-      ApiRequestLogListModal10.value.init(params);
-    }else if(type == '11'){
-      ApiRequestLogListModal11.value.init(params);
-    }
+function getDataList(type, record) {
+  console.log("🚀 ~ getDataList ~ type, record:", type, record)
+  var params = {
+    type: type,
+    cid: record.cid
   }
-  
-
-  function handleChange(key) {
-    console.log("🚀 ~ handleChange ~ key:", key)
-    activeKey.value = key;
-    getDataList(key, dbsbInfo.value);
+  if (type == '9') {
+    ApiRequestLogListModal9.value.init(params);
+  } else if (type == '3') {
+    ApiRequestLogListModal3.value.init(params);
+  } else if (type == '10') {
+    ApiRequestLogListModal10.value.init(params);
+  } else if (type == '11') {
+    ApiRequestLogListModal11.value.init(params);
   }
+}
 
-  defineExpose({
-    initLog,
-  });
+
+function handleChange(key) {
+  console.log("🚀 ~ handleChange ~ key:", key)
+  activeKey.value = key;
+  getDataList(key, dbsbInfo.value);
+}
+
+defineExpose({
+  initLog,
+});
 
 
 </script>
 
 <style lang="less" scoped>
-  .jeecg-basic-table-form-container {
-    padding: 0;
-    .table-page-search-submitButtons {
-      display: block;
-      margin-bottom: 24px;
-      white-space: nowrap;
-    }
-    .query-group-cust{
-      min-width: 100px !important;
-    }
-    .query-group-split-cust{
-      width: 30px;
-      display: inline-block;
-      text-align: center
-    }
-    .ant-form-item:not(.ant-form-item-with-help){
-      margin-bottom: 16px;
-      height: 32px;
-    }
-    :deep(.ant-picker),:deep(.ant-input-number){
-      width: 100%;
-    }
+.jeecg-basic-table-form-container {
+  padding: 0;
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
   }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 16px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
+
+:deep(.ant-tabs-nav) {
+  margin: 0 0 0 0;
+}
 </style>
diff --git a/src/views/iot/tq/electricity/apilog/ApiLogModal.vue b/src/views/iot/tq/electricity/apilog/ApiLogModal.vue
index c303da4..df24a81 100644
--- a/src/views/iot/tq/electricity/apilog/ApiLogModal.vue
+++ b/src/views/iot/tq/electricity/apilog/ApiLogModal.vue
@@ -1,9 +1,10 @@
 <template>
   <!-- <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
-    
-  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
-    <DepartUtilsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DepartUtilsList>
+
+  <a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
+    <DepartUtilsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
+    </DepartUtilsList>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
       <!-- <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button> -->
@@ -13,62 +14,62 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, nextTick, defineExpose } from 'vue';
-  import DepartUtilsList from './ApiLogList.vue'
-  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
-  
-  const title = ref<string>('');
-  const width = ref<string>('70%');
-  const visible = ref<boolean>(false);
-  const disableSubmit = ref<boolean>(false);
-  const registerForm = ref();
-  const emit = defineEmits(['register', 'success']);
+import { ref, nextTick, defineExpose } from 'vue';
+import DepartUtilsList from './ApiLogList.vue'
+import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 
-  
-  /**
-   * 日志
-   * @param record
-   */
-  function showApiLog(record) {
-    title.value = '日志';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.initLog(record);
-    });
-  }
-  
-  /**
-   * 确定按钮点击事件
-   */
-  function handleOk() {
-    registerForm.value.submitForm();
-  }
+const title = ref<string>('');
+const width = ref<string>('70%');
+const visible = ref<boolean>(false);
+const disableSubmit = ref<boolean>(false);
+const registerForm = ref();
+const emit = defineEmits(['register', 'success']);
 
-  /**
-   * form保存回调事件
-   */
-  function submitCallback(params) {
-    handleCancel();
-    emit('success',params);
-  }
 
-  /**
-   * 取消按钮回调事件
-   */
-  function handleCancel() {
-    visible.value = false;
-  }
-
-  defineExpose({
-    showApiLog,
-    disableSubmit,
+/**
+ * 日志
+ * @param record
+ */
+function showApiLog(record) {
+  title.value = '日志';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.initLog(record);
   });
+}
+
+/**
+ * 确定按钮点击事件
+ */
+function handleOk() {
+  registerForm.value.submitForm();
+}
+
+/**
+ * form保存回调事件
+ */
+function submitCallback(params) {
+  handleCancel();
+  emit('success', params);
+}
+
+/**
+ * 取消按钮回调事件
+ */
+function handleCancel() {
+  visible.value = false;
+}
+
+defineExpose({
+  showApiLog,
+  disableSubmit,
+});
 </script>
 
 <style lang="less">
-  /**隐藏样式-modal确定按钮 */
-  .jee-hidden {
-    display: none !important;
-  }
+/**隐藏样式-modal确定按钮 */
+.jee-hidden {
+  display: none !important;
+}
 </style>
 <style lang="less" scoped></style>
diff --git a/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue b/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue
index 075eeba..507d6a0 100644
--- a/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue
+++ b/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="p-2">
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
-      <a-tab-pane key="42" tab="抄表" >
+      <a-tab-pane key="42" tab="抄表">
         <ApiRequestLogList3 ref="ApiRequestLogListModal42"></ApiRequestLogList3>
       </a-tab-pane>
       <a-tab-pane key="49" tab="清零" force-render>
@@ -18,76 +18,87 @@
 </template>
 
 <script lang="ts" name="departUtils-sysDepart" setup>
-  import { ref, reactive } from 'vue';
+import { ref, reactive } from 'vue';
 
-  import ApiRequestLogList3 from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList3.vue';
-  import ApiRequestLogList2 from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue';
+import ApiRequestLogList3 from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList3.vue';
+import ApiRequestLogList2 from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue';
 
-const activeKey= ref('42');
+const activeKey = ref('42');
 const dbsbInfo = ref<any>({});
 const ApiRequestLogListModal42 = ref();
 const ApiRequestLogListModal43 = ref();
 const ApiRequestLogListModal49 = ref();
 const ApiRequestLogListModal53 = ref();
-  function initLog(record){
-    activeKey.value = "42";
-    getDataList(activeKey.value, record);
-    dbsbInfo.value = record;
-  }
+function initLog(record) {
+  activeKey.value = "42";
+  getDataList(activeKey.value, record);
+  dbsbInfo.value = record;
+}
 
-  function getDataList(type, record) {
-    console.log("🚀 ~ getDataList ~ type, record:", type, record)
-    var params = {
-      type: type,
-      cid: record.cid
-    }
-    if(type == '42'){
-      ApiRequestLogListModal42.value.init(params);
-    }else if(type == '43'){
-      ApiRequestLogListModal43.value.init(params);
-    }else if(type == '49'){
-      ApiRequestLogListModal49.value.init(params);
-    }else if(type == '53'){
-      ApiRequestLogListModal53.value.init(params);
-    }
+function getDataList(type, record) {
+  console.log("🚀 ~ getDataList ~ type, record:", type, record)
+  var params = {
+    type: type,
+    cid: record.cid
   }
-  
-
-  function handleChange(key) {
-    console.log("🚀 ~ handleChange ~ key:", key)
-    activeKey.value = key;
-    getDataList(key, dbsbInfo.value);
+  if (type == '42') {
+    ApiRequestLogListModal42.value.init(params);
+  } else if (type == '43') {
+    ApiRequestLogListModal43.value.init(params);
+  } else if (type == '49') {
+    ApiRequestLogListModal49.value.init(params);
+  } else if (type == '53') {
+    ApiRequestLogListModal53.value.init(params);
   }
+}
 
-  defineExpose({
-    initLog,
-  });
+
+function handleChange(key) {
+  console.log("🚀 ~ handleChange ~ key:", key)
+  activeKey.value = key;
+  getDataList(key, dbsbInfo.value);
+}
+
+defineExpose({
+  initLog,
+});
 
 
 </script>
 
 <style lang="less" scoped>
-  .jeecg-basic-table-form-container {
-    padding: 0;
-    .table-page-search-submitButtons {
-      display: block;
-      margin-bottom: 24px;
-      white-space: nowrap;
-    }
-    .query-group-cust{
-      min-width: 100px !important;
-    }
-    .query-group-split-cust{
-      width: 30px;
-      display: inline-block;
-      text-align: center
-    }
-    .ant-form-item:not(.ant-form-item-with-help){
-      margin-bottom: 16px;
-      height: 32px;
-    }
-    :deep(.ant-picker),:deep(.ant-input-number){
-      width: 100%;
-    }
+.jeecg-basic-table-form-container {
+  padding: 0;
+  margin-bottom: 14px;
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 14px;
+    white-space: nowrap;
   }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 14px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
+
+:deep(.ant-tabs-nav) {
+  margin: 0 0 0 0;
+}
 </style>
diff --git a/src/views/iot/tq/electricity/apilog/WaterApiLogModal.vue b/src/views/iot/tq/electricity/apilog/WaterApiLogModal.vue
index 66c6d87..3f53fbf 100644
--- a/src/views/iot/tq/electricity/apilog/WaterApiLogModal.vue
+++ b/src/views/iot/tq/electricity/apilog/WaterApiLogModal.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
     <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
     <WaterApiLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></WaterApiLogList>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
diff --git a/src/views/iot/yiweilian/components/ApiLogAlarmList.vue b/src/views/iot/yiweilian/components/ApiLogAlarmList.vue
index e029dc8..868a107 100644
--- a/src/views/iot/yiweilian/components/ApiLogAlarmList.vue
+++ b/src/views/iot/yiweilian/components/ApiLogAlarmList.vue
@@ -1,56 +1,84 @@
 <template>
-  <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
-    <a-tab-pane key="1" tab="抄表">
-      <ApiLogList ref="apiLogList"></ApiLogList>
-    </a-tab-pane>
-    <a-tab-pane key="2" tab="告警" force-render>
-      <AlarmList ref="alarmList"></AlarmList>
-    </a-tab-pane>
-  </a-tabs>
+  <div class="p-2">
+    <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
+      <a-tab-pane key="1" tab="抄表">
+        <ApiLogList ref="apiLogList"></ApiLogList>
+      </a-tab-pane>
+      <a-tab-pane key="2" tab="告警" force-render>
+        <AlarmList ref="alarmList"></AlarmList>
+      </a-tab-pane>
+    </a-tabs>
+  </div>
 </template>
 
 <script lang="ts" name="departUtils-sysDepart" setup>
-  import { ref, reactive } from 'vue';
-  import ApiLogList from './ApiLogList.vue';
-  import AlarmList from './AlarmList.vue';
-  const activeKey= ref('1');
-  const dbsbInfo = ref<any>({});
-  const apiLogList = ref();
-  const alarmList = ref();
+import { ref, reactive } from 'vue';
+import ApiLogList from './ApiLogList.vue';
+import AlarmList from './AlarmList.vue';
+const activeKey = ref('1');
+const dbsbInfo = ref<any>({});
+const apiLogList = ref();
+const alarmList = ref();
 
-  function init(record){
-    activeKey.value = "1";
-    getDataList(activeKey.value, record);
-    dbsbInfo.value = record;
+function init(record) {
+  activeKey.value = "1";
+  getDataList(activeKey.value, record);
+  dbsbInfo.value = record;
+}
+
+function getDataList(type, record) {
+  console.log("🚀 ~ getDataList ~ type, record:", type, record)
+  var params = {
+    sn: record.sn
   }
-
-  function getDataList(type, record) {
-    console.log("🚀 ~ getDataList ~ type, record:", type, record)
-    var params = {
-      sn: record.sn
-    }
-    if(type == '1'){
-      apiLogList.value.init(params);
-    }else if(type == '2'){
-      alarmList.value.init(params);
-    }
+  if (type == '1') {
+    apiLogList.value.init(params);
+  } else if (type == '2') {
+    alarmList.value.init(params);
   }
+}
 
-  function handleChange(key) {
-    console.log("🚀 ~ handleChange ~ key:", key)
-    activeKey.value = key;
-    getDataList(key, dbsbInfo.value);
-  }
+function handleChange(key) {
+  console.log("🚀 ~ handleChange ~ key:", key)
+  activeKey.value = key;
+  getDataList(key, dbsbInfo.value);
+}
 
-  defineExpose({
-    init,
-  });
+defineExpose({
+  init,
+});
 
 
 </script>
 
 <style lang="less" scoped>
-    //:deep(.ant-tabs-nav){
-    //  margin: 0 !important;
-    //}
+.jeecg-basic-table-form-container {
+  padding: 0;
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 16px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
 </style>
diff --git a/src/views/iot/yiweilian/components/ApiLogAlarmModal.vue b/src/views/iot/yiweilian/components/ApiLogAlarmModal.vue
index bcdde6b..2c09d2c 100644
--- a/src/views/iot/yiweilian/components/ApiLogAlarmModal.vue
+++ b/src/views/iot/yiweilian/components/ApiLogAlarmModal.vue
@@ -1,9 +1,10 @@
 <template>
   <!-- <j-modal :title="title" width="70%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
-    
-  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
-    <ApiLogAlarmList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ApiLogAlarmList>
+
+  <a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
+    <ApiLogAlarmList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
+    </ApiLogAlarmList>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
       <!-- <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button> -->
@@ -13,62 +14,62 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, nextTick, defineExpose } from 'vue';
-  import ApiLogAlarmList from './ApiLogAlarmList.vue'
-  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+import { ref, nextTick, defineExpose } from 'vue';
+import ApiLogAlarmList from './ApiLogAlarmList.vue'
+import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 
-  const title = ref<string>('');
-  const width = ref<string>('70%');
-  const visible = ref<boolean>(false);
-  const disableSubmit = ref<boolean>(false);
-  const registerForm = ref();
-  const emit = defineEmits(['register', 'success']);
+const title = ref<string>('');
+const width = ref<string>('70%');
+const visible = ref<boolean>(false);
+const disableSubmit = ref<boolean>(false);
+const registerForm = ref();
+const emit = defineEmits(['register', 'success']);
 
 
-  /**
-   * 日志
-   * @param record
-   */
-  function showLogAlarm(record) {
-    title.value = '日志';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.init(record);
-    });
-  }
-
-  /**
-   * 确定按钮点击事件
-   */
-  function handleOk() {
-    registerForm.value.submitForm();
-  }
-
-  /**
-   * form保存回调事件
-   */
-  function submitCallback(params) {
-    handleCancel();
-    emit('success',params);
-  }
-
-  /**
-   * 取消按钮回调事件
-   */
-  function handleCancel() {
-    visible.value = false;
-  }
-
-  defineExpose({
-    showLogAlarm,
-    disableSubmit,
+/**
+ * 日志
+ * @param record
+ */
+function showLogAlarm(record) {
+  title.value = '日志';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.init(record);
   });
+}
+
+/**
+ * 确定按钮点击事件
+ */
+function handleOk() {
+  registerForm.value.submitForm();
+}
+
+/**
+ * form保存回调事件
+ */
+function submitCallback(params) {
+  handleCancel();
+  emit('success', params);
+}
+
+/**
+ * 取消按钮回调事件
+ */
+function handleCancel() {
+  visible.value = false;
+}
+
+defineExpose({
+  showLogAlarm,
+  disableSubmit,
+});
 </script>
 
 <style lang="less">
-  /**隐藏样式-modal确定按钮 */
-  .jee-hidden {
-    display: none !important;
-  }
+/**隐藏样式-modal确定按钮 */
+.jee-hidden {
+  display: none !important;
+}
 </style>
 <style lang="less" scoped></style>
diff --git a/src/views/iot/yiweilian/components/ApiLogList.vue b/src/views/iot/yiweilian/components/ApiLogList.vue
index 34c3425..58d905d 100644
--- a/src/views/iot/yiweilian/components/ApiLogList.vue
+++ b/src/views/iot/yiweilian/components/ApiLogList.vue
@@ -111,5 +111,34 @@
 </script>
 
 <style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  padding: 0;
 
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 16px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
 </style>
+

From 92f4769e0ac947146bbc4df04435e8ddbcf3885b Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 28 Oct 2025 11:01:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=A0=B8-?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SectionDivider/SectionDivider.vue         |  13 +-
 .../components/EmployeesApplyForm.vue         | 112 +++++++++++-------
 2 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/src/components/SectionDivider/SectionDivider.vue b/src/components/SectionDivider/SectionDivider.vue
index b1a2c39..cf6e801 100644
--- a/src/components/SectionDivider/SectionDivider.vue
+++ b/src/components/SectionDivider/SectionDivider.vue
@@ -2,7 +2,8 @@
   <div class="section-divider">
     <!-- 左侧灰色横线 -->
     <!-- <div class="left-line"></div> -->
-    <img src="./section.svg" class="divider-icon" />
+    <div class="left-icon"></div>
+    <!-- <img src="./section.svg" class="divider-icon" /> -->
     <!-- 标题文字 -->
     <div class="divider-content">
       <slot>{{ title }}</slot>
@@ -26,7 +27,7 @@ export default {
 .section-divider {
   display: flex;
   align-items: center;
-  margin: 5px 0 30px 20px;
+  margin: 5px 0 14px 20px;
 }
 
 /* 蓝色竖线（带圆角） */
@@ -72,4 +73,12 @@ export default {
   background-color: #ddd; /* 灰色 */
   margin-left: 8px; /* 与文字的间距 */
 }
+
+.left-icon{
+  width: 8px;
+  height: 18px;
+  background-color: #1890ff;
+  margin-right: 8px;
+  border-radius: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue
index efbeaf5..52e57ae 100644
--- a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue
+++ b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue
@@ -4,51 +4,55 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="EmployeesApplyForm">
-          <a-row>
-            <a-col :span="24">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'基本信息'" />
+              <!-- <span>基本信息</span> -->
             </a-col>
             <a-col :span="12">
               <a-form-item label="姓名" v-bind="validateInfos.name" id="EmployeesApplyForm-name" name="name">
-                <!-- <a-input v-model:value="formData.name" placeholder="请输入姓名" disabled allow-clear></a-input> -->
-                <span>{{ formData.name }}</span>
+                <a-input v-model:value="formData.name" placeholder="请输入姓名" disabled allow-clear></a-input>
+                <!-- <span>{{ formData.name }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="联系电话" v-bind="validateInfos.tel" id="EmployeesApplyForm-tel" name="tel">
-                <!-- <a-input v-model:value="formData.tel" placeholder="请输入联系电话" disabled allow-clear></a-input> -->
-                <span>{{ formData.tel }}</span>
+                <a-input v-model:value="formData.tel" placeholder="请输入联系电话" disabled allow-clear></a-input>
+                <!-- <span>{{ formData.tel }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="性别" v-bind="validateInfos.sex" id="EmployeesApplyForm-sex" name="sex">
+                <a-input v-model:value="formData.sex" placeholder="请输入性别" disabled allow-clear></a-input>
                 <!-- <j-dict-select-tag type='radio' v-model:value="formData.sex" dictCode="sex" placeholder="请选择性别" disabled
                 allow-clear /> -->
-                <span>{{ formData.sex }}</span>
+                <!-- <span>{{ formData.sex }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="年龄" v-bind="validateInfos.sex" id="EmployeesApplyForm-sex" name="sex">
-                <span> {{ handleComputedAge(formData.dateOfBirth) }}</span>
+                <a-input v-model:value="ageVal" placeholder="请输入年龄" disabled allow-clear></a-input>
+                <!-- <span> {{ handleComputedAge(formData.dateOfBirth) }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="出生日期" v-bind="validateInfos.dateOfBirth" id="EmployeesApplyForm-dateOfBirth"
                 name="dateOfBirth">
-                <!-- <a-date-picker placeholder="请选择出生日期" v-model:value="formData.dateOfBirth" value-format="YYYY-MM-DD"
-                  style="width: 100%" disabled allow-clear /> -->
-                <span>{{ formData.dateOfBirth }}</span>
+                <a-date-picker placeholder="请选择出生日期" v-model:value="formData.dateOfBirth" value-format="YYYY-MM-DD"
+                  style="width: 100%" disabled allow-clear />
+                <!-- <span>{{ formData.dateOfBirth }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="民族" v-bind="validateInfos.national" id="EmployeesApplyForm-national" name="national">
-                <!-- <a-input v-model:value="formData.national" placeholder="请输入民族" disabled allow-clear></a-input> -->
-                <span>{{ formData.national }}</span>
+                <a-input v-model:value="formData.national" placeholder="请输入民族" disabled allow-clear></a-input>
+                <!-- <span>{{ formData.national }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="身份证号">
-                <span>{{ formData.idCard }}</span>
+                <a-input v-model:value="formData.idCard" placeholder="请输入身份证号" disabled allow-clear></a-input>
+                <!-- <span>{{ formData.idCard }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -56,19 +60,20 @@
                 name="marriedOrNot">
                 <!-- <j-dict-select-tag type='radio' v-model:value="formData.marriedOrNot" dictCode="married_or_not"
                   placeholder="请选择婚否" disabled allow-clear /> -->
-                <span>{{ formData.marriedOrNot }}</span>
+                <a-input v-model:value="formData.marriedOrNot" placeholder="请输入婚否" disabled allow-clear></a-input>
+                <!-- <span>{{ formData.marriedOrNot }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="身高" v-bind="validateInfos.height" id="EmployeesApplyForm-height" name="height">
-                <!-- <a-input-number v-model:value="formData.height" placeholder="请输入身高" style="width: 100%" disabled /> -->
-                <span>{{ formData.height }}cm</span>
+                <a-input-number v-model:value="formData.height" placeholder="请输入身高" style="width: 100%" disabled />
+                <!-- <span>{{ formData.height }}cm</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="体重" v-bind="validateInfos.weight" id="EmployeesApplyForm-weight" name="weight">
-                <!-- <a-input-number v-model:value="formData.weight" placeholder="请输入体重" style="width: 100%" disabled /> -->
-                <span>{{ formData.weight }}kg</span>
+                <a-input-number v-model:value="formData.weight" placeholder="请输入体重" style="width: 100%" disabled />
+                <!-- <span>{{ formData.weight }}kg</span> -->
               </a-form-item>
             </a-col>
             <!-- <a-col :span="12">
@@ -84,7 +89,8 @@
                 name="healthStatus">
                 <!-- <j-dict-select-tag type='radio' v-model:value="formData.healthStatus" dictCode="health_status" disabled
                   placeholder="请选择健康状况" allow-clear /> -->
-                <span>{{ formData.healthStatus }}</span>
+                <a-input v-model:value="formData.healthStatus" placeholder="请输入健康状况" style="width: 100%" disabled />
+                <!-- <span>{{ formData.healthStatus }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -92,37 +98,39 @@
                 id="EmployeesApplyForm-politicalAppearance" name="politicalAppearance">
                 <!-- <j-dict-select-tag v-model:value="formData.politicalAppearance" dictCode="political_appearance" disabled
                   placeholder="请选择政治面貌" allow-clear /> -->
-                <span>{{ formData.politicalAppearance }}</span>
+                <a-input v-model:value="formData.politicalAppearance" placeholder="请输入政治面貌" style="width: 100%"
+                  disabled />
+                <!-- <span>{{ formData.politicalAppearance }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="户籍所在地" v-bind="validateInfos.houseAddress" id="EmployeesApplyForm-houseAddress"
                 name="houseAddress">
-                <!-- <a-input v-model:value="formData.houseAddress" placeholder="请输入户籍所在地" disabled allow-clear></a-input> -->
-                <span>{{ formData.houseAddress }}</span>
+                <a-input v-model:value="formData.houseAddress" placeholder="请输入户籍所在地" disabled allow-clear></a-input>
+                <!-- <span>{{ formData.houseAddress }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="紧急联系人" v-bind="validateInfos.emergencyContact"
                 id="EmployeesApplyForm-emergencyContact" name="emergencyContact">
-                <!-- <a-input v-model:value="formData.emergencyContact" placeholder="请输入紧急联系人" disabled
-                  allow-clear></a-input> -->
-                <span>{{ formData.emergencyContact }}</span>
+                <a-input v-model:value="formData.emergencyContact" placeholder="请输入紧急联系人" disabled
+                  allow-clear></a-input>
+                <!-- <span>{{ formData.emergencyContact }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="紧急联系人电话" v-bind="validateInfos.emergencyTel" id="EmployeesApplyForm-emergencyTel"
                 name="emergencyTel">
-                <!-- <a-input v-model:value="formData.emergencyTel" placeholder="请输入紧急联系人电话" disabled allow-clear></a-input> -->
-                <span>{{ formData.emergencyTel }}</span>
+                <a-input v-model:value="formData.emergencyTel" placeholder="请输入紧急联系人电话" disabled allow-clear></a-input>
+                <!-- <span>{{ formData.emergencyTel }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="与本人关系" v-bind="validateInfos.emergencyRelationship"
                 id="EmployeesApplyForm-emergencyRelationship" name="emergencyRelationship">
-                <!-- <a-input v-model:value="formData.emergencyRelationship" placeholder="请输入紧急联系人与本人关系" disabled
-                  allow-clear></a-input> -->
-                <span>{{ formData.emergencyRelationship }}</span>
+                <a-input v-model:value="formData.emergencyRelationship" placeholder="请输入紧急联系人与本人关系" disabled
+                  allow-clear></a-input>
+                <!-- <span>{{ formData.emergencyRelationship }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -130,7 +138,8 @@
                 name="hukouNature">
                 <!-- <j-dict-select-tag type='radio' v-model:value="formData.hukouNature" dictCode="hukou_nature" disabled
                   placeholder="请选择户口性质" allow-clear /> -->
-                <span>{{ formData.hukouNature }}</span>
+                <a-input v-model:value="formData.hukouNature" placeholder="请输入户口性质" disabled allow-clear></a-input>
+                <!-- <span>{{ formData.hukouNature }}</span> -->
               </a-form-item>
             </a-col>
           </a-row>
@@ -141,8 +150,8 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
           name="EmployeesApplyForm">
-          <a-row>
-            <a-col :span="24">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'证件信息'" />
             </a-col>
             <a-col :span="23" :push="1">
@@ -234,7 +243,9 @@
                 </a-tab-pane>
               </a-tabs>
             </a-col>
-            <a-col :span="24">
+          </a-row>
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <div v-if="formData.applyType == 0">
                 <SectionDivider :title="'邀请结果'" />
               </div>
@@ -248,15 +259,15 @@
                 <div v-if="disabled">
                   <!-- 被邀请 -->
                   <div v-if="formData.applyType == 0">
-                    <span v-if="formData.status == 1">待确认</span>
-                    <span v-if="formData.status == 2">已接受</span>
-                    <span v-if="formData.status == 3">已拒绝</span>
+                    <span v-if="formData.status == 1"><a-input :value="'待确认'" disabled allow-clear></a-input></span>
+                    <span v-if="formData.status == 2"><a-input :value="'已接受'" disabled allow-clear></a-input></span>
+                    <span v-if="formData.status == 3"><a-input :value="'已拒绝'" disabled allow-clear></a-input></span>
                   </div>
                   <!-- 主动申请 -->
                   <div v-if="formData.applyType == 1">
-                    <span v-if="formData.status == 1">待审核</span>
-                    <span v-if="formData.status == 2">申请通过</span>
-                    <span v-if="formData.status == 3">申请驳回</span>
+                    <span v-if="formData.status == 1"><a-input :value="'待审核'" disabled allow-clear></a-input></span>
+                    <span v-if="formData.status == 2"><a-input :value="'申请通过'" disabled allow-clear></a-input></span>
+                    <span v-if="formData.status == 3"><a-input :value="'申请驳回'" disabled allow-clear></a-input></span>
                   </div>
                 </div>
                 <a-select v-else v-model:value="statusVal" placeholder="请选择审核意见" style="width: 200px" :disabled="false">
@@ -281,7 +292,9 @@
                   name="auditContent">
                   <a-textarea v-if="!disabled" :autosize="{ minRows: 3 }" maxlength="50" show-count
                     v-model:value="formData.auditContent" allow-clear placeholder="请输入驳回原因"></a-textarea>
-                  <span v-else>{{ formData.auditContent }}</span>
+                  <!-- <span v-else>{{ formData.auditContent }}</span> -->
+                  <span v-else><a-textarea v-model:value="formData.auditContent" :autosize="{ minRows: 3 }"
+                      placeholder="请输入紧急联系人电话" disabled allow-clear></a-textarea></span>
                 </a-form-item>
               </div>
             </a-col>
@@ -313,6 +326,7 @@ const formRef = ref();
 const useForm = Form.useForm;
 const emit = defineEmits(['register', 'ok']);
 const activeKey = ref('1')
+const ageVal = ref()
 const formData = reactive<Record<string, any>>({
   id: '',
   openId: '',
@@ -398,6 +412,7 @@ function add() {
  * 编辑
  */
 function edit(record) {
+  ageVal.value = handleComputedAge(record.dateOfBirth)
   nextTick(() => {
     resetFields();
     const tmpData = {};
@@ -508,4 +523,17 @@ defineExpose({
 
 <style lang="less" scoped>
 .antd-modal-form {}
+
+.card-class {
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
+}
 </style>