添加长者监护人头像功能

src/views/elder/elderinfo/ElderInfo.data.ts

@@ -290,4 +290,6 @@ export const applyObj = {
   guardianIdCardPositive: '监护人身份证人像面',
   sndjName: '失能等级',
   jfztName: '缴费状态',
+  headPath: '长者头像',
+  guardianHeadPath: '监护人头像',
 };

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

@@ -86,7 +86,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     beforeFetch: async (params) => {
       queryParam.modifyType = props.querySign
       queryParam.guardianOpenId = props.guardianOpenId
-      queryParam.modifyStatus = '2,3'
+      queryParam.modifyStatus = '1,2,3'
       return Object.assign(params, queryParam);
     },
   },

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

@@ -115,19 +115,30 @@
                 <!-- <span>{{ formData.issuingAuthority }}</span> -->
               </a-form-item>
             </a-col>
+            
+            <a-col :span="12">
+              <a-form-item label="长者头像" v-bind="validateInfos.headPath" id="ElderInfoForm-headPath"
+                name="headPath">
+                <j-image-upload :fileMax="1" :value="opeMediaAddress + (formData.headPath?formData.headPath:mrtxPic)"></j-image-upload>
+              </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;">
               <SectionDivider :title="'监护人信息'" />
             </a-col>
-            <a-col :span="24">
-              <a-col :span="12">
-                <a-form-item label="人像面" v-bind="validateInfos.guardianIdCardPositive"
-                  id="ElderInfoForm-guardianIdCardPositive" name="guardianIdCardPositive">
-                  <j-image-upload :fileMax="1"
-                    :value="opeMediaAddress + formData.guardianIdCardPositive"></j-image-upload>
-                </a-form-item>
-              </a-col>
+            <a-col :span="12">
+              <a-form-item label="人像面" v-bind="validateInfos.guardianIdCardPositive"
+                id="ElderInfoForm-guardianIdCardPositive" name="guardianIdCardPositive">
+                <j-image-upload :fileMax="1"
+                  :value="opeMediaAddress + formData.guardianIdCardPositive"></j-image-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="监护人头像" v-bind="validateInfos.guardianHeadPath" id="ElderInfoForm-guardianHeadPath"
+                name="guardianHeadPath">
+                <j-image-upload :fileMax="1" :value="opeMediaAddress + (formData.guardianHeadPath?formData.guardianHeadPath:mrtxPic)"></j-image-upload>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="姓名" v-bind="validateInfos.guardianName" id="ElderInfoForm-guardianName"
@@ -190,6 +201,7 @@ import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 import { string } from 'vue-types';
 
+const mrtxPic = import.meta.env.VITE_DEFAULT_MORENTOUXIANG_PIC//默认头像
 const props = defineProps({
   formDisabled: { type: Boolean, default: false },
   formData: { type: Object, default: () => ({}) },
@@ -233,6 +245,8 @@ const formData = reactive<Record<string, any>>({
   disabilityReimbursementType: '',
   sndjName: '',
   paymentStatus_dictText: '',
+  headPath: '',
+  guardianHeadPath: '',
 });
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });

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

@@ -9,10 +9,10 @@
               <span>{{ applyObj[record.d1] }}</span>
             </template>
             <template v-if="column.dataIndex === 'd2' && isImg(record.d1)">
-              <JImageUpload :fileMax="1" :value="opeMediaAddress + record.d2" disabled></JImageUpload>
+              <JImageUpload :fileMax="1" :value="opeMediaAddress + (record.d2?record.d2:mrtxPic)" disabled></JImageUpload>
             </template>
             <template v-if="column.dataIndex === 'd3' && isImg(record.d1)">
-              <JImageUpload :fileMax="1" :value="opeMediaAddress + record.d3" disabled></JImageUpload>
+              <JImageUpload :fileMax="1" :value="opeMediaAddress + (record.d3?record.d3:mrtxPic)" disabled></JImageUpload>
             </template>
             <template
               v-if="column.dataIndex === 'd2' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
@@ -65,6 +65,7 @@
             <a-col :span="12">
               <a-form-item label="审核状态" name="status" v-bind="validateInfos.status">
                 <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态">
+                  <a-select-option value="1">待审核</a-select-option>
                   <a-select-option value="2">审核通过</a-select-option>
                   <a-select-option value="3">审核驳回</a-select-option>
                 </a-select>
@@ -92,6 +93,7 @@ import { getModifyInfo, getHisModifyInfo, elderAudit } from '../ElderInfo.api'
 import { useMessage } from '/@/hooks/web/useMessage';
 import { initDictOptions } from '/@/utils/dict';
 import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+const mrtxPic = import.meta.env.VITE_DEFAULT_MORENTOUXIANG_PIC//默认头像
 
 const props = defineProps({
   sndjDicts: null
@@ -106,7 +108,7 @@ const { createMessage } = useMessage();
 const labelCol = { span: 4 };  // 标签宽度
 const wrapperCol = { span: 18 }; // 控件宽度
 const isImg = (v_) => {
-  return v_ == 'idCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate'
+  return v_ == 'idCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate' || v_ == 'headPath'
 }
 const provinceOptions = ref({})
 const formData = reactive<Record<string, any>>({
@@ -152,6 +154,7 @@ const filteredTableData = computed(() => {
     || item.d1 == 'elderModifyId'
     || item.d1 == 'yblxName'
     || item.d1 == 'sndjName'
+    || item.d1 == 'headPath'
     // || item.d1 == 'jfztName'
   );
 });

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" :value="opeMediaAddress + record.d2" disabled></JImageUpload>
+              <JImageUpload :fileMax="1" :value="opeMediaAddress + (record.d2?record.d2:mrtxPic)" disabled></JImageUpload>
             </template>
             <template v-if="column.dataIndex === 'd3' && isImg(record.d1)">
-              <JImageUpload :fileMax="1" :value="opeMediaAddress + record.d3" disabled></JImageUpload>
+              <JImageUpload :fileMax="1" :value="opeMediaAddress + (record.d3?record.d3:mrtxPic)" disabled></JImageUpload>
             </template>
             <template
               v-if="column.dataIndex === 'd2' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
@@ -66,6 +66,7 @@
             <a-col :span="12">
               <a-form-item label="审核状态" name="status" v-bind="validateInfos.status">
                 <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态">
+                  <a-select-option value="1">待审核</a-select-option>
                   <a-select-option value="2">审核通过</a-select-option>
                   <a-select-option value="3">审核驳回</a-select-option>
                 </a-select>
@@ -94,6 +95,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
 import { initDictOptions } from '/@/utils/dict';
 import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
 
+const mrtxPic = import.meta.env.VITE_DEFAULT_MORENTOUXIANG_PIC//默认头像
 const props = defineProps({
   sndjDicts: null
 });
@@ -107,7 +109,7 @@ const { createMessage } = useMessage();
 const labelCol = { span: 4 };  // 标签宽度
 const wrapperCol = { span: 18 }; // 控件宽度
 const isImg = (v_) => {
-  return v_ == 'guardianIdCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate'
+  return v_ == 'guardianIdCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate' || v_ == 'guardianHeadPath'
 }
 const provinceOptions = ref({})
 const formData = reactive<Record<string, any>>({
@@ -199,6 +201,7 @@ const filteredTableData = computed(() => {
     && item.d1 !== 'auditContent'
     && item.d1 !== 'selfCareType'
     && item.d1 !== 'pkId'
+    && item.d1 !== 'headPath'
   );
 });