Merge branch 'master' of http://47.107.245.0:3000/xiongxing/kyj-yanglao-web-new

src/main.ts

@@ -51,7 +51,7 @@ import { Flex } from 'ant-design-vue'
 import 'ant-design-vue/dist/reset.css'
 import fetchPlugin from './config/axios/fetch';
 //版本号
-export const MAIN_VERSION = '4.4.3'
+export const MAIN_VERSION = '4.4.4'
 
 // 创建实例
 const setupAll = async () => {

src/views/elderly/elder/wait-elder/ProcessForm.vue

@@ -20,7 +20,7 @@
       </el-form-item>
     </el-col>
     <el-col :span="12" :xs="24">
-      <el-form-item label="近期居住情况（视频）" prop="recentLivingSituation" required>
+      <el-form-item label="近期生活状态（视频）" prop="recentLivingSituation" required>
         <div class="view-files">
           <div v-if="!form.recentLivingSituation.length" class="empty">-</div>
           <ul v-else>
@@ -64,11 +64,11 @@
       </el-form-item>
     </el-col>
     <el-col :span="12" :xs="24">
-      <el-form-item label="近期出院小结（视频）" prop="recentDischargeSummary">
+      <el-form-item label="近半年内病历" prop="medicalRecordsWithinSixMonth" required>
         <div class="view-files">
-          <div v-if="!form.recentDischargeSummary.length" class="empty">-</div>
+          <div v-if="!form.medicalRecordsWithinSixMonth.length" class="empty">-</div>
           <ul v-else>
-            <li v-for="(item, index) in form.recentDischargeSummary" :key="`discharge-${index}`">
+            <li v-for="(item, index) in form.medicalRecordsWithinSixMonth" :key="`medical-${index}`">
               <template v-if="isImageFile(item)">
                 <el-image :src="getFileUrl(item)" :alt="getFileName(item)" :preview-src-list="[getFileUrl(item)]" class="file-preview-image" fit="cover" />
               </template>
@@ -86,7 +86,7 @@
       </el-form-item>
     </el-col>
     <el-col :span="12" :xs="24">
-      <el-form-item label="身份证照片" prop="idCardPhoto">
+      <el-form-item label="身份证正反面照片" prop="idCardPhoto">
         <div class="view-files">
           <div v-if="!form.idCardPhoto.length" class="empty">-</div>
           <ul v-else>
@@ -108,11 +108,11 @@
       </el-form-item>
     </el-col>
     <el-col :span="12" :xs="24">
-      <el-form-item label="近半年内病历" prop="medicalRecordsWithinSixMonth" required>
+      <el-form-item label="常用药资料查看" prop="commonMedicine">
         <div class="view-files">
-          <div v-if="!form.medicalRecordsWithinSixMonth.length" class="empty">-</div>
+          <div v-if="!form.commonMedicine.length" class="empty">-</div>
           <ul v-else>
-            <li v-for="(item, index) in form.medicalRecordsWithinSixMonth" :key="`medical-${index}`">
+            <li v-for="(item, index) in form.commonMedicine" :key="`common-medicine-${index}`">
               <template v-if="isImageFile(item)">
                 <el-image :src="getFileUrl(item)" :alt="getFileName(item)" :preview-src-list="[getFileUrl(item)]" class="file-preview-image" fit="cover" />
               </template>
@@ -130,11 +130,11 @@
       </el-form-item>
     </el-col>
     <el-col :span="12" :xs="24">
-      <el-form-item label="常用药资料查看" prop="commonMedicine">
+      <el-form-item label="近期出院小结（视频）" prop="recentDischargeSummary">
         <div class="view-files">
-          <div v-if="!form.commonMedicine.length" class="empty">-</div>
+          <div v-if="!form.recentDischargeSummary.length" class="empty">-</div>
           <ul v-else>
-            <li v-for="(item, index) in form.commonMedicine" :key="`common-medicine-${index}`">
+            <li v-for="(item, index) in form.recentDischargeSummary" :key="`discharge-${index}`">
               <template v-if="isImageFile(item)">
                 <el-image :src="getFileUrl(item)" :alt="getFileName(item)" :preview-src-list="[getFileUrl(item)]" class="file-preview-image" fit="cover" />
               </template>
@@ -153,6 +153,11 @@
     </el-col>
 
     <el-col :span="12" :xs="24">
+      <el-form-item label="初审资料备注" prop="commitRemark">
+        <div class="view-value">{{ form.commitRemark || '-' }}</div>
+      </el-form-item>
+    </el-col>
+    <el-col :span="12" :xs="24">
       <el-form-item label="是否精防" prop="isPsychosis">
         <div class="view-value">{{ form.isPsychosis || '-' }}</div>
       </el-form-item>
@@ -163,6 +168,11 @@
       </el-form-item>
     </el-col>
     <el-col :span="12" :xs="24">
+      <el-form-item label="第一医护审核备注" prop="medicalCareRemark">
+        <div class="view-value">{{ form.medicalCareRemark || '-' }}</div>
+      </el-form-item>
+    </el-col>
+    <el-col :span="12" :xs="24">
       <el-form-item label="照护等级" prop="nurseLevelName">
         <div class="view-value">{{ form.nurseLevelName || '-' }}</div>
       </el-form-item>
@@ -231,7 +241,9 @@ const form = reactive({
   nurseLevelName: '',
   bedName: '',
   auditName:'',
-  firstAuditName:''
+  firstAuditName:'',
+  commitRemark:'',
+  medicalCareRemark:''
 })
 
 const rules = reactive({})
@@ -266,6 +278,8 @@ const mapSourceToForm = (source: Record<string, any> = {}) => {
   form.bedName = source.bedName || ''
   form.auditName = source.auditName || ''
   form.firstAuditName = source.firstAuditName || ''
+  form.commitRemark = source.commitRemark
+  form.medicalCareRemark = source.medicalCareRemark
 }
 
 const getFileUrl = (file: any) => {
@@ -328,6 +342,8 @@ const resetForm = () => {
   form.auditName = ''
   form.bedName = ''
   form.firstAuditName = ''
+  form.commitRemark = ''
+  form.medicalCareRemark = ''
   formRef.value?.clearValidate?.()
 }