长者管理-长者信息、审核管理长者详情样式调整

src/views/elder/elderinfo/ElderInfoList.vue

@@ -53,12 +53,12 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <ElderInfoModal ref="registerModal" @success="handleSuccess"></ElderInfoModal>
+    <ElderInfoModal ref="registerModal" @success="handleSuccess" :sndjDicts="sndjDicts"></ElderInfoModal>
   </div>
 </template>
 
 <script lang="ts" name="elderinfo-elderInfo" setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, onMounted } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { columns, superQuerySchema } from './ElderInfo.data';
@@ -68,9 +68,11 @@ 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';
+import { getManyDictItems } from '/@/api/common/api'
 
 const formRef = ref();
 const queryParam = reactive<any>({});
+const sndjDicts = ref()
 const toggleSearchStatus = ref<boolean>(false);
 const registerModal = ref();
 const userStore = useUserStore();
@@ -207,7 +209,14 @@ function handleComputedAge(ageText) {
   return age >= 0 ? age : 0; // 防止返回负数
 }
 
-
+onMounted(() => {
+  const dictCodes = ['medical_insurance_type', 'elder_payment_status', 'syb_reimbursement_type', 'zgyb_reimbursement_type', 'jmyb_reimbursement_type'];
+  getManyDictItems({
+    dictCodeList: dictCodes
+  }).then(res => {
+    sndjDicts.value = res
+  })
+})
 </script>
 
 <style lang="less" scoped>

src/views/elder/elderinfo/components/ElderInfoForm.vue

@@ -4,6 +4,23 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="ElderInfoForm">
+          <a-row class="card-class" v-show="!detailSign || detailSign == 'zz'">
+            <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.idCardPositive" id="ElderInfoForm-idCardPositive"
+                name="idCardPositive">
+                <j-image-upload :fileMax="1" :value="opeMediaAddress + formData.idCardPositive"></j-image-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="国徽面" v-bind="validateInfos.idCardNegative" id="ElderInfoForm-idCardNegative"
+                name="idCardNegative">
+                <j-image-upload :fileMax="1" :value="opeMediaAddress + formData.idCardNegative"></j-image-upload>
+              </a-form-item>
+            </a-col>
+          </a-row>
           <a-row class="card-class" v-show="!detailSign || detailSign == 'zz'">
             <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'长者信息'" />
@@ -77,6 +94,27 @@
                 <a-textarea v-model:value="formData.paymentStatus_dictText" :autosize="{ minRows: 1 }" />
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="ElderInfoForm-startTime"
+                name="startTime">
+                <a-date-picker v-model:value="formData.startTime" value-format="YYYY-MM-DD" 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 v-if="formData.endTime == '9999-12-31'" :value="'长期'"></a-input>
+                <a-date-picker v-else v-model:value="formData.endTime" value-format="YYYY-MM-DD" 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"></a-input>
+                <!-- <span>{{ formData.issuingAuthority }}</span> -->
+              </a-form-item>
+            </a-col>
           </a-row>
           <a-row class="card-class" v-if="!detailSign || detailSign == 'jhr'">
             <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
@@ -134,44 +172,6 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <a-row class="card-class" v-show="!detailSign || detailSign == 'zz'">
-            <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.idCardPositive" id="ElderInfoForm-idCardPositive"
-                name="idCardPositive">
-                <j-image-upload :fileMax="1" :value="opeMediaAddress + formData.idCardPositive"></j-image-upload>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="国徽面" v-bind="validateInfos.idCardNegative" id="ElderInfoForm-idCardNegative"
-                name="idCardNegative">
-                <j-image-upload :fileMax="1" :value="opeMediaAddress + formData.idCardNegative"></j-image-upload>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="ElderInfoForm-startTime"
-                name="startTime">
-                <a-date-picker v-model:value="formData.startTime" value-format="YYYY-MM-DD" 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 v-if="formData.endTime == '9999-12-31'" :value="'长期'"></a-input>
-                <a-date-picker v-else v-model:value="formData.endTime" value-format="YYYY-MM-DD" 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"></a-input>
-                <!-- <span>{{ formData.issuingAuthority }}</span> -->
-              </a-form-item>
-            </a-col>
-          </a-row>
         </a-form>
       </template>
     </JFormContainer>
@@ -267,6 +267,7 @@ function add() {
  * 编辑
  */
 function edit(record) {
+  console.log("🌊 ~ edit ~ record:", record)
   nextTick(() => {
     resetFields();
     const tmpData = {};
@@ -277,6 +278,7 @@ function edit(record) {
     })
     //赋值
     Object.assign(formData, tmpData);
+    console.log("🌊 ~ edit ~ formData:", formData)
     formData.sndjName = '无'
     if (!!record.disabilityReimbursementType) {
       if (record.medicalType == 'syb') {