Merge branch 'master' into test-ca

src/components/operate-monitoring/ReportFirstPage.vue

@@ -32,15 +32,15 @@
         destroy-on-close>
         <ReportSecondPage :reportSecond="reportSecond" />
     </el-dialog>
-    <el-dialog v-else :title="titleChart" v-model="patientDrawer" width="80%" height="80%" top="40px" destroy-on-close>
+    <el-dialog v-else :title="titleChart" v-model="patientDrawer" width="80%" style="height: 800px" top="40px" destroy-on-close>
         <ReportPatientPage :reportPatient="reportPatient" />
     </el-dialog>
-    <el-dialog :title="titleChart" v-model="patientMxDrawer" width="80%" height="80%" top="40px" destroy-on-close>
+    <el-dialog :title="titleChart" v-model="patientMxDrawer" style="height: 800px" width="80%" top="40px" destroy-on-close>
         <ReportPatientPage :reportPatient="reportPatient" />
     </el-dialog>
 </template>
 <script setup name="ReportFirst">
-import { ref } from "vue"
+import { ref, nextTick } from "vue"
 import { clone } from '@/utils/clone'
 import PageLayer from '@/layout/PageLayer.vue'
 import { highBarUtils, highPieUtils } from '@/utils/high-charts'

src/components/operate-monitoring/ReportPatientPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="layout_container">
+  <div class="layout_container" style="height: 720px">
     <header>
       <el-input v-model="zyh" style="width: 200px;" placeholder="请输入住院号"></el-input>
       <el-input v-model="xm" style="width: 200px;margin-left: 5px" placeholder="请输入姓名"></el-input>
@@ -7,26 +7,22 @@
       <el-button type="primary" icon="Download" @click="exportData" style="margin-left: 5px">导出全部数据</el-button>
     </header>
     <div class="layout_main">
-      <div class="layout_display_flex_y">
-        <div class="layout_flex_1-y">
-          <xc-table :data="returnData" localPaging :height="600">
-            <el-table-column type="index" label="序号" align="center"></el-table-column>
-            <template v-for="col in returnData.tableDisplays">
-              <el-table-column v-if="col.sortable" :prop="col.prop" :label="col.label" :width="col.width"
-                               :align="col.align" sortable show-overflow-tooltip>
-              </el-table-column>
-              <el-table-column v-else :prop="col.prop" :label="col.label" :width="col.width" :align="col.align"
-                               show-overflow-tooltip>
-              </el-table-column>
-            </template>
-          </xc-table>
-        </div>
-      </div>
+      <xc-table :data="returnData" localPaging>
+        <el-table-column type="index" label="序号" align="center"></el-table-column>
+        <template v-for="col in returnData.tableDisplays">
+          <el-table-column v-if="col.sortable" :prop="col.prop" :label="col.label" :width="col.width"
+                           :align="col.align" sortable show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column v-else :prop="col.prop" :label="col.label" :width="col.width" :align="col.align"
+                           show-overflow-tooltip>
+          </el-table-column>
+        </template>
+      </xc-table>
     </div>
   </div>
 </template>
 <script setup name="ReportPatientPage">
-import { ref } from 'vue'
+import { ref, nextTick } from 'vue'
 import { clone } from '@/utils/clone'
 import { selectReportPortalMenu, exportReportPortalData } from '@/api/reports/high-report'
 import XcTable from "@/components/xiao-chan/xc-table/XcTable"
@@ -49,8 +45,8 @@ const xm = ref('')
 reportPatient.value = props.reportPatient.row
 paramPatient.value = props.reportPatient.params
 
-nextTick(() => {
-    query()
+nextTick(async () => {
+    await query()
 })
 const returnData = ref({
     currentPage: 1,

src/components/operate-monitoring/ReportSecondPage.vue

@@ -30,12 +30,12 @@
         fullscreen destroy-on-close>
         <ReportThirdPage :reportThird="reportThird" />
     </el-dialog>
-    <el-dialog v-else :title="titleChart" v-model="patientDrawer" width="80%" height="80%" top="40px" destroy-on-close>
+    <el-dialog v-else :title="titleChart" v-model="patientDrawer" width="80%" style="height: 800px" top="40px" destroy-on-close>
         <ReportPatientPage :reportPatient="reportPatient" />
     </el-dialog>
 </template>
 <script setup name="ReportFirst">
-import { ref } from "vue"
+import { ref, nextTick } from "vue"
 import { clone } from '@/utils/clone'
 import PageLayer from '@/layout/PageLayer.vue'
 import { highBarUtils, highPieUtils } from '@/utils/high-charts'

src/components/operate-monitoring/ReportThirdPage.vue

@@ -28,12 +28,12 @@
             <div style="width: 80%; height: 400px" id="thirdDst"></div>
         </template>
     </page-layer>
-    <el-dialog :title="titleChart" v-model="patientDrawer" width="80%" height="80%" top="40px" destroy-on-close>
+    <el-dialog :title="titleChart" v-model="patientDrawer" width="80%" style="height: 800px" top="40px" destroy-on-close>
         <ReportPatientPage :reportPatient="reportPatient" />
     </el-dialog>
 </template>
 <script setup name="ReportFirst">
-import { ref } from "vue"
+import { ref, nextTick } from "vue"
 import PageLayer from '@/layout/PageLayer.vue'
 import { highBarUtils, highPieUtils } from '@/utils/high-charts'
 import ReportPatientPage from '@/components/operate-monitoring/ReportPatientPage.vue'

src/views/clinic/chronicDisease/ChronicDiseaseRegister.vue

@@ -538,7 +538,7 @@
                 <el-col :span="6">
                   <el-form-item label="建档科室" prop="creatDept">
                     <el-select-v2 v-model="ruleForm.creatDept" clearable remote style="width: 100%"
-                                  filterable :options="deptWardList" :remote-method="queryDept" placeholder="请选择建档科室">
+                                  filterable :options="deptWardList" :remote-method="deptMethod" placeholder="请选择建档科室">
                       <template #default="{ item }">
                         <span style="margin-right: 8px">{{ item.name }}</span>
                         <span style="color: var(--el-text-color-secondary); font-size: 13px">{{ item.code }}</span>
@@ -932,6 +932,7 @@ const addForm = (formEl: FormInstance | undefined) => {
   keyCode.value = ''
   empMethod('')
   creatMethod('')
+  deptMethod('')
   ruleForm.value.creatId = userCode
 }
 
@@ -993,6 +994,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
   keyCode.value = ''
   empMethod('')
   creatMethod('')
+  deptMethod('')
   ruleForm.value.creatId = userCode
 }
 

src/views/hospitalization/case-front-sheet/FillCaseFrontSheet.vue

@@ -558,19 +558,27 @@
               <th>I助</th>
               <th>II助</th>
             </tr>
-            <tr v-for="n in 5" :key="n">
+            <tr v-for="n in defaultSurgerySize" :key="n">
               <td style="border: none; width: 25px">
                 <div v-if="patient.surgeryList[n - 1].name">
                   <div
                       v-if="n > 1"
-                      class="sxjt"
+                      class="order-arrow"
                       @click="changeSurgeryOrder(n - 1, n - 2)">↑</div>
                   <div
-                      v-if="n < 5 && patient.surgeryList[n].name"
-                      class="sxjt"
+                      v-if="n < defaultSurgerySize && patient.surgeryList[n].name"
+                      class="order-arrow"
                       style="margin-top: 5px"
                       @click="changeSurgeryOrder(n - 1, n)"
                   >↓</div>
+                  <div
+                      v-if="n === defaultSurgerySize"
+                      class="order-arrow"
+                      style="margin-top: 4px"
+                      @click="addSurgeSize"
+                  >
+                    +
+                  </div>
                 </div>
               </td>
               <td style="padding: 3px">
@@ -1154,12 +1162,18 @@ const patient = ref({
   disdiagList: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
   surgeryList: [{}, {}, {}, {}, {}],
 })
+const defaultSurgerySize = ref(5)
 const dics = ref({})
 const showGoSearchBtn1 = ref(false)
 const showGoSearchBtn2 = ref(false)
 const showDel = initShowDel()
 const asideTable = ref(null)
 
+function addSurgeSize() {
+  patient.value.surgeryList.push({})
+  defaultSurgerySize.value += 1
+}
+
 const cptOverviews = computed(() => {
   return overview.value.filter(item => {
     if (onlyShowMyPatients.value) {
@@ -2213,11 +2227,11 @@ table td {
   color: #e8b600;
 }
 
-.sxjt {
+.order-arrow {
   font-size: 16px;
   cursor: pointer;
 }
-.sxjt:hover {
+.order-arrow:hover {
   color: #0a84fd;
 }
 </style>