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.3.5'
+export const MAIN_VERSION = '4.3.6'
 
 // 创建实例
 const setupAll = async () => {

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

@@ -134,6 +134,11 @@
         <div class="view-value">{{ form.isPsychosis || '-' }}</div>
       </el-form-item>
     </el-col>
+    <el-col :span="12" :xs="24">
+      <el-form-item label="第一医护审核人" prop="firstAuditName">
+        <div class="view-value">{{ form.firstAuditName || '-' }}</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>
@@ -166,6 +171,11 @@
         </div>
       </el-form-item>
     </el-col>
+    <el-col :span="12" :xs="24">
+      <el-form-item label="第二医护审核人" prop="auditName">
+        <div class="view-value">{{ form.auditName || '-' }}</div>
+      </el-form-item>
+    </el-col>
     <el-col :span="12" :xs="24">
       <el-form-item label="最终床位信息" prop="bedName">
         <div class="view-value">{{ form.bedName || '-' }}</div>
@@ -195,7 +205,9 @@ const form = reactive({
   remark: '',
   isPsychosis: '',
   nurseLevelName: '',
-  bedName: ''
+  bedName: '',
+  auditName:'',
+  firstAuditName:''
 })
 
 const rules = reactive({})
@@ -227,6 +239,8 @@ const mapSourceToForm = (source: Record<string, any> = {}) => {
   form.isPsychosis = source.isPsychosis || ''
   form.nurseLevelName = source.nurseLevelName || ''
   form.bedName = source.bedName || ''
+  form.auditName = source.auditName || ''
+  form.firstAuditName = source.firstAuditName || ''
 }
 
 const getFileUrl = (file: any) => {
@@ -285,6 +299,9 @@ const resetForm = () => {
   form.recentDischargeSummary = []
   form.physicalExaminationReport = []
   form.remark = ''
+  form.auditName = ''
+  form.bedName = ''
+  form.firstAuditName = ''
   formRef.value?.clearValidate?.()
 }