From 8a59c9416b4f69561ce618516c9d008e29243e55 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 23 Jun 2025 09:20:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=89=88?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                   | 4 ++--
 src/views/iot/yiweilian/index.vue | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.env.production b/.env.production
index dfb09f0..ea5660d 100644
--- a/.env.production
+++ b/.env.production
@@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 #后台接口父地址(必填)
-VITE_GLOB_API_URL=/nursing-unit
+VITE_GLOB_API_URL=/nursingunit
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursing-unit
+VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit
 
 # 接口父路径前缀
 VITE_GLOB_API_URL_PREFIX=
diff --git a/src/views/iot/yiweilian/index.vue b/src/views/iot/yiweilian/index.vue
index 973eea4..de1b3ca 100644
--- a/src/views/iot/yiweilian/index.vue
+++ b/src/views/iot/yiweilian/index.vue
@@ -45,6 +45,7 @@
   import ApiLogAlarmModal from './components/ApiLogAlarmModal.vue'
   import HldyUtilsModal from "@/views/utils/nuUtils/HldyUtilsModal.vue";
   import HumidDeviceSyncLogListModal from "/@/views/iot/tq/nuIotTqElectricitySyncLog/HumidDeviceSyncLogListModal.vue";
+  import DeviceInfoDrawer from "./components/DeviceInfoDrawer.vue";
   import { defHttp } from '/@/utils/http/axios';
   const apiLogAlarmModal = ref();
   const hldyUtilsModal = ref();

From 9c697ef8af4e96623358f77fd88518dc3b924777 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 25 Jun 2025 08:46:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NuEmployeesAdvisoryInfo.data.ts           | 42 +++++++++----------
 .../NuEmployeesAdvisoryInfoList.vue           |  2 +-
 .../NuEmployeesAdvisoryInfoForm.vue           | 15 +++++++
 .../biz/orgapplyinfo/OrgApplyInfoList.vue     |  2 +-
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
index dc6d2b0..75011a9 100644
--- a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
@@ -6,32 +6,21 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 import {JVxeTypes, JVxeColumn, JVxeTableInstance} from '/@/components/jeecg/JVxeTable/types'
 //列表数据
 export const columns: BasicColumn[] = [
-  {
-    title: '联系电话',
-    align: "center",
-    dataIndex: 'tel'
-  },
-  {
-    title: '状态',
-    align: "center",
-    dataIndex: 'status',
-  },
-  {
-    title: '审核备注',
-    align: "center",
-    dataIndex: 'content',
-    defaultHidden: true,
-  },
-  {
-    title: '机构是否入驻',
-    align: "center",
-    dataIndex: 'izEntry'
-  },
   {
     title: '咨询人姓名',
     align: "center",
     dataIndex: 'name'
   },
+  {
+    title: '联系电话',
+    align: "center",
+    dataIndex: 'tel'
+  },
+  // {
+  //   title: '机构是否入驻',
+  //   align: "center",
+  //   dataIndex: 'izEntry'
+  // },
   {
     title: '性别',
     align: "center",
@@ -149,6 +138,17 @@ export const columns: BasicColumn[] = [
     dataIndex: 'contactRelationship',
     defaultHidden: true,
   },
+  {
+    title: '状态',
+    align: "center",
+    dataIndex: 'status_dictText',
+  },
+  {
+    title: '审核备注',
+    align: "center",
+    dataIndex: 'content',
+    defaultHidden: true,
+  },
   {
     title: '户口性质',
     align: "center",
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue
index 336cb5b..b60eea1 100644
--- a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue
@@ -179,7 +179,7 @@ import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
       {
         label: '审批',
         onClick: handleEdit.bind(null, record),
-        ifShow: record.status == '0' || record.status == null
+        ifShow: record.status == '1' 
       },
       {
         label: '详情',
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
index 787d952..d2842c2 100644
--- a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
@@ -4,6 +4,20 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuEmployeesAdvisoryInfoForm">
           <a-row>
+            <a-col :span="24">
+              <SectionDivider :title="'入驻审批'" />
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="审批" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
+                <j-dict-select-tag type="radio" v-model:value="formData.status" dictCode="org_apply_status" placeholder="请选择审批结果"
+                  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="审核备注" v-bind="validateInfos.content" id="OrgApplyInfoForm-content" name="content">
+                <a-input v-model:value="formData.content" placeholder="请输入审核备注" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
             <a-col :span="24">
               <SectionDivider :title="'基本信息'" />
             </a-col>
@@ -181,6 +195,7 @@
   import { saveOrUpdate } from '../NuEmployeesAdvisoryInfo.api';
   import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: () => ({})},
diff --git a/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue b/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue
index 67791c3..5a69226 100644
--- a/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue
+++ b/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue
@@ -188,7 +188,7 @@ function getTableAction(record) {
       label: '审批',
       onClick: handleEdit.bind(null, record),
       auth: 'orgapplyinfo:nu_org_apply_info:edit',
-      disabled: record.status == '0' || record.status == '2'
+      ifShow: record.status == '1'
     },
   ];
 }