diff --git a/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm.vue b/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm.vue
index c8bee5f..378f641 100644
--- a/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm.vue
+++ b/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm.vue
@@ -4,26 +4,26 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="NuEmployeesAdvisoryInfoForm">
-          <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="12">
               <a-form-item label="姓名" v-bind="validateInfos.name" id="NuEmployeesAdvisoryInfoForm-name" name="name">
-                <!-- <a-input v-model:value="formData.name" placeholder="请输入咨询人姓名"  allow-clear disabled  ></a-input> -->
-                {{ formData.name }}
+                <a-input v-model:value="formData.name" placeholder="请输入咨询人姓名"   disabled  ></a-input>
+                <!-- {{ formData.name }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="联系电话" v-bind="validateInfos.tel" id="NuEmployeesAdvisoryInfoForm-tel" name="tel">
-                <!-- <a-input v-model:value="formData.tel" placeholder="请输入联系电话"  allow-clear  disabled ></a-input> -->
-                {{ formData.tel }}
+                <a-input v-model:value="formData.tel" placeholder="请输入联系电话"    disabled ></a-input>
+                <!-- {{ formData.tel }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="性别" v-bind="validateInfos.sex" id="NuEmployeesAdvisoryInfoForm-sex" name="sex">
-                <!-- <a-input v-model:value="formData.sex" placeholder="请输入性别"  allow-clear disabled  ></a-input> -->
-                {{ formData.sex }}
+                <a-input v-model:value="formData.sex" placeholder="请输入性别"   disabled  ></a-input>
+                <!-- {{ formData.sex }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -34,103 +34,106 @@
             <a-col :span="12">
               <a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="NuEmployeesAdvisoryInfoForm-birthDate"
                 name="birthDate">
-                <!-- <a-date-picker placeholder="请选择出生日期"  v-model:value="formData.birthDate" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
-                {{ formData.birthDate }}
+                <a-input v-model:value="formData.birthDate" placeholder="出生日期"   disabled  ></a-input>
+                <!-- <a-date-picker placeholder="请选择出生日期"  v-model:value="formData.birthDate" disabled  value-format="YYYY-MM-DD"  style="width: 100%"   /> -->
+                <!-- {{ formData.birthDate }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="民族" v-bind="validateInfos.national" id="NuEmployeesAdvisoryInfoForm-national"
                 name="national">
-                <!-- <a-input v-model:value="formData.national" placeholder="请输入民族"  allow-clear disabled  ></a-input> -->
-                {{ formData.national }}
+                <a-input v-model:value="formData.national" placeholder="请输入民族"   disabled  ></a-input>
+                <!-- {{ formData.national }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="户籍所在地" v-bind="validateInfos.idCardAddress"
                 id="NuEmployeesAdvisoryInfoForm-idCardAddress" name="idCardAddress">
-                <!-- <a-input v-model:value="formData.idCardAddress" placeholder="请输入住址"  allow-clear disabled  ></a-input> -->
-                {{ formData.idCardAddress }}
+                <a-input v-model:value="formData.idCardAddress" placeholder="请输入住址"   disabled  ></a-input>
+                <!-- {{ formData.idCardAddress }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="NuEmployeesAdvisoryInfoForm-idCard"
                 name="idCard">
-                <!-- <a-input v-model:value="formData.idCard" placeholder="请输入身份证号"  allow-clear disabled  ></a-input> -->
-                {{ formData.idCard }}
+                <a-input v-model:value="formData.idCard" placeholder="请输入身份证号"   disabled  ></a-input>
+                <!-- {{ formData.idCard }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="婚否" v-bind="validateInfos.maritalStatus"
                 id="NuEmployeesAdvisoryInfoForm-maritalStatus" name="maritalStatus">
-                <!-- <a-input v-model:value="formData.maritalStatus" placeholder="请输入婚否"  allow-clear  disabled ></a-input> -->
-                {{ formData.maritalStatus }}
+                <a-input v-model:value="formData.maritalStatus" placeholder="请输入婚否"    disabled ></a-input>
+                <!-- {{ formData.maritalStatus }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="身高" v-bind="validateInfos.height" id="NuEmployeesAdvisoryInfoForm-height"
                 name="height">
-                <!-- <a-input v-model:value="formData.height" placeholder="请输入身高"  allow-clear  disabled ></a-input> -->
-                {{ formData.height }}
+                <a-input v-model:value="formData.height" placeholder="请输入身高"    disabled ></a-input>
+                <!-- {{ formData.height }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="体重" v-bind="validateInfos.weight" id="NuEmployeesAdvisoryInfoForm-weight"
                 name="weight">
-                <!-- <a-input v-model:value="formData.weight" placeholder="请输入体重"  allow-clear  disabled ></a-input> -->
-                {{ formData.weight }}
+                <a-input v-model:value="formData.weight" placeholder="请输入体重"    disabled ></a-input>
+                <!-- {{ formData.weight }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="健康状况" v-bind="validateInfos.healthStatus"
                 id="NuEmployeesAdvisoryInfoForm-healthStatus" name="healthStatus">
-                <!-- <a-input v-model:value="formData.healthStatus" placeholder="请输入健康状况"  allow-clear  disabled ></a-input> -->
-                {{ formData.healthStatus }}
+                <a-input v-model:value="formData.healthStatus" placeholder="请输入健康状况"    disabled ></a-input>
+                <!-- {{ formData.healthStatus }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="政治面貌" v-bind="validateInfos.politicalAppearance"
                 id="NuEmployeesAdvisoryInfoForm-politicalAppearance" name="politicalAppearance">
-                <!-- <a-input v-model:value="formData.politicalAppearance" placeholder="请输入政治面貌"  allow-clear disabled  ></a-input> -->
-                {{ formData.politicalAppearance }}
+                <a-input v-model:value="formData.politicalAppearance" placeholder="请输入政治面貌"   disabled  ></a-input>
+                <!-- {{ formData.politicalAppearance }} -->
               </a-form-item>
             </a-col>
 
             <a-col :span="12">
               <a-form-item label="紧急联系人" v-bind="validateInfos.contactName" id="NuEmployeesAdvisoryInfoForm-contactName"
                 name="contactName">
-                <!-- <a-input v-model:value="formData.contactName" placeholder="请输入紧急联系人姓名"  allow-clear disabled  ></a-input> -->
-                {{ formData.contactName }}
+                <a-input v-model:value="formData.contactName" placeholder="请输入紧急联系人姓名"   disabled  ></a-input>
+                <!-- {{ formData.contactName }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="紧急联系人电话" v-bind="validateInfos.contactTel" id="NuEmployeesAdvisoryInfoForm-contactTel"
                 name="contactTel">
-                <!-- <a-input v-model:value="formData.contactTel" placeholder="请输入紧急联系人电话"  allow-clear disabled  ></a-input> -->
-                {{ formData.contactTel }}
+                <a-input v-model:value="formData.contactTel" placeholder="请输入紧急联系人电话"   disabled  ></a-input>
+                <!-- {{ formData.contactTel }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="与本人关系" v-bind="validateInfos.contactRelationship"
                 id="NuEmployeesAdvisoryInfoForm-contactRelationship" name="contactRelationship">
-                <!-- <a-input v-model:value="formData.contactRelationship" placeholder="请输入紧急联系人与本人关系"  allow-clear disabled  ></a-input> -->
-                {{ formData.contactRelationship }}
+                <a-input v-model:value="formData.contactRelationship" placeholder="请输入紧急联系人与本人关系"   disabled  ></a-input>
+                <!-- {{ formData.contactRelationship }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="现住址" v-bind="validateInfos.currentAddress"
                 id="NuEmployeesAdvisoryInfoForm-currentAddress" name="currentAddress">
-                <!-- <a-input v-model:value="formData.currentAddress" placeholder="请输入现住址"  allow-clear disabled  ></a-input> -->
-                {{ formData.currentAddress }}
+                <a-input v-model:value="formData.currentAddress" placeholder="请输入现住址"   disabled  ></a-input>
+                <!-- {{ formData.currentAddress }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="户口性质" v-bind="validateInfos.hukouType" id="NuEmployeesAdvisoryInfoForm-hukouType"
                 name="hukouType">
-                <!-- <a-input v-model:value="formData.hukouType" placeholder="请输入户口性质"  allow-clear disabled  ></a-input> -->
-                {{ formData.hukouType }}
+                <a-input v-model:value="formData.hukouType" placeholder="请输入户口性质"   disabled  ></a-input>
+                <!-- {{ formData.hukouType }} -->
               </a-form-item>
             </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;">
               <SectionDivider :title="'身份证'" />
             </a-col>
             <a-col :span="12">
@@ -336,4 +339,17 @@ defineExpose({
 .antd-modal-form {
   padding: 14px;
 }
+
+.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>
diff --git a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
index dd95885..71bea53 100644
--- a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
+++ b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
@@ -1,7 +1,7 @@
 <template>
 <div >
   <a-row>
-      <a-col v-for="(item,index) in sxtList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;">
+      <a-col v-for="(item,index) in sxtList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 9px;">
         <a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }"  :bodyStyle="{ padding: '24px 24px 4px 24px' }">
           <template #title>
               <a-row style="font-weight: normal;">
diff --git a/src/views/biz/nuBaseInfo/components/BaseWlsbListModal.vue b/src/views/biz/nuBaseInfo/components/BaseWlsbListModal.vue
index 87f97b7..85e273e 100644
--- a/src/views/biz/nuBaseInfo/components/BaseWlsbListModal.vue
+++ b/src/views/biz/nuBaseInfo/components/BaseWlsbListModal.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- <j-modal :title="title" :width="width" :maxHeight="`200px`" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
-    <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true" bodyStyle="padding:14px;"
+    <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true" bodyStyle="padding:6px;"
     :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <BaseWlsbListForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BaseWlsbListForm>
     <template #footer>
diff --git a/src/views/elder/elderinfo/ElderInfo.data.ts b/src/views/elder/elderinfo/ElderInfo.data.ts
index 9218d40..d2a3706 100644
--- a/src/views/elder/elderinfo/ElderInfo.data.ts
+++ b/src/views/elder/elderinfo/ElderInfo.data.ts
@@ -35,11 +35,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'guardianName',
   },
-  {
-    title: '关系',
-    align: 'center',
-    dataIndex: 'relationship',
-  },
+  // {
+  //   title: '关系',
+  //   align: 'center',
+  //   dataIndex: 'relationship',
+  // },
   {
     title: '监护人电话',
     align: 'center',
@@ -106,11 +106,11 @@ export const guaColumns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'guardianName',
   },
-  {
-    title: '关系',
-    align: 'center',
-    dataIndex: 'relationship',
-  },
+  // {
+  //   title: '关系',
+  //   align: 'center',
+  //   dataIndex: 'relationship',
+  // },
   {
     title: '监护人电话',
     align: 'center',
@@ -172,7 +172,7 @@ export const applyObj = {
   currentState: '当前状态 0咨询 1入住 2留床 3退住',
   guardianOpenId: '监护人openId',
   guardianName: '监护人姓名',
-  relationship: '监护人与老人关系',
+  // relationship: '监护人与老人关系',
   guardianIdCard: '监护人身份证号',
   guardianPhone: '监护人联系电话',
   guardianDateOfBirth: '监护人出生日期',
diff --git a/src/views/elder/elderinfo/components/ElderInfoForm.vue b/src/views/elder/elderinfo/components/ElderInfoForm.vue
index f180e95..cbefcc5 100644
--- a/src/views/elder/elderinfo/components/ElderInfoForm.vue
+++ b/src/views/elder/elderinfo/components/ElderInfoForm.vue
@@ -10,55 +10,57 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="NUID" v-bind="validateInfos.nuId" id="ElderInfoForm-nuId" name="nuId">
-                <!-- <a-input v-model:value="formData.nuId" placeholder="请输入护理单元"  allow-clear ></a-input> -->
-                <span>{{ formData.nuId }}</span>
+                <a-input v-model:value="formData.nuId" placeholder="请输入护理单元"   ></a-input>
+                <!-- <span>{{ 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> -->
+                <a-input v-model:value="formData.nuId_dictText" placeholder="请输入护理单元"   ></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>
+                <!-- <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">
-                <!-- <a-input v-model:value="formData.name" placeholder="请输入姓名" allow-clear></a-input> -->
-                <span>{{ formData.name }}</span>
+                <a-input v-model:value="formData.name" placeholder="请输入姓名" ></a-input>
+                <!-- <span>{{ formData.name }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="性别" v-bind="validateInfos.sex" id="ElderInfoForm-sex" name="sex">
-                <!-- <a-input v-model:value="formData.sex" placeholder="请输入性别" allow-clear></a-input> -->
-                <span>{{ formData.sex }}</span>
+                <a-input v-model:value="formData.sex" placeholder="请输入性别" ></a-input>
+                <!-- <span>{{ formData.sex }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="身份证号码" v-bind="validateInfos.idCard" id="ElderInfoForm-idCard" name="idCard">
-                <!-- <a-input v-model:value="formData.idCard" placeholder="请输入身份证号码" allow-clear></a-input> -->
-                <span>{{ formData.idCard }}</span>
+                <a-input v-model:value="formData.idCard" placeholder="请输入身份证号码" ></a-input>
+                <!-- <span>{{ formData.idCard }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="出生日期" v-bind="validateInfos.dateOfBirth" id="ElderInfoForm-dateOfBirth"
                 name="dateOfBirth">
                 <!-- <a-date-picker placeholder="请选择出生日期" v-model:value="formData.dateOfBirth" showTime
-                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear /> -->
-                <span>{{ formData.dateOfBirth }}</span>
+                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"  /> -->
+                  <a-input v-model:value="formData.dateOfBirth" placeholder="出生日期" ></a-input>
+                <!-- <span>{{ formData.dateOfBirth }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="民族" v-bind="validateInfos.national" id="ElderInfoForm-national" name="national">
-                <!-- <a-input v-model:value="formData.national" placeholder="请输入民族" allow-clear></a-input> -->
-                <span>{{ formData.national }}</span>
+                <a-input v-model:value="formData.national" placeholder="请输入民族" ></a-input>
+                <!-- <span>{{ formData.national }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="住址" v-bind="validateInfos.houseAddress" id="ElderInfoForm-houseAddress"
                 name="houseAddress">
                 <!-- <a-textarea v-model:value="formData.houseAddress" :rows="4" placeholder="请输入户籍所在地" /> -->
-                <span>{{ formData.houseAddress }}</span>
+                <a-input v-model:value="formData.houseAddress" placeholder="请输入户籍所在地" ></a-input>
+                <!-- <span>{{ formData.houseAddress }}</span> -->
               </a-form-item>
             </a-col>
           </a-row>
@@ -77,43 +79,42 @@
             <a-col :span="12">
               <a-form-item label="姓名" v-bind="validateInfos.guardianName" id="ElderInfoForm-guardianName"
                 name="guardianName">
-                <!-- <a-input v-model:value="formData.guardianName" placeholder="请输入监护人姓名" allow-clear></a-input> -->
-                <span>{{ formData.guardianName }}</span>
+                <a-input v-model:value="formData.guardianName" placeholder="请输入监护人姓名" ></a-input>
+                <!-- <span>{{ formData.guardianName }}</span> -->
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-item label="关系" v-bind="validateInfos.relationship" id="ElderInfoForm-relationship"
                 name="relationship">
-                <!-- <a-input v-model:value="formData.relationship" placeholder="请输入关系" allow-clear></a-input> -->
                 <span>{{ formData.relationship }}</span>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="12">
               <a-form-item label="身份证号" v-bind="validateInfos.guardianIdCard" id="ElderInfoForm-guardianIdCard"
                 name="guardianIdCard">
-                <!-- <a-input v-model:value="formData.guardianIdCard" placeholder="请输入监护人身份证号" allow-clear></a-input> -->
-                <span>{{ formData.guardianIdCard }}</span>
+                <a-input v-model:value="formData.guardianIdCard" placeholder="请输入监护人身份证号" ></a-input>
+                <!-- <span>{{ formData.guardianIdCard }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="联系电话" v-bind="validateInfos.guardianPhone" id="ElderInfoForm-guardianPhone"
                 name="guardianPhone">
-                <!-- <a-input v-model:value="formData.guardianPhone" placeholder="请输入联系电话" allow-clear></a-input> -->
-                <span>{{ formData.guardianPhone }}</span>
+                <a-input v-model:value="formData.guardianPhone" placeholder="请输入联系电话" ></a-input>
+                <!-- <span>{{ formData.guardianPhone }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="家庭住址" v-bind="validateInfos.guardianHomeAddress"
                 id="ElderInfoForm-guardianHomeAddress" name="guardianHomeAddress">
-                <!-- <a-input v-model:value="formData.guardianHomeAddress" placeholder="请输入监护人家庭住址" allow-clear></a-input> -->
-                <span>{{ formData.guardianHomeAddress }}</span>
+                <a-input v-model:value="formData.guardianHomeAddress" placeholder="请输入监护人家庭住址" ></a-input>
+                <!-- <span>{{ formData.guardianHomeAddress }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="工作单位" v-bind="validateInfos.guardianWorkUnit" id="ElderInfoForm-guardianWorkUnit"
                 name="guardianWorkUnit">
-                <!-- <a-input v-model:value="formData.guardianWorkUnit" placeholder="请输入监护人工作单位" allow-clear></a-input> -->
-                <span>{{ formData.guardianWorkUnit }}</span>
+                <a-input v-model:value="formData.guardianWorkUnit" placeholder="请输入监护人工作单位" ></a-input>
+                <!-- <span>{{ formData.guardianWorkUnit }}</span> -->
               </a-form-item>
             </a-col>
           </a-row>
@@ -136,23 +137,25 @@
             <a-col :span="12">
               <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="ElderInfoForm-startTime"
                 name="startTime">
+                <a-input v-model:value="formData.guardianWorkUnit" placeholder="有效开始日期" ></a-input>
                 <!-- <a-date-picker placeholder="请选择有效开始日期" v-model:value="formData.startTime" showTime
-                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear /> -->
-                <span>{{ formData.startTime }}</span>
+                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"  /> -->
+                <!-- <span>{{ formData.startTime }}</span> -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="ElderInfoForm-endTime" name="endTime">
+                <a-input :value="formData.endTime == '9999-12-31' ? '长期' : formData.endTime" placeholder="有效结束日期" ></a-input>
                 <!-- <a-date-picker placeholder="请选择有效结束日期" v-model:value="formData.endTime" showTime
-                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear /> -->
-                {{ formData.endTime == '9999-12-31' ? '长期' : formData.endTime }}
+                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"  /> -->
+                <!-- {{ formData.endTime == '9999-12-31' ? '长期' : formData.endTime }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="ElderInfoForm-issuingAuthority"
                 name="issuingAuthority">
-                <!-- <a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" allow-clear></a-input> -->
-                <span>{{ formData.issuingAuthority }}</span>
+                <a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" ></a-input>
+                <!-- <span>{{ formData.issuingAuthority }}</span> -->
               </a-form-item>
             </a-col>
           </a-row>
diff --git a/src/views/elder/elderinfo/components/GuaUpInfoForm.vue b/src/views/elder/elderinfo/components/GuaUpInfoForm.vue
index 76f6bd7..8ee3208 100644
--- a/src/views/elder/elderinfo/components/GuaUpInfoForm.vue
+++ b/src/views/elder/elderinfo/components/GuaUpInfoForm.vue
@@ -9,10 +9,10 @@
               <span>{{ applyObj[record.d1] }}</span>
             </template>
             <template v-if="column.dataIndex === 'd2' && isImg(record.d1)">
-              <JImageUpload :fileMax="1" v-model:value="record.d2" disabled></JImageUpload>
+              <JImageUpload :fileMax="1" :value="opeMediaAddress + record.d2" disabled></JImageUpload>
             </template>
             <template v-if="column.dataIndex === 'd3' && isImg(record.d1)">
-              <JImageUpload :fileMax="1" v-model:value="record.d3" disabled></JImageUpload>
+              <JImageUpload :fileMax="1" :value="opeMediaAddress + record.d3" disabled></JImageUpload>
             </template>
             <template
               v-if="column.dataIndex === 'd2' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
@@ -68,6 +68,8 @@ import { getModifyInfo, guaAudit } from '../ElderInfo.api'
 import { useMessage } from '/@/hooks/web/useMessage';
 import { initDictOptions } from '/@/utils/dict';
 
+const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
+
 const formRef = ref();
 const AForm = Form;
 const AFormItem = Form.Item;
diff --git a/src/views/invoicing/warehouseMaterialInfo/components/CheckWuliaoForm.vue b/src/views/invoicing/warehouseMaterialInfo/components/CheckWuliaoForm.vue
index 80006c8..ef20e5d 100644
--- a/src/views/invoicing/warehouseMaterialInfo/components/CheckWuliaoForm.vue
+++ b/src/views/invoicing/warehouseMaterialInfo/components/CheckWuliaoForm.vue
@@ -47,7 +47,7 @@
 import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
 
-  const { createMessage } = useMessage();
+  const { createMessage,createConfirm } = useMessage();
   const formRef = ref();
   const queryParam = reactive<any>({});
   const toggleSearchStatus = ref<boolean>(false);
@@ -204,18 +204,34 @@ import { defHttp } from '/@/utils/http/axios';
     if(sfjx == "1"){
       return;
     }
-    defHttp.post({url:'/invoicing/blWarehouseMaterialInfo/addBatch',params:list2}).then(res=>{
-      console.log("🚀 ~ submitForm ~ res:", res)
-      emit('ok');
-    })
-    // emit('ok',selectedRows.value);
+    
+    createConfirm({
+      iconType: 'warning',
+      title: '确认添加',
+      content: '是否添加选中数据',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        defHttp.post({url:'/invoicing/blWarehouseMaterialInfo/addBatch',params:list2}).then(res=>{
+          emit('ok');
+        })
+      }
+    });
   }
   function submitAllForm() {
-    defHttp.post({url:'/invoicing/blWarehouseMaterialInfo/addAllWuliao',params:{nuId:formData.nuId}}).then(res=>{
-      console.log("🚀 ~ submitForm ~ res:", res)
-      emit('ok');
-    })
-    // emit('ok',selectedRows.value);
+    
+    createConfirm({
+      iconType: 'warning',
+      title: '确认添加全部',
+      content: '是否添加全部物料！！！',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        defHttp.post({url:'/invoicing/blWarehouseMaterialInfo/addAllWuliao',params:{nuId:formData.nuId}}).then(res=>{
+          emit('ok');
+        })
+      }
+    });
   }
 
   defineExpose({
diff --git a/src/views/invoicing/warehouseMaterialInfo/components/DelWuliaoForm.vue b/src/views/invoicing/warehouseMaterialInfo/components/DelWuliaoForm.vue
index d5fbe99..9aaeaed 100644
--- a/src/views/invoicing/warehouseMaterialInfo/components/DelWuliaoForm.vue
+++ b/src/views/invoicing/warehouseMaterialInfo/components/DelWuliaoForm.vue
@@ -198,8 +198,8 @@ import { defHttp } from '/@/utils/http/axios';
     }
     createConfirm({
       iconType: 'warning',
-      title: '确认删除',
-      content: '是否删除选中数据',
+      title: '确认移除',
+      content: '是否移除选中物料',
       okText: '确认',
       cancelText: '取消',
       onOk: () => {
@@ -209,13 +209,22 @@ import { defHttp } from '/@/utils/http/axios';
         })
       }
     });
-    // batchDelete(ids,emit('ok'))
-    // emit('ok',selectedRows.value);
   }
   function handleAllDel() {
-    defHttp.get({url:'/invoicing/blWarehouseMaterialInfo/deleteAllWuliao',params:{nuId:formData.nuId}}).then(res=>{
-      emit('ok');
-    })
+    
+    createConfirm({
+      iconType: 'warning',
+      title: '确认移除',
+      content: '是否移除全部物料！！！',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        defHttp.get({url:'/invoicing/blWarehouseMaterialInfo/deleteAllWuliao',params:{nuId:formData.nuId}}).then(res=>{
+          emit('ok');
+        })
+      }
+    });
+    
   }
 
   defineExpose({
diff --git a/src/views/iot/tq/electricity/apilog/ApiLogList.vue b/src/views/iot/tq/electricity/apilog/ApiLogList.vue
index c230250..61ae1c4 100644
--- a/src/views/iot/tq/electricity/apilog/ApiLogList.vue
+++ b/src/views/iot/tq/electricity/apilog/ApiLogList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
       <a-tab-pane key="3" tab="抄表">
         <ApiRequestLogList ref="ApiRequestLogListModal3"></ApiRequestLogList>
diff --git a/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue b/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue
index 507d6a0..bb63ed9 100644
--- a/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue
+++ b/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
       <a-tab-pane key="42" tab="抄表">
         <ApiRequestLogList3 ref="ApiRequestLogListModal42"></ApiRequestLogList3>
diff --git a/src/views/iot/yiweilian/components/ApiLogAlarmList.vue b/src/views/iot/yiweilian/components/ApiLogAlarmList.vue
index 868a107..436cdb3 100644
--- a/src/views/iot/yiweilian/components/ApiLogAlarmList.vue
+++ b/src/views/iot/yiweilian/components/ApiLogAlarmList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
       <a-tab-pane key="1" tab="抄表">
         <ApiLogList ref="apiLogList"></ApiLogList>