完成部分也买你

src/components/cy/tabs/src/CyTabs.tsx

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import {useCyNamespace} from "@/utils/xiaochan-element-plus";
 import {
     renderSlot,

src/components/menu-item/RightClickMenu.vue

@@ -201,7 +201,7 @@ onMounted(() => {
     }
 
     &:hover {
-      background-color: var(--el-button-bg-color);
+      background-color: var(--el-color-primary-light-9);
       color: var(--el-color-primary);
     }
   }

src/components/system/dept-select/SystemDeptSelect.vue

@@ -26,8 +26,6 @@ export default defineComponent({
     }
   },
 })
-
-
 </script>
 <template>
   <CyComboGrid

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrAuxiliaryTools.vue

@@ -189,7 +189,7 @@ const drawerRange: {
       name: '手麻',
       comp: () => {
         return h('iframe', {
-          class: 'layout_full_size',
+          class: 'layout_full_size-no-border',
           src: `http://172.16.32.181/interface/patient/doc.html?admissionNum=${propsPatientInfo.value.patNo}&admissionTimes=${propsPatientInfo.value.times}`
         })
       }

src/css/element-plus-modify.scss

@@ -129,8 +129,8 @@
   height: 0;
 }
 
-.shorter-el_divider {
+.el-divider_shorter {
   &.el-divider--horizontal {
     margin: 16px 0;
   }
-}
+}

src/layout/HeaderV2/RouteNavigation.vue

@@ -18,13 +18,13 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import {ref} from "vue";
 import tabsHook from "@/layout/HeaderV2/tabs-hook";
 import RightClickMenu from "@/components/menu-item/RightClickMenu";
 import router from '@/router'
 
-const tagRef = ref(null)
+const tagRef = ref<HTMLElement | null>(null)
 
 const opt = [
   {
@@ -127,7 +127,7 @@ const handleScrolling = async (str) => {
     return item.name === str.name
   })
   if (currentIndex.value === -1) return
-  let itemData = tagRef.value.querySelectorAll('.item')
+  let itemData = tagRef.value!.querySelectorAll('.item')
   let scroll = 0;
   for (let i = 0; i < currentIndex.value; i++) {
     let item = itemData[i]
@@ -137,7 +137,7 @@ const handleScrolling = async (str) => {
     width: itemData[currentIndex.value].clientWidth + 'px',
     transform: `translateX(${scroll}px)`
   }
-  tagRef.value.scrollTo({top: 0, left: scroll, behavior: 'smooth'})
+  tagRef.value!.scrollTo({top: 0, left: scroll, behavior: 'smooth'})
 }
 
 const selectedStyle = ref({})
@@ -177,7 +177,6 @@ const routingChanges = (createTabs = true) => {
   nextTick(() => {
     handleScrolling(data)
   })
-  // 不需要创建
   if (currentRoute.meta.hideTabs) return;
   if (createTabs) {
     createLabels(routerInfoToStr, data)

src/views/clinic/TransferInOfExpenses.vue

@@ -1,6 +1,6 @@
 <template>
-  <page-layer>
-    <template #header>
+  <div class="layout_display_flex_y">
+    <div>
       住院号：
       <el-input
           v-model="inpatientNo"
@@ -34,8 +34,8 @@
       <el-button style="margin-left: 10px" type="primary" @click="querySerialNo">查询机制号信息</el-button>
       <el-button style="margin-left: 10px" type="warning" @click="huanZheFeiYongDrawer = true">查看患者费用</el-button>
       <el-button style="margin-left: 10px" type="success" @click="baoCunClick">保存</el-button>
-    </template>
-    <template #main>
+    </div>
+    <div class="layout_flex_1-y layout_display_flex_y">
       <div>
         <el-descriptions border title="基本信息">
           <el-descriptions-item>
@@ -103,32 +103,24 @@
           </el-descriptions-item>
         </el-descriptions>
       </div>
-      收费日期：
-      <el-date-picker v-model="chargeDate" type="datetime" style="width: 165px"/>
-      执行科室：
-      <el-select
-          style="width: 120px"
-          v-model="huanZheXinXi.execUnit"
-          :remote-method="remoteMethodHuiZhenKeShi"
-          clearable
-          filterable
-          placeholder="根据拼音首字母查找"
-          remote
-          value-key="code">
-        <el-option v-for="item in deptList"
-                   :key="item.code"
-                   :value="item.code"
-                   :label="item.name">
-          <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-          <el-divider direction="vertical"></el-divider>
-          <span>{{ item.name }}</span>
-        </el-option>
-      </el-select>
-      <div style="width: 100%">
-        <div style="float: left; width: 45%">
-          <el-table ref="multipleTable" :data="mzXinXiList" :height="windowHeight / 1.4" highlight-current-row
+      <div>
+        收费日期：
+        <el-date-picker v-model="chargeDate" type="datetime" style="width: 165px"/>
+        执行科室：
+        <SystemDeptSelect
+            clearable
+            style="width: 120px"
+            v-model="huanZheXinXi.execUnit"
+        />
+      </div>
+      <div class="layout_flex_1-y layout_display_flex">
+        <div class="layout_flex_1-x">
+          <el-table ref="multipleTable"
+                    :data="mzXinXiList"
+                    height="100%"
+                    highlight-current-row
                     @selection-change="mzSelectChecked">
-            <el-table-column label="门诊发票信息">
+            <el-table-column :label="`门诊发票信息: 合计 【${mzSum}】`">
               <el-table-column label="项目名称" prop="itemName"></el-table-column>
               <el-table-column label="收费编码" prop="chargeCodeMx"></el-table-column>
               <el-table-column label="数量" prop="chargeQuantity"></el-table-column>
@@ -137,15 +129,15 @@
               <el-table-column label="选择" type="selection" width="60"></el-table-column>
             </el-table-column>
           </el-table>
-          <el-tag>合计:{{ mzSum }}</el-tag>
         </div>
-        <div :style="{ lineHeight: windowHeight / 1.4 + 'px' }"
-             style="width: 9%; float: left; margin-left: 4px; text-align: center">
+        <div style="display: flex;align-items: center; margin: 0 20px">
           <el-button icon="Right" type="primary"></el-button>
         </div>
-        <div style="float: right; width: 45%">
-          <el-table :data="zyXinXiList" :height="windowHeight / 1.4" stripe>
-            <el-table-column label="住院收费项目">
+        <div class="layout_flex_1-x">
+          <el-table :data="zyXinXiList"
+                    height="100%"
+                    stripe>
+            <el-table-column :label="`住院收费项目:合计【${zySum}】`">
               <el-table-column label="项目名称" prop="itemName"></el-table-column>
               <el-table-column label="收费编码" prop="chargeCodeMx"></el-table-column>
               <el-table-column label="数量" prop="chargeQuantity"></el-table-column>
@@ -153,34 +145,50 @@
               <el-table-column label="金额" prop="chargeFee"></el-table-column>
             </el-table-column>
           </el-table>
-          <el-tag>合计:{{ zySum }}</el-tag>
         </div>
       </div>
-      <el-drawer v-model="huanZheFeiYongDrawer" size="50%" title="查看患者通过急门诊转入的费用">
-        <div style="margin-left: 20px">
-          <el-input
-              v-model="inpatientNo"
-              clearable
-              placeholder="住院号"
-              style="width: 200px"
-              @blur="inpatientNo = $event.target.value.trim()"
-              @keyup.enter="getZyJiMenZhenZhuangRuFeiYongClick"
-          >
-            <template #prepend>住院号</template>
-          </el-input>
-          <el-divider direction="vertical"></el-divider>
-          项目名称：
-          <el-select v-model="chargeCodeMX" :remote-method="remoteMethodEntryName" clearable filterable
-                     placeholder="根据拼音首字母查找" remote>
-            <el-option v-for="item in entryNameList" :key="item.code" :label="item.name" :value="item.code">
-              <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-              <el-divider direction="vertical"></el-divider>
-              <span>{{ item.name }}</span>
-            </el-option>
-          </el-select>
-          <el-divider direction="vertical"></el-divider>
-          <el-button type="primary" @click="getZyJiMenZhenZhuangRuFeiYongClick">查询</el-button>
-          <el-table :data="zyDetailChargeList" :height="windowHeight / 1.1">
+    </div>
+  </div>
+
+  <el-drawer v-model="huanZheFeiYongDrawer"
+             size="50%"
+             title="查看患者通过急门诊转入的费用">
+    <div class="layout_display_flex_y">
+      <div>
+        <el-input
+            v-model="inpatientNo"
+            clearable
+            placeholder="住院号"
+            style="width: 200px"
+            @blur="inpatientNo = $event.target.value.trim()"
+            @keyup.enter="getZyJiMenZhenZhuangRuFeiYongClick"
+        >
+          <template #prepend>住院号</template>
+        </el-input>
+        <el-divider direction="vertical"></el-divider>
+        项目名称：
+        <el-select
+            style="width: 120px"
+            v-model="chargeCodeMX"
+            :remote-method="remoteMethodEntryName"
+            clearable filterable
+            placeholder="根据拼音首字母查找"
+            remote>
+          <el-option v-for="item in entryNameList" :key="item.code" :label="item.name" :value="item.code">
+            <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+            <el-divider direction="vertical"></el-divider>
+            <span>{{ item.name }}</span>
+          </el-option>
+        </el-select>
+        <el-divider direction="vertical"></el-divider>
+        <el-button type="primary" @click="getZyJiMenZhenZhuangRuFeiYongClick">查询</el-button>
+        <el-tag style="margin-left: 7px">合计：{{ huanZheFeiYongZongHe }}</el-tag>
+      </div>
+      <div class="layout_flex_1-y layout_display_flex_y">
+        <div class="layout_flex_1-y">
+          <el-table
+              :data="zyDetailChargeList"
+              height="100%">
             <el-table-column label="住院号" prop="inpatientNo"></el-table-column>
             <el-table-column label="流水号" prop="detailSn"></el-table-column>
             <el-table-column label="收费日期" prop="chargeDate" width="80"></el-table-column>
@@ -206,6 +214,8 @@
               </template>
             </el-table-column>
           </el-table>
+        </div>
+        <div>
           <el-pagination
               :page-size="huanZheFeiYongPageSize"
               :total="huanZheFeiYongTotal"
@@ -213,15 +223,15 @@
               layout="prev, pager, next, total"
               @current-change="huanZheFeiYongCurrentChange"
           ></el-pagination>
-          <el-tag style="margin-left: 7px">合计：{{ huanZheFeiYongZongHe }}</el-tag>
         </div>
-      </el-drawer>
-    </template>
-  </page-layer>
+      </div>
+    </div>
+  </el-drawer>
+
 </template>
 
 <script setup name="TransferInOfExpenses">
-import {ref} from '@vue/reactivity'
+import {ref} from 'vue'
 import {
   baoCunHuanZheZhuYuanFeiYong,
   getSerialNo,
@@ -236,10 +246,8 @@ import {ElMessage, ElMessageBox} from 'element-plus'
 import {compareDate, formatDatetime} from '@/utils/date'
 import {getServerDateApi, queryDept} from '@/api/public-api'
 import {stringNotBlank} from '@/utils/blank-utils'
-import PageLayer from "@/layout/PageLayer";
 import Dig from "@/utils/math";
-
-const windowHeight = window.innerHeight
+import SystemDeptSelect from "@/components/system/dept-select/SystemDeptSelect.vue";
 
 //查询条件
 //住院号
@@ -253,7 +261,9 @@ const chargeCodeMX = ref('')
 // 住院次数
 const admissTimes = ref('')
 
-const huanZheXinXi = ref({})
+const huanZheXinXi = ref({
+  execUnit: ''
+})
 
 const mzXinXiList = ref([])
 const zyXinXiList = ref([])
@@ -470,8 +480,7 @@ const remoteMethodHuiZhenKeShi = (val) => {
   }
 }
 
-
-let chaKanLiShi = [
+const chaKanLiShi = [
   {code: 0, name: '当前'},
   {code: 1, name: '历史'},
 ]

src/views/data-modify/DeliveryDetailsQuery.vue

@@ -1,6 +1,6 @@
 <template>
-  <page-layer>
-    <template #header>
+  <div class="layout_display_flex_y">
+    <div class="m-b_8px">
       <span style="margin-left: 0">出库日期：</span>
       <el-date-picker
           v-model="DateRange"
@@ -12,15 +12,22 @@
           style="width: 240px"
       ></el-date-picker>
       <span>出库单号：</span>
-      <el-input style="width: 150px" clearable v-model="queryTerm.drawNo" @blur="queryTerm.drawNo = $event.target.value.trim()"></el-input>
+      <el-input style="width: 150px" clearable v-model="queryTerm.drawNo"
+                @blur="queryTerm.drawNo = $event.target.value.trim()"></el-input>
       <span>药品编码：</span>
-      <el-input style="width: 150px" clearable v-model="queryTerm.chargeCode" @blur="queryTerm.chargeCode = $event.target.value.trim()"></el-input>
+      <el-input style="width: 150px" clearable v-model="queryTerm.chargeCode"
+                @blur="queryTerm.chargeCode = $event.target.value.trim()"></el-input>
       <span>入库单号：</span>
-      <el-input style="width: 150px" clearable v-model="queryTerm.inDrawNo" @blur="queryTerm.inDrawNo = $event.target.value.trim()"></el-input>
+      <el-input style="width: 150px" clearable v-model="queryTerm.inDrawNo"
+                @blur="queryTerm.inDrawNo = $event.target.value.trim()"></el-input>
       <el-button style="margin-left: 10px" type="primary" @click="queryChuKuXinXiClick">查询</el-button>
-    </template>
-    <template #main>
-      <el-table :height="tableHeight" :data="chuKuXinXiList" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
+    </div>
+
+    <div class="layout_flex_1-y layout_display_flex_y">
+      <el-table height="100%"
+                :data="chuKuXinXiList"
+                :header-cell-style="{ 'text-align': 'center' }"
+                :cell-style="{ 'text-align': 'center' }">
         <el-table-column label="序号" prop="outSeri" width="40px"></el-table-column>
         <el-table-column label="药品编码" prop="chargeCode" width="80px"></el-table-column>
         <el-table-column label="药品名称" width="120px" prop="chargeCodeName"></el-table-column>
@@ -68,228 +75,208 @@
           :total="queryTerm.total"
       >
       </el-pagination>
-      <el-drawer title="修改出库信息" v-model="chuKuDrawer" size="60%">
-        <div>
-          <el-form label-width="100px">
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="药品编码:">
-                  <el-input v-model="chuKuXiangXiXinXi.chargeCode" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="药品名称:">
-                  <el-input v-model="chuKuXiangXiXinXi.chargeCodeName" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="出库序号:">
-                  <el-input v-model="chuKuXiangXiXinXi.outSeri"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="出库量:">
-                  <el-input v-model="chuKuXiangXiXinXi.outAmt"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="生产批号:">
-                  <el-input v-model="chuKuXiangXiXinXi.manuNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="出库单号:">
-                  <el-input v-model="chuKuXiangXiXinXi.drawNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="入库单号:">
-                  <el-input v-model="chuKuXiangXiXinXi.inDrawNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="药库编码:">
-                  <el-select v-model="chuKuXiangXiXinXi.groupNo" allow-create filterable>
-                    <el-option v-for="item in groupNoList" :key="item.code" :label="item.name" :value="item.code">
-                      <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-                      <el-divider direction="vertical"></el-divider>
-                      <span>{{ item.name }}</span>
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="接受药房:">
-                  <el-select v-model="chuKuXiangXiXinXi.groupNoOut" allow-create filterable>
-                    <el-option v-for="item in groupNoOutList" :key="item.code" :label="item.name" :value="item.code">
-                      <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-                      <el-divider direction="vertical"></el-divider>
-                      <span>{{ item.name }}</span>
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="科室:">
-                  <el-select v-model="chuKuXiangXiXinXi.deptCode" allow-create filterable>
-                    <el-option v-for="item in deptCodeList" :key="item.code" :label="item.name" :value="item.code">
-                      <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-                      <el-divider direction="vertical"></el-divider>
-                      <span>{{ item.name }}</span>
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="入库日期:">
-                  <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.inDate"></el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="出库日期:">
-                  <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.outDate"></el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="确认日期:">
-                  <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.confirmDate"></el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :offset="1" :span="3">
-                <el-button @click="xiuGaiClick" type="success">保存</el-button>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </el-drawer>
-    </template>
-  </page-layer>
+    </div>
+  </div>
+  <el-drawer title="修改出库信息" v-model="chuKuDrawer" size="60%">
+    <div>
+      <el-form label-width="100px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="药品编码:">
+              <el-input v-model="chuKuXiangXiXinXi.chargeCode" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="药品名称:">
+              <el-input v-model="chuKuXiangXiXinXi.chargeCodeName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出库序号:">
+              <el-input v-model="chuKuXiangXiXinXi.outSeri"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出库量:">
+              <el-input v-model="chuKuXiangXiXinXi.outAmt"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产批号:">
+              <el-input v-model="chuKuXiangXiXinXi.manuNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出库单号:">
+              <el-input v-model="chuKuXiangXiXinXi.drawNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="入库单号:">
+              <el-input v-model="chuKuXiangXiXinXi.inDrawNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="药库编码:">
+              <el-select v-model="chuKuXiangXiXinXi.groupNo" allow-create filterable>
+                <el-option v-for="item in groupNoList" :key="item.code" :label="item.name" :value="item.code">
+                  <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                  <el-divider direction="vertical"></el-divider>
+                  <span>{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="接受药房:">
+              <el-select v-model="chuKuXiangXiXinXi.groupNoOut" allow-create filterable>
+                <el-option v-for="item in groupNoOutList" :key="item.code" :label="item.name" :value="item.code">
+                  <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                  <el-divider direction="vertical"></el-divider>
+                  <span>{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室:">
+              <el-select v-model="chuKuXiangXiXinXi.deptCode" allow-create filterable>
+                <el-option v-for="item in deptCodeList" :key="item.code" :label="item.name" :value="item.code">
+                  <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                  <el-divider direction="vertical"></el-divider>
+                  <span>{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入库日期:">
+              <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.inDate"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="出库日期:">
+              <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.outDate"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="确认日期:">
+              <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.confirmDate"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="1" :span="3">
+            <el-button @click="xiuGaiClick" type="success">保存</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </el-drawer>
 </template>
 
-<script>
-import { shortcuts } from '@/data/shortcuts'
-import { formatDatetime, getDateRangeFormatDate } from '@/utils/date'
-import { ElMessage } from 'element-plus'
-import { queryChuKuXinXi, queryDeptCode, shanChuChuKuXinXi, xiuGaiChuKuXinXi } from '@/api/yz-data-mod/in-or-out-of-warehouse'
-import { clone } from '@/utils/clone'
-import { reactive, ref } from '@vue/reactivity'
-import { onMounted } from 'vue'
+<script setup>
+import {shortcuts} from '@/data/shortcuts'
+import {formatDatetime, getDateRangeFormatDate} from '@/utils/date'
+import {ElMessage} from 'element-plus'
+import {
+  queryChuKuXinXi,
+  queryDeptCode,
+  shanChuChuKuXinXi,
+  xiuGaiChuKuXinXi
+} from '@/api/yz-data-mod/in-or-out-of-warehouse'
+import {clone} from '@/utils/clone'
+import {reactive, ref} from '@vue/reactivity'
+import {onMounted} from 'vue'
 import PageLayer from "@/layout/PageLayer";
-export default {
-  name: 'DeliveryDetailsQuery',
-  components: {PageLayer},
-  setup() {
-    const tableHeight = window.innerHeight - 70
-
-    const queryTerm = reactive({
-      startTime: '',
-      endTime: '',
-      drawNo: '',
-      chargeCode: '',
-      inDrawNo: '',
-      currentPage: 1,
-      pageSize: 100,
-      total: 0,
-    })
 
-    const DateRange = ref(null)
+const queryTerm = reactive({
+  startTime: '',
+  endTime: '',
+  drawNo: '',
+  chargeCode: '',
+  inDrawNo: '',
+  currentPage: 1,
+  pageSize: 100,
+  total: 0,
+})
 
-    const chuKuXinXiList = ref([])
+const DateRange = ref(null)
 
-    const queryChuKuXinXiClick = () => {
-      if (!DateRange.value && queryTerm.drawNo === '' && queryTerm.chargeCode === '' && queryTerm.inDrawNo === '') {
-        ElMessage.warning({
-          message: '至少选择一项',
-          showClose: true,
-          duration: 2500,
-        })
-        return
-      }
-      let getDateRange = getDateRangeFormatDate(DateRange.value)
-      queryTerm.startTime = getDateRange.startTime
-      queryTerm.endTime = getDateRange.endTime
+const chuKuXinXiList = ref([])
 
-      queryChuKuXinXi(queryTerm).then((res) => {
-        chuKuXinXiList.value = res.data
-        queryTerm.total = res.total
-      })
-    }
+const queryChuKuXinXiClick = () => {
+  if (!DateRange.value && queryTerm.drawNo === '' && queryTerm.chargeCode === '' && queryTerm.inDrawNo === '') {
+    ElMessage.warning({
+      message: '至少选择一项',
+      showClose: true,
+      duration: 2500,
+    })
+    return
+  }
+  let getDateRange = getDateRangeFormatDate(DateRange.value)
+  queryTerm.startTime = getDateRange.startTime
+  queryTerm.endTime = getDateRange.endTime
 
-    const chuKuXiangXiXinXi = ref({})
+  queryChuKuXinXi(queryTerm).then((res) => {
+    chuKuXinXiList.value = res.data
+    queryTerm.total = res.total
+  })
+}
 
-    const xiuGiClick = (val) => {
-      chuKuDrawer.value = true
-      chuKuXiangXiXinXi.value = clone(val)
-      chuKuXiangXiXinXi.value.oldDrawNo = chuKuXiangXiXinXi.value.drawNo
-    }
+const chuKuXiangXiXinXi = ref({})
 
-    const deptCodeList = ref([])
-    const groupNoOutList = ref([])
-    const groupNoList = ref([])
+const xiuGiClick = (val) => {
+  chuKuDrawer.value = true
+  chuKuXiangXiXinXi.value = clone(val)
+  chuKuXiangXiXinXi.value.oldDrawNo = chuKuXiangXiXinXi.value.drawNo
+}
 
-    onMounted(() => {
-      queryDeptCode().then((res) => {
-        deptCodeList.value = res.deptCode
-        groupNoOutList.value = res.groupNo
-        groupNoList.value = res.groupNo
-      })
-    })
+const deptCodeList = ref([])
+const groupNoOutList = ref([])
+const groupNoList = ref([])
 
-    const chuKuDrawer = ref(false)
+onMounted(() => {
+  queryDeptCode().then((res) => {
+    deptCodeList.value = res.deptCode
+    groupNoOutList.value = res.groupNo
+    groupNoList.value = res.groupNo
+  })
+})
 
-    const xiuGaiClick = () => {
-      chuKuXiangXiXinXi.value.inDate = formatDatetime(chuKuXiangXiXinXi.value.inDate)
-      chuKuXiangXiXinXi.value.outDate = formatDatetime(chuKuXiangXiXinXi.value.outDate)
-      chuKuXiangXiXinXi.value.confirmDate = formatDatetime(chuKuXiangXiXinXi.value.confirmDate)
+const chuKuDrawer = ref(false)
 
-      xiuGaiChuKuXinXi(chuKuXiangXiXinXi.value).then((res) => {
-        chuKuDrawer.value = false
-        fenYe()
-      })
-    }
+const xiuGaiClick = () => {
+  chuKuXiangXiXinXi.value.inDate = formatDatetime(chuKuXiangXiXinXi.value.inDate)
+  chuKuXiangXiXinXi.value.outDate = formatDatetime(chuKuXiangXiXinXi.value.outDate)
+  chuKuXiangXiXinXi.value.confirmDate = formatDatetime(chuKuXiangXiXinXi.value.confirmDate)
 
-    const handleSizeChange = (val) => {
-      queryTerm.pageSize = val
-      fenYe()
-    }
+  xiuGaiChuKuXinXi(chuKuXiangXiXinXi.value).then((res) => {
+    chuKuDrawer.value = false
+    fenYe()
+  })
+}
 
-    const handleCurrentChange = (val) => {
-      queryTerm.currentPage = val
-      fenYe()
-    }
+const handleSizeChange = (val) => {
+  queryTerm.pageSize = val
+  fenYe()
+}
 
-    const fenYe = () => {
-      queryChuKuXinXi(queryTerm).then((res) => {
-        chuKuXinXiList.value = res.data
-      })
-    }
+const handleCurrentChange = (val) => {
+  queryTerm.currentPage = val
+  fenYe()
+}
 
-    const shanChuChuKuXinXiClick = (index, val) => {
-      shanChuChuKuXinXi(val.drawNo, val.chargeCode, val.outSeri, val.inDrawNo).then((res) => {
-        chuKuXinXiList.value.splice(index, 1)
-      })
-    }
+const fenYe = () => {
+  queryChuKuXinXi(queryTerm).then((res) => {
+    chuKuXinXiList.value = res.data
+  })
+}
 
-    return {
-      queryTerm,
-      DateRange,
-      shortcuts,
-      queryChuKuXinXiClick,
-      chuKuXinXiList,
-      tableHeight,
-      xiuGiClick,
-      chuKuDrawer,
-      chuKuXiangXiXinXi,
-      deptCodeList,
-      groupNoOutList,
-      groupNoList,
-      xiuGaiClick,
-      handleSizeChange,
-      handleCurrentChange,
-      shanChuChuKuXinXiClick,
-    }
-  },
+const shanChuChuKuXinXiClick = (index, val) => {
+  shanChuChuKuXinXi(val.drawNo, val.chargeCode, val.outSeri, val.inDrawNo).then((res) => {
+    chuKuXinXiList.value.splice(index, 1)
+  })
 }
+
 </script>
 
 <style></style>

src/views/data-modify/OrderQuash.vue

@@ -5,7 +5,6 @@ import {getServerDateApi} from "@/api/public-api";
 import XcElOption from "@/components/xiao-chan/xc-el-option/XcElOption.vue";
 import {stateList} from "@/data/order-quash-data";
 import XcTable from "@/components/xiao-chan/xc-table/XcTable.vue";
-import {getWindowSize} from "@/utils/window-size";
 import XEUtils from 'xe-utils'
 import {BizException, ExceptionEnum} from "@/utils/BizException";
 import {needRule} from "@/utils/public";
@@ -59,21 +58,21 @@ onMounted(async () => {
 </script>
 
 <template>
-  <el-container>
-    <el-aside class="quash_table">
+  <div class="layout_display_flex">
+    <div class="m-r_8px">
       <xc-table :local-data="returnData"
                 small
                 @row-click="rowClick"
                 layout="total,  prev, pager, next"
-                :final-height="getWindowSize.h / 1.02">
+                final-height="100%">
         <el-table-column prop="patNo" label="住院号"/>
         <el-table-column prop="name" label="姓名"/>
         <el-table-column prop="count" label="数量"/>
         <el-table-column prop="wardName" label="病区"/>
       </xc-table>
-    </el-aside>
-    <el-container>
-      <el-header>
+    </div>
+    <div class="layout_display_flex_y">
+      <div class="m-b_8px">
         <el-date-picker v-model="dateRange"
                         type="daterange"
                         style="width: 220px"/>
@@ -91,12 +90,12 @@ onMounted(async () => {
                    :disabled="currentPat.state !== 1">
           保存
         </el-button>
-      </el-header>
-      <el-main>
+      </div>
+      <div class="layout_flex_1-y">
         <xc-table :local-data="patReqData"
                   :open-paging="false"
                   :default-expand-all="false"
-                  :final-height="getWindowSize.h / 1.05">
+                  final-height="100%">
           <el-table-column type="index"/>
           <el-table-column type="expand">
             <template #default="{row}">
@@ -136,9 +135,9 @@ onMounted(async () => {
             </template>
           </el-table-column>
         </xc-table>
-      </el-main>
-    </el-container>
-  </el-container>
+      </div>
+    </div>
+  </div>
 </template>
 
 <style scoped lang="scss">

src/views/data-modify/QueryOfReceiptDetails.vue

@@ -1,6 +1,6 @@
 <template>
-  <page-layer>
-    <template #header>
+  <div class="layout_display_flex_y">
+    <div>
       <span>入库日期：</span>
       <el-date-picker
           v-model="DateRange"
@@ -13,11 +13,14 @@
           style="width: 240px"
       ></el-date-picker>
       <span>入库单号：</span>
-      <el-input style="width: 150px" clearable v-model="queryTerm.inDocuNo" @blur="inDocuNo = $event.target.value.trim()"></el-input>
+      <el-input style="width: 150px" clearable v-model="queryTerm.inDocuNo"
+                @blur="inDocuNo = $event.target.value.trim()"></el-input>
       <el-button style="margin-left: 10px" type="primary" @click="queryRuKuXinXiClick">查询</el-button>
-    </template>
-    <template #main>
-      <el-table :height="tableHeight" :data="ruKuXinXiList">
+    </div>
+    <div class="layout_flex_1-y layout_display_flex_y">
+      <el-table
+          height="100%"
+          :data="ruKuXinXiList">
         <el-table-column label="药品编码" prop="chargeCode"></el-table-column>
         <el-table-column label="药品名称" prop="chargeCodeName"></el-table-column>
         <el-table-column label="入库日期" prop="inDate" width="80px"></el-table-column>
@@ -37,275 +40,251 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="queryTerm.currentPage"
-          :page-sizes="[100, 200, 300, 400]"
-          :page-size="queryTerm.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="queryTerm.total"
-      >
-      </el-pagination>
-      <!-- 修改的抽屉 -->
-      <el-drawer title="修改入库信息" v-model="ruKuDrawer" size="70%">
-        <div style="width: 98%">
-          <el-form label-width="100px">
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="药品编码:">
-                  <el-input v-model="ruKuXiangXiXinXi.chargeCode" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="药品名称:">
-                  <el-input v-model="ruKuXiangXiXinXi.chargeCodeName" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="入库单号:">
-                  <el-input v-model="ruKuXiangXiXinXi.inDocuNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="供应商:">
-                  <el-input v-model="ruKuXiangXiXinXi.supplyCodeName" @click="xiuGaiCode(1)"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="传票号:">
-                  <el-input v-model="ruKuXiangXiXinXi.reptNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="采购员:">
-                  <el-input v-model="ruKuXiangXiXinXi.purchaserName" @click="xiuGaiCode(2)"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="生产批号:">
-                  <el-input v-model="ruKuXiangXiXinXi.manuNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="发票号:">
-                  <el-input v-model="ruKuXiangXiXinXi.fpNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="生产厂家:">
-                  <el-input v-model="ruKuXiangXiXinXi.manuCodeName" @click="xiuGaiCode(3)"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="批准文号:">
-                  <el-input v-model="ruKuXiangXiXinXi.licenseNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="备注:">
-                  <el-input v-model="ruKuXiangXiXinXi.inComment"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="入库时间:">
-                  <el-date-picker type="datetime" v-model="ruKuXiangXiXinXi.inDate"></el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="确认时间:">
-                  <el-date-picker type="datetime" v-model="ruKuXiangXiXinXi.confirmDate"></el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="发票日期:">
-                  <el-date-picker type="datetime" v-model="ruKuXiangXiXinXi.fpDate"></el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="效期:">
-                  <el-date-picker type="datetime" v-model="ruKuXiangXiXinXi.effDate"></el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col>
-                <el-button @click="baoCunXiuGi" style="margin-left: 20px" type="success">保存修改</el-button>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </el-drawer>
-      <el-dialog :title="dialogTitle" v-model="dialogXiuGi" width="400px">
-        <span>{{ dialogTitle }}：</span>
-        <el-select v-model="codeAndName" @change="changeData" placeholder="根据拼音首字母查找" filterable clearable remote :remote-method="remoteMethodCodeAndName">
-          <el-option v-for="item in codeAndNameList" :key="item.code" :label="item.name" :value="item.code">
-            <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-            <el-divider direction="vertical"></el-divider>
-            <span>{{ item.name }}</span>
-          </el-option>
-        </el-select>
-      </el-dialog>
-    </template>
-  </page-layer>
-</template>
+      <div>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="queryTerm.currentPage"
+            :page-sizes="[100, 200, 300, 400]"
+            :page-size="queryTerm.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="queryTerm.total"
+        >
+        </el-pagination>
+      </div>
+    </div>
+  </div>
 
-<script>
-import { reactive, ref } from '@vue/reactivity'
-import { shortcuts } from '@/data/shortcuts'
-import { formatDatetime, getDateRangeFormatDate } from '@/utils/date'
-import { ElMessage } from 'element-plus'
-import { queryCode, queryRuKuXinXi, xiuGaiRuKuXinXi } from '@/api/yz-data-mod/in-or-out-of-warehouse'
-import { clone } from '@/utils/clone'
-import PageLayer from "@/layout/PageLayer";
-export default {
-  name: 'QueryOfReceiptDetails',
-  components: {PageLayer},
-  setup() {
-    //
-    const tableHeight = window.innerHeight - 70
+  <!-- 修改的抽屉 -->
+  <el-drawer title="修改入库信息" v-model="ruKuDrawer" size="70%">
+    <div style="width: 98%">
+      <el-form label-width="100px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="药品编码:">
+              <el-input v-model="ruKuXiangXiXinXi.chargeCode" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="药品名称:">
+              <el-input v-model="ruKuXiangXiXinXi.chargeCodeName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="入库单号:">
+              <el-input v-model="ruKuXiangXiXinXi.inDocuNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="供应商:">
+              <el-input v-model="ruKuXiangXiXinXi.supplyCodeName" @click="xiuGaiCode(1)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传票号:">
+              <el-input v-model="ruKuXiangXiXinXi.reptNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="采购员:">
+              <el-input v-model="ruKuXiangXiXinXi.purchaserName" @click="xiuGaiCode(2)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产批号:">
+              <el-input v-model="ruKuXiangXiXinXi.manuNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发票号:">
+              <el-input v-model="ruKuXiangXiXinXi.fpNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产厂家:">
+              <el-input v-model="ruKuXiangXiXinXi.manuCodeName" @click="xiuGaiCode(3)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="批准文号:">
+              <el-input v-model="ruKuXiangXiXinXi.licenseNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input v-model="ruKuXiangXiXinXi.inComment"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入库时间:">
+              <el-date-picker type="datetime" v-model="ruKuXiangXiXinXi.inDate"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="确认时间:">
+              <el-date-picker type="datetime" v-model="ruKuXiangXiXinXi.confirmDate"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发票日期:">
+              <el-date-picker type="datetime" v-model="ruKuXiangXiXinXi.fpDate"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="效期:">
+              <el-date-picker type="datetime" v-model="ruKuXiangXiXinXi.effDate"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-button @click="baoCunXiuGi" style="margin-left: 20px" type="success">保存修改</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </el-drawer>
+  <el-dialog :title="dialogTitle" v-model="dialogXiuGi" width="400px">
+    <span>{{ dialogTitle }}：</span>
+    <el-select v-model="codeAndName" @change="changeData" placeholder="根据拼音首字母查找" filterable clearable
+               remote :remote-method="remoteMethodCodeAndName">
+      <el-option v-for="item in codeAndNameList" :key="item.code" :label="item.name" :value="item.code">
+        <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+        <el-divider direction="vertical"></el-divider>
+        <span>{{ item.name }}</span>
+      </el-option>
+    </el-select>
+  </el-dialog>
+</template>
 
-    //查询条件
-    const DateRange = ref('')
-    //把条件合起来
-    const queryTerm = reactive({
-      startTime: '',
-      endTime: '',
-      inDocuNo: '',
-      currentPage: 1,
-      pageSize: 100,
-      total: 0,
-    })
-    //分页
-    const handleSizeChange = (val) => {
-      queryTerm.pageSize = val
-      fenYe()
-    }
+<script setup>
+import {reactive, ref} from 'vue'
+import {formatDatetime, getDateRangeFormatDate} from '@/utils/date'
+import {ElMessage} from 'element-plus'
+import {queryCode, queryRuKuXinXi, xiuGaiRuKuXinXi} from '@/api/yz-data-mod/in-or-out-of-warehouse'
+import {clone} from 'xe-utils'
+import {shortcuts} from "@/data/shortcuts";
 
-    const handleCurrentChange = (val) => {
-      queryTerm.currentPage = val
-      fenYe()
-    }
+//
+const tableHeight = window.innerHeight - 70
 
-    const fenYe = () => {
-      queryRuKuXinXi(queryTerm).then((res) => {
-        ruKuXinXiList.value = res.data
-        queryTerm.total = res.total
-      })
-    }
+//查询条件
+const DateRange = ref('')
+//把条件合起来
+const queryTerm = reactive({
+  startTime: '',
+  endTime: '',
+  inDocuNo: '',
+  currentPage: 1,
+  pageSize: 100,
+  total: 0,
+})
+//分页
+const handleSizeChange = (val) => {
+  queryTerm.pageSize = val
+  fenYe()
+}
 
-    //返回的数据
-    const ruKuXinXiList = ref([])
+const handleCurrentChange = (val) => {
+  queryTerm.currentPage = val
+  fenYe()
+}
 
-    //点击查询
-    const queryRuKuXinXiClick = () => {
-      if (!DateRange.value && queryTerm.inDocuNo === '') {
-        ElMessage.warning({
-          message: '至少选择一项',
-          showClose: true,
-          duration: 2500,
-        })
-        return
-      }
-      let getDateRange = getDateRangeFormatDate(DateRange.value)
+const fenYe = () => {
+  queryRuKuXinXi(queryTerm).then((res) => {
+    ruKuXinXiList.value = res.data
+    queryTerm.total = res.total
+  })
+}
 
-      queryTerm.startTime = getDateRange.startTime
-      queryTerm.endTime = getDateRange.endTime
+//返回的数据
+const ruKuXinXiList = ref([])
 
-      queryRuKuXinXi(queryTerm).then((res) => {
-        ruKuXinXiList.value = res.data
-        queryTerm.total = res.total
-      })
-    }
+//点击查询
+const queryRuKuXinXiClick = () => {
+  if (!DateRange.value && queryTerm.inDocuNo === '') {
+    ElMessage.warning({
+      message: '至少选择一项',
+      showClose: true,
+      duration: 2500,
+    })
+    return
+  }
+  let getDateRange = getDateRangeFormatDate(DateRange.value)
 
-    const ruKuXiangXiXinXi = ref({})
+  queryTerm.startTime = getDateRange.startTime
+  queryTerm.endTime = getDateRange.endTime
 
-    const ruKuDrawer = ref(false)
+  queryRuKuXinXi(queryTerm).then((res) => {
+    ruKuXinXiList.value = res.data
+    queryTerm.total = res.total
+  })
+}
 
-    const xiuGiClick = (val) => {
-      ruKuDrawer.value = true
-      ruKuXiangXiXinXi.value = clone(val)
-      ruKuXiangXiXinXi.value.oldInDocuNo = clone(ruKuXiangXiXinXi.value.inDocuNo)
-    }
+const ruKuXiangXiXinXi = ref({})
 
-    const dialogTitle = ref('提示')
-    const dialogXiuGi = ref(false)
+const ruKuDrawer = ref(false)
 
-    const codeAndName = ref()
-    const flag = ref(0)
+const xiuGiClick = (val) => {
+  ruKuDrawer.value = true
+  ruKuXiangXiXinXi.value = clone(val, true)
+  ruKuXiangXiXinXi.value.oldInDocuNo = clone(ruKuXiangXiXinXi.value.inDocuNo, true)
+}
 
-    const codeAndNameList = ref([])
+const dialogTitle = ref('提示')
+const dialogXiuGi = ref(false)
 
-    const xiuGaiCode = (val) => {
-      dialogXiuGi.value = true
-      flag.value = val
-      codeAndNameList.value = []
-      codeAndName.value = null
-      if (val === 1) {
-        dialogTitle.value = '修改供应商'
-      } else if (val === 2) {
-        dialogTitle.value = '修改采购员'
-      } else if (val === 3) {
-        dialogTitle.value = '修改生产厂商'
-      }
-    }
+const codeAndName = ref()
+const flag = ref(0)
 
-    const remoteMethodCodeAndName = (val) => {
-      if (val.length > 1) {
-        queryCode(val, flag.value).then((res) => {
-          codeAndNameList.value = res
-        })
-      }
-    }
+const codeAndNameList = ref([])
 
-    const changeData = (val) => {
-      codeAndNameList.value.forEach((item) => {
-        if (flag.value === 1 && item.code === val) {
-          ruKuXiangXiXinXi.value.supplyCode = item.code
-          ruKuXiangXiXinXi.value.supplyCodeName = item.name
-        } else if (flag.value === 2 && item.code === val) {
-          ruKuXiangXiXinXi.value.purchaser = item.code
-          ruKuXiangXiXinXi.value.purchaserName = item.name
-        } else if (flag.value === 3 && item.code === val) {
-          ruKuXiangXiXinXi.value.manuCode = item.code
-          ruKuXiangXiXinXi.value.manuCodeName = item.name
-        }
-      })
-    }
+const xiuGaiCode = (val) => {
+  dialogXiuGi.value = true
+  flag.value = val
+  codeAndNameList.value = []
+  codeAndName.value = null
+  if (val === 1) {
+    dialogTitle.value = '修改供应商'
+  } else if (val === 2) {
+    dialogTitle.value = '修改采购员'
+  } else if (val === 3) {
+    dialogTitle.value = '修改生产厂商'
+  }
+}
 
-    const baoCunXiuGi = () => {
-      ruKuXiangXiXinXi.value.inDate = formatDatetime(ruKuXiangXiXinXi.value.inDate)
-      ruKuXiangXiXinXi.value.confirmDate = formatDatetime(ruKuXiangXiXinXi.value.confirmDate)
-      ruKuXiangXiXinXi.value.fpDate = formatDatetime(ruKuXiangXiXinXi.value.fpDate)
-      ruKuXiangXiXinXi.value.effDate = formatDatetime(ruKuXiangXiXinXi.value.effDate)
+const remoteMethodCodeAndName = (val) => {
+  if (val.length > 1) {
+    queryCode(val, flag.value).then((res) => {
+      codeAndNameList.value = res
+    })
+  }
+}
 
-      xiuGaiRuKuXinXi(ruKuXiangXiXinXi.value).then((res) => {
-        fenYe()
-        dialogXiuGi.value = false
-      })
+const changeData = (val) => {
+  codeAndNameList.value.forEach((item) => {
+    if (flag.value === 1 && item.code === val) {
+      ruKuXiangXiXinXi.value.supplyCode = item.code
+      ruKuXiangXiXinXi.value.supplyCodeName = item.name
+    } else if (flag.value === 2 && item.code === val) {
+      ruKuXiangXiXinXi.value.purchaser = item.code
+      ruKuXiangXiXinXi.value.purchaserName = item.name
+    } else if (flag.value === 3 && item.code === val) {
+      ruKuXiangXiXinXi.value.manuCode = item.code
+      ruKuXiangXiXinXi.value.manuCodeName = item.name
     }
+  })
+}
 
-    return {
-      DateRange,
-      queryTerm,
-      shortcuts,
-      ruKuXinXiList,
-      queryRuKuXinXiClick,
-      tableHeight,
-      handleSizeChange,
-      handleCurrentChange,
-      xiuGiClick,
-      ruKuDrawer,
-      ruKuXiangXiXinXi,
-      xiuGaiCode,
-      dialogTitle,
-      dialogXiuGi,
-      codeAndName,
-      remoteMethodCodeAndName,
-      codeAndNameList,
-      changeData,
-      baoCunXiuGi,
-    }
-  },
+const baoCunXiuGi = () => {
+  ruKuXiangXiXinXi.value.inDate = formatDatetime(ruKuXiangXiXinXi.value.inDate)
+  ruKuXiangXiXinXi.value.confirmDate = formatDatetime(ruKuXiangXiXinXi.value.confirmDate)
+  ruKuXiangXiXinXi.value.fpDate = formatDatetime(ruKuXiangXiXinXi.value.fpDate)
+  ruKuXiangXiXinXi.value.effDate = formatDatetime(ruKuXiangXiXinXi.value.effDate)
+
+  xiuGaiRuKuXinXi(ruKuXiangXiXinXi.value).then((res) => {
+    fenYe()
+    dialogXiuGi.value = false
+  })
 }
+
 </script>
 
-<style></style>

src/views/data-modify/SecondFefund.vue

@@ -1,215 +1,206 @@
 <template>
-  <page-layer>
-    <template #header>
+  <div class="layout_display_flex_y">
+    <div class="m-b_8px">
       <el-input size="small" clearable prefix-icon="Search" v-model="mzTuiFei.patientId" style="width: 300px">
         <template #prepend>门诊号</template>
       </el-input>
-      <el-input size="small" clearable prefix-icon="Search" v-model="mzTuiFei.times" oninput="value=value.replace(/[^\d]/g,'')" style="width: 300px">
+      <el-input size="small" clearable prefix-icon="Search" v-model="mzTuiFei.times"
+                oninput="value=value.replace(/[^\d]/g,'')" style="width: 300px">
         <template #prepend>次数</template>
       </el-input>
       <el-input size="small" clearable prefix-icon="Search" v-model="mzTuiFei.chargeItemCode" style="width: 300px">
         <template #prepend>收费编码</template>
       </el-input>
       <el-button type="success" style="margin-left: 20px" @click="querySubmit">查询</el-button>
-    </template>
-    <template #aside>
-      <el-table :data="mzChargeDateilData" :height="tableHeight" @row-click="dianJiDanYuanGe" stripe highlight-current-row>
-        <el-table-column prop="name" label="姓名"></el-table-column>
-        <el-table-column prop="tcName" label="项目名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="chargeItemCode" label="编码"></el-table-column>
-        <el-table-column prop="itemNo" label="编码"></el-table-column>
-      </el-table>
-      <el-pagination
-          :pager-count="5"
-          small
-          :total="mzTuiFei.total"
-          layout="prev, pager, next,total"
-          :current-page="mzTuiFei.currentPage"
-          :page-size="mzTuiFei.pageSize"
-          @current-change="handleCurrentChange"
-      ></el-pagination>
-    </template>
-    <template #main>
-      <div style="margin-right: 20px">
+    </div>
+    <div class="layout_flex_1-y layout_display_flex ">
+      <div style="width: max-content" class="layout_display_flex_y m-r_8px">
+        <el-table :data="mzChargeDateilData"
+                  height="100%"
+                  @row-click="dianJiDanYuanGe"
+                  stripe
+                  highlight-current-row>
+          <el-table-column prop="name" label="姓名"></el-table-column>
+          <el-table-column prop="tcName" label="项目名称" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="chargeItemCode" label="编码"></el-table-column>
+          <el-table-column prop="itemNo" label="编码"></el-table-column>
+        </el-table>
+        <el-pagination
+            :pager-count="5"
+            small
+            :total="mzTuiFei.total"
+            layout="prev, pager, next,total"
+            :current-page="mzTuiFei.currentPage"
+            :page-size="mzTuiFei.pageSize"
+            @current-change="handleCurrentChange"
+        ></el-pagination>
+      </div>
+
+      <div class="layout_flex_1-x">
         <el-descriptions title="基本信息" border :column="4">
           <template #extra>
             <el-button type="primary" @click="tuiFeiClick">修改二次退费</el-button>
           </template>
           <el-descriptions-item>
-            <template #label> 患者姓名 </template>
+            <template #label> 患者姓名</template>
             {{ mzChargeDateil.name }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template #label> 收费编码 </template>
+            <template #label> 收费编码</template>
             {{ mzChargeDateil.chargeItemCode }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template #label> 门诊号 </template>
+            <template #label> 门诊号</template>
             {{ mzChargeDateil.patientId }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template #label> 次数 </template>
+            <template #label> 次数</template>
             {{ mzChargeDateil.times }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template #label> 药房确认标志 </template>
+            <template #label> 药房确认标志</template>
             {{ confirmFlagToString(mzChargeDateil.confirmFlag) }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template #label> 最大退药量 </template>
+            <template #label> 最大退药量</template>
             {{ mzChargeDateil.quantity }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template #label> 药品名称 </template>
+            <template #label> 药品名称</template>
             {{ mzChargeDateil.tcName }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template #label> 收据编号 </template>
+            <template #label> 收据编号</template>
             {{ mzChargeDateil.receiptNo }}
           </el-descriptions-item>
         </el-descriptions>
+
       </div>
-      <el-dialog v-model="tuiFeiDialog" title="退费操作" width="500px">
-        <el-tag>患者姓名：{{ mzChargeDateil.name }} </el-tag>
-        <el-tag type="info">门诊号：{{ mzChargeDateil.patientId }} </el-tag>
-        <el-tag>次数：{{ mzChargeDateil.times }} </el-tag>
-        <el-tag type="info">收费编码：{{ mzChargeDateil.chargeItemCode }} </el-tag>
-        <el-tag>最大退药量：{{ mzChargeDateil.quantity }} </el-tag>
-        <br /><br />
-        <span>选择退费数量 ：</span>
-        <el-select v-model="quantity" placeholder="请选择最大退药量">
-          <el-option v-for="item in mzChargeDateil.quantity" :key="item" :label="item" :value="item"></el-option> </el-select
-        ><br /><br />
-        <el-button type="warning" @click="xiuGaiClick">修改</el-button>
-      </el-dialog>
-    </template>
-  </page-layer>
+
+    </div>
+  </div>
+
+  <el-dialog v-model="tuiFeiDialog" title="退费操作" width="500px">
+    <el-tag>患者姓名：{{ mzChargeDateil.name }}</el-tag>
+    <el-tag type="info">门诊号：{{ mzChargeDateil.patientId }}</el-tag>
+    <el-tag>次数：{{ mzChargeDateil.times }}</el-tag>
+    <el-tag type="info">收费编码：{{ mzChargeDateil.chargeItemCode }}</el-tag>
+    <el-tag>最大退药量：{{ mzChargeDateil.quantity }}</el-tag>
+    <br/><br/>
+    <span>选择退费数量 ：</span>
+    <el-select v-model="quantity" placeholder="请选择最大退药量">
+      <el-option v-for="item in mzChargeDateil.quantity" :key="item" :label="item" :value="item"></el-option>
+    </el-select
+    >
+    <br/><br/>
+    <el-button type="warning" @click="xiuGaiClick">修改</el-button>
+  </el-dialog>
 </template>
 
-<script>
-import { ref } from '@vue/reactivity'
-import { getMzTuiFei, xiuGaiTuiFei } from '@/api/yz-data-mod/second-fefund'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { clone } from '@/utils/clone'
-import PageLayer from "@/layout/PageLayer";
-export default {
-  name: 'SecondFefund',
-  components: {PageLayer},
-  setup() {
-    ////////////////////////////// 获取屏幕高度 /////////////////////////////////////////
-
-    const tableHeight = window.innerHeight - 70
-
-    const mzTuiFei = ref({
-      patientId: '',
-      times: '',
-      chargeItemCode: '',
-      currentPage: 1,
-      pageSize: 20,
-      total: 0,
+<script setup>
+import {ref} from 'vue'
+import {getMzTuiFei, xiuGaiTuiFei} from '@/api/yz-data-mod/second-fefund'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {clone} from '@/utils/clone'
+
+
+const mzTuiFei = ref({
+  patientId: '',
+  times: '',
+  chargeItemCode: '',
+  currentPage: 1,
+  pageSize: 20,
+  total: 0,
+})
+
+const mzChargeDateil = ref({})
+
+///////////////////////////////// 点击查询按钮 ////////////////////////////////////////////////
+
+const mzChargeDateilData = ref([])
+
+const querySubmit = () => {
+  if (!mzTuiFei.value.patientId || !mzTuiFei.value.times) {
+    ElMessage({
+      type: 'warning',
+      message: '门诊号和次数不能为空',
+      showClose: true,
+      duration: 2000,
     })
+    return
+  }
+  getMzTuiFei(mzTuiFei.value).then((res) => {
+    mzChargeDateilData.value = res.records
+    mzTuiFei.value.total = res.total
+  })
+}
 
-    const mzChargeDateil = ref({})
+///////////////////////////// 点击下一页 ///////////////////////////////////////////////
+const handleCurrentChange = (val) => {
+  mzTuiFei.value.currentPage = val
+  getMzTuiFei(mzTuiFei.value).then((res) => {
+    mzChargeDateilData.value = res.data
+  })
+}
 
-    ///////////////////////////////// 点击查询按钮 ////////////////////////////////////////////////
+//////////////////////////////// 点击 el-table 表格 //////////////////////////////////////////////////////
+const dianJiDanYuanGe = (val) => {
+  mzChargeDateil.value = val
+  quantity.value = val.quantity
+}
 
-    const mzChargeDateilData = ref([])
+const quantity = ref()
 
-    const querySubmit = () => {
-      if (!mzTuiFei.value.patientId || !mzTuiFei.value.times) {
-        ElMessage({
-          type: 'warning',
-          message: '门诊号和次数不能为空',
-          showClose: true,
-          duration: 2000,
-        })
-        return
-      }
-      getMzTuiFei(mzTuiFei.value).then((res) => {
-        mzChargeDateilData.value = res.records
-        mzTuiFei.value.total = res.total
-      })
-    }
+const tuiFeiDialog = ref(false)
+const tuiFeiClick = () => {
+  if (!mzChargeDateil.value.patientId) {
+    ElMessage({
+      type: 'warning',
+      message: '请先选择退药编码',
+      showClose: true,
+      duration: 2500,
+    })
+    return
+  }
+  tuiFeiDialog.value = true
+}
 
-    ///////////////////////////// 点击下一页 ///////////////////////////////////////////////
-    const handleCurrentChange = (val) => {
-      mzTuiFei.value.currentPage = val
-      getMzTuiFei(mzTuiFei.value).then((res) => {
-        mzChargeDateilData.value = res.data
-      })
-    }
-
-    //////////////////////////////// 点击 el-table 表格 //////////////////////////////////////////////////////
-    const dianJiDanYuanGe = (val) => {
-      mzChargeDateil.value = val
-      quantity.value = val.quantity
-    }
-
-    const quantity = ref()
-
-    const tuiFeiDialog = ref(false)
-    const tuiFeiClick = () => {
-      if (!mzChargeDateil.value.patientId) {
-        ElMessage({
-          type: 'warning',
-          message: '请先选择退药编码',
-          showClose: true,
-          duration: 2500,
-        })
-        return
-      }
-      tuiFeiDialog.value = true
-    }
-
-    /**
-     * 点击修改 退药量
-     */
-
-    const xiuGaiClick = () => {
-      if (!quantity.value) {
-        ElMessage({
-          type: 'warning',
-          message: '未选择退药数量',
-          showClose: true,
-          duration: 2500,
-        })
-        return
-      }
-      ElMessageBox.confirm('是否修改', '提示', {
-        type: 'warning',
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-      })
-        .then(() => {
-          let linShi = clone(mzChargeDateil.value.quantity)
-          mzChargeDateil.value.quantity = quantity.value
-          xiuGaiTuiFei(mzChargeDateil.value).then((res) => {
-            mzChargeDateil.value = {}
-            getMzTuiFei(mzTuiFei.value).then((res) => {
-              mzChargeDateilData.value = res.records
-              mzTuiFei.value.total = res.total
-            })
+/**
+ * 点击修改 退药量
+ */
+
+const xiuGaiClick = () => {
+  if (!quantity.value) {
+    ElMessage({
+      type: 'warning',
+      message: '未选择退药数量',
+      showClose: true,
+      duration: 2500,
+    })
+    return
+  }
+  ElMessageBox.confirm('是否修改', '提示', {
+    type: 'warning',
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+  })
+      .then(() => {
+        let linShi = clone(mzChargeDateil.value.quantity)
+        mzChargeDateil.value.quantity = quantity.value
+        xiuGaiTuiFei(mzChargeDateil.value).then((res) => {
+          mzChargeDateil.value = {}
+          getMzTuiFei(mzTuiFei.value).then((res) => {
+            mzChargeDateilData.value = res.records
+            mzTuiFei.value.total = res.total
           })
-          mzChargeDateil.value.quantity = linShi
         })
-        .catch(() => {})
-    }
-    return {
-      querySubmit,
-      mzChargeDateil,
-      confirmFlagToString,
-      tuiFeiClick,
-      tuiFeiDialog,
-      quantity,
-      xiuGaiClick,
-      mzTuiFei,
-      mzChargeDateilData,
-      handleCurrentChange,
-      tableHeight,
-      dianJiDanYuanGe,
-    }
-  },
+        mzChargeDateil.value.quantity = linShi
+      })
+      .catch(() => {
+      })
 }
+
+
 function confirmFlagToString(val) {
   switch (val) {
     case 0:

src/views/data-modify/YzActOrderModify.vue

@@ -1,6 +1,6 @@
 <template>
-  <page-layer>
-    <template #header>
+  <div class="layout_display_flex_y">
+    <div style="margin-bottom: 10px">
       <el-input size="small" placeholder="在此输入住院号" @keyup.enter="query" v-model.trim="inpatientNo" clearable
                 prefix-icon="Search" style="width: 300px">
         <template #prepend>住院号</template>
@@ -11,191 +11,200 @@
       </el-input>
       <el-button type="primary" icon="Search" @click="query">查询</el-button>
       <el-button type="info" @click="chakan" icon="View">查看申请状态</el-button>
-    </template>
-    <template #aside>
-      <el-table :height="tableHeight" stripe highlight-current-row
-                :data="cptTable.slice((currentPage - 1) * pageSize, currentPage * pageSize)" style="text-align: center">
-        <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
-        <el-table-column label="医嘱名称" show-overflow-tooltip prop="orderName"></el-table-column>
-        <el-table-column label="操作" width="100">
-          <template #default="scope">
-            <el-button-group>
-              <el-button text @click="tianjia(scope.row)" type="primary">添加</el-button>
-              <el-button text @click="danGeShenQingClick(scope.row)" type="primary">申请</el-button>
-            </el-button-group>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-          @current-change="handleCurrentChange"
-          :page-size="pageSize"
-          :current-page="currentPage"
-          small
-          style="background-color: white"
-          layout="prev, pager, next"
-          :total="cptTable.length"
-      >
-      </el-pagination>
-    </template>
-    <template #main>
-      <!-- 申请修改医嘱的开始时间和结束时间 -->
-      <span>开始时间：</span>
-      <el-date-picker type="datetime" placeholder="选择开始时间" v-model="tianJiaShenHe.startTime"></el-date-picker>
-      <el-divider direction="vertical"></el-divider>
-      <span>结束时间：</span>
-      <el-date-picker type="datetime" placeholder="选择结束时间" v-model="tianJiaShenHe.endTime"></el-date-picker>
-      <el-divider direction="vertical"></el-divider>
-      <el-button @click="tijiaoshenqing" type="success">提交</el-button>
-      <el-divider></el-divider>
-      <!-- 这里是添加审核医嘱到表格中 -->
-      <el-table :data="tianJiaShenHe.list" :height="tableHeight - 28">
-        <el-table-column label="患者姓名" width="70" prop="patientName"></el-table-column>
-        <el-table-column label="住院号" width="70" prop="inpatientNo"></el-table-column>
-        <el-table-column label="医嘱号" show-overflow-tooltip width="70" prop="actOrderNo"></el-table-column>
-        <el-table-column label="医嘱名称" show-overflow-tooltip prop="orderName"></el-table-column>
-        <el-table-column label="频次" prop="frequCode"></el-table-column>
-        <el-table-column label="医嘱时间" prop="orderTime"></el-table-column>
-        <el-table-column label="开始时间" prop="startTime"></el-table-column>
-        <el-table-column label="结束时间" prop="endTime"></el-table-column>
-        <el-table-column label="删除">
-          <template #default="scope">
-            <el-button type="danger" size="small" icon="Delete" @click="shanchu(scope.$index)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 这里是查看审核状态的 -->
-      <el-dialog v-model="dialogFormVisible" title="审核状态" :width="900">
-        住院号：
-        <el-input style="width: 120px" clearable @blur="shenHeInpatientNo = $event.target.value.trim()"
-                  v-model="shenHeInpatientNo"></el-input>
-        医嘱号：
-        <el-input oninput="value=value.replace(/[^\d]/g,'')" style="width: 120px"
-                  @blur="shenHeActOrderNo = $event.target.value.trim()" v-model="shenHeActOrderNo"></el-input>
-        <el-divider direction="vertical"></el-divider>
-        <el-button @click="queryZhuangTaiClick" type="primary">查询</el-button>
-        <el-table :data="dialogTable" :height="tableHeight - 300">
-          <el-table-column type="index"></el-table-column>
-          <el-table-column label="住院号" prop="inpatientNo"></el-table-column>
-          <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
-          <el-table-column label="审核状态">
-            <template #default="scope">
-              <span v-html="yZauditStatus(scope.row.auditFlag)"></span>
-            </template>
-          </el-table-column>
-          <el-table-column label="申请备注" show-overflow-tooltip prop="proposeRemark"></el-table-column>
-          <el-table-column label="审核人" prop="auditStaff"></el-table-column>
-          <el-table-column label="审核备注" show-overflow-tooltip prop="auditRemark"></el-table-column>
-          <el-table-column label="审核时间" width="80" prop="auditTime"></el-table-column>
-        </el-table>
-        <el-pagination
-            layout="prev, pager, next, total"
-            @current-change="shenHeXinXiCurrentChange"
-            :total="shenHeXinxiTotal"
-            :page-size="shenHeXinXiPageSize"
-            background
-        ></el-pagination>
-      </el-dialog>
-      <el-drawer v-model="danGeShenQingDrawer" title="申请修改医嘱" size="50%">
-        <div style="margin-left: 20px; width: 90%">
-          <el-descriptions border title="基本信息">
-            <el-descriptions-item>
-              <template #label>
-                <i class="el-icon-user"></i>
-                患者姓名
-              </template>
-              {{ danGeShenQingDrawerData.patientName }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label>
-                <i class="el-icon-s-order"></i>
-                住院号
-              </template>
-              {{ danGeShenQingDrawerData.inpatientNo }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label>
-                <i class="el-icon-s-order"></i>
-                医嘱号
-              </template>
-              {{ danGeShenQingDrawerData.actOrderNo }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label>
-                <i class="el-icon-s-claim"></i>
-                医嘱名称
+    </div>
+    <div class="layout_display_flex layout_flex_1-y">
+      <div class="layout_display_flex_y" style="width: 220px;margin-right: 10px">
+        <div class="layout_flex_1-y">
+          <el-table height="100%" stripe highlight-current-row
+                    :data="cptTable.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+                    style="text-align: center">
+            <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
+            <el-table-column label="医嘱名称" show-overflow-tooltip prop="orderName"></el-table-column>
+            <el-table-column label="操作" width="100">
+              <template #default="scope">
+                <el-button-group>
+                  <el-button text @click="tianjia(scope.row)" type="primary">添加</el-button>
+                  <el-button text @click="danGeShenQingClick(scope.row)" type="primary">申请</el-button>
+                </el-button-group>
               </template>
-              {{ danGeShenQingDrawerData.orderName }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label>
-                <i class="el-icon-house"></i>
-                病房
-              </template>
-              {{ danGeShenQingDrawerData.wardCode }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label>
-                <i class="el-icon-tickets"></i>
-                频次
-              </template>
-              {{ danGeShenQingDrawerData.frequCode }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label>
-                <i class="el-icon-time"></i>
-                医嘱时间
-              </template>
-              {{ danGeShenQingDrawerData.orderTime }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label>
-                <i class="el-icon-time"></i>
-                开始时间
-              </template>
-              {{ danGeShenQingDrawerData.startTime }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label>
-                <i class="el-icon-time"></i>
-                结束时间
-              </template>
-              {{ danGeShenQingDrawerData.endTime }}
-            </el-descriptions-item>
-          </el-descriptions>
+            </el-table-column>
+          </el-table>
+        </div>
+        <el-pagination
+            @current-change="handleCurrentChange"
+            :page-size="pageSize"
+            :current-page="currentPage"
+            small
+            style="background-color: white"
+            layout="prev, pager, next"
+            :total="cptTable.length"
+        >
+        </el-pagination>
+      </div>
+      <div class="layout_flex_1-x layout_display_flex_y">
+        <div>
+          <!-- 申请修改医嘱的开始时间和结束时间 -->
+          <span>开始时间：</span>
+          <el-date-picker type="datetime" placeholder="选择开始时间" v-model="tianJiaShenHe.startTime"></el-date-picker>
+          <el-divider direction="vertical"></el-divider>
+          <span>结束时间：</span>
+          <el-date-picker type="datetime" placeholder="选择结束时间" v-model="tianJiaShenHe.endTime"></el-date-picker>
+          <el-divider direction="vertical"></el-divider>
+          <el-button @click="tijiaoshenqing" type="success">提交</el-button>
           <el-divider></el-divider>
-          <el-row>
-            <el-col :span="12">
-              开始时间：
-              <el-date-picker type="datetime" placeholder="修改开始时间"
-                              v-model="danGeShenQingDrawerData.newStartTime"></el-date-picker>
-            </el-col>
-            <el-col :span="12">
-              结束时间：
-              <el-date-picker type="datetime" placeholder="修改结束时间"
-                              v-model="danGeShenQingDrawerData.newEndTime"></el-date-picker>
-            </el-col>
-            <el-col :span="24">
-              <br/>
-              <el-input
-                  type="textarea"
-                  placeholder="申请备注"
-                  maxlength="250"
-                  @blur="danGeShenQingDrawerData.proposeRemark = $event.target.value.trim()"
-                  show-word-limit
-                  v-model="danGeShenQingDrawerData.proposeRemark"
-              ></el-input>
-            </el-col>
-          </el-row>
-          <br/>
-          <el-button type="primary" @click="danGeShenQingSubmit">提交</el-button>
         </div>
-      </el-drawer>
-    </template>
-  </page-layer>
+        <div class="layout_flex_1-y">
+          <!-- 这里是添加审核医嘱到表格中 -->
+          <el-table :data="tianJiaShenHe.list" height="100%">
+            <el-table-column label="患者姓名" width="70" prop="patientName"></el-table-column>
+            <el-table-column label="住院号" width="70" prop="inpatientNo"></el-table-column>
+            <el-table-column label="医嘱号" show-overflow-tooltip width="70" prop="actOrderNo"></el-table-column>
+            <el-table-column label="医嘱名称" show-overflow-tooltip prop="orderName"></el-table-column>
+            <el-table-column label="频次" prop="frequCode"></el-table-column>
+            <el-table-column label="医嘱时间" prop="orderTime"></el-table-column>
+            <el-table-column label="开始时间" prop="startTime"></el-table-column>
+            <el-table-column label="结束时间" prop="endTime"></el-table-column>
+            <el-table-column label="删除">
+              <template #default="scope">
+                <el-button type="danger" size="small" icon="Delete" @click="shanchu(scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- 这里是查看审核状态的 -->
+  <el-dialog v-model="dialogFormVisible" title="审核状态" :width="900">
+    住院号：
+    <el-input style="width: 120px" clearable @blur="shenHeInpatientNo = $event.target.value.trim()"
+              v-model="shenHeInpatientNo"></el-input>
+    医嘱号：
+    <el-input oninput="value=value.replace(/[^\d]/g,'')" style="width: 120px"
+              @blur="shenHeActOrderNo = $event.target.value.trim()" v-model="shenHeActOrderNo"></el-input>
+    <el-divider direction="vertical"></el-divider>
+    <el-button @click="queryZhuangTaiClick" type="primary">查询</el-button>
+    <el-table :data="dialogTable" :height="tableHeight - 300">
+      <el-table-column type="index"></el-table-column>
+      <el-table-column label="住院号" prop="inpatientNo"></el-table-column>
+      <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
+      <el-table-column label="审核状态">
+        <template #default="scope">
+          <span v-html="yZauditStatus(scope.row.auditFlag)"></span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请备注" show-overflow-tooltip prop="proposeRemark"></el-table-column>
+      <el-table-column label="审核人" prop="auditStaff"></el-table-column>
+      <el-table-column label="审核备注" show-overflow-tooltip prop="auditRemark"></el-table-column>
+      <el-table-column label="审核时间" width="80" prop="auditTime"></el-table-column>
+    </el-table>
+    <el-pagination
+        layout="prev, pager, next, total"
+        @current-change="shenHeXinXiCurrentChange"
+        :total="shenHeXinxiTotal"
+        :page-size="shenHeXinXiPageSize"
+        background
+    ></el-pagination>
+  </el-dialog>
+  <el-drawer v-model="danGeShenQingDrawer" title="申请修改医嘱" size="50%">
+    <div style="margin-left: 20px; width: 90%">
+      <el-descriptions border title="基本信息">
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-user"></i>
+            患者姓名
+          </template>
+          {{ danGeShenQingDrawerData.patientName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-s-order"></i>
+            住院号
+          </template>
+          {{ danGeShenQingDrawerData.inpatientNo }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-s-order"></i>
+            医嘱号
+          </template>
+          {{ danGeShenQingDrawerData.actOrderNo }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-s-claim"></i>
+            医嘱名称
+          </template>
+          {{ danGeShenQingDrawerData.orderName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-house"></i>
+            病房
+          </template>
+          {{ danGeShenQingDrawerData.wardCode }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-tickets"></i>
+            频次
+          </template>
+          {{ danGeShenQingDrawerData.frequCode }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-time"></i>
+            医嘱时间
+          </template>
+          {{ danGeShenQingDrawerData.orderTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-time"></i>
+            开始时间
+          </template>
+          {{ danGeShenQingDrawerData.startTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-time"></i>
+            结束时间
+          </template>
+          {{ danGeShenQingDrawerData.endTime }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-divider></el-divider>
+      <el-row>
+        <el-col :span="12">
+          开始时间：
+          <el-date-picker type="datetime" placeholder="修改开始时间"
+                          v-model="danGeShenQingDrawerData.newStartTime"></el-date-picker>
+        </el-col>
+        <el-col :span="12">
+          结束时间：
+          <el-date-picker type="datetime" placeholder="修改结束时间"
+                          v-model="danGeShenQingDrawerData.newEndTime"></el-date-picker>
+        </el-col>
+        <el-col :span="24">
+          <br/>
+          <el-input
+              type="textarea"
+              placeholder="申请备注"
+              maxlength="250"
+              @blur="danGeShenQingDrawerData.proposeRemark = $event.target.value.trim()"
+              show-word-limit
+              v-model="danGeShenQingDrawerData.proposeRemark"
+          ></el-input>
+        </el-col>
+      </el-row>
+      <br/>
+      <el-button type="primary" @click="danGeShenQingSubmit">提交</el-button>
+    </div>
+  </el-drawer>
 </template>
 
-<script>
+<script setup>
 import {reactive, ref} from '@vue/reactivity'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {yZauditStatus} from '@/utils/computed'
@@ -203,287 +212,245 @@ import {yzModifyApply, yzQuery, chaKanZhuangTai, danGeShenQing} from '@/api/yz-d
 import {formatDatetime} from '@/utils/date'
 import {computed} from 'vue'
 import router from '@/router'
-import PageLayer from "@/layout/PageLayer";
 import {useUserStore} from "@/pinia/user-store";
 
-export default {
-  name: 'YzActOrderModify',
-  components: {PageLayer},
-  setup() {
-    const userStore = useUserStore()
-    const tableHeight = window.innerHeight - 70
+const userStore = useUserStore()
+const tableHeight = window.innerHeight - 70
 
-    const inpatientNo = ref('')
-    const actOrderNo = ref('')
+const inpatientNo = ref('')
+const actOrderNo = ref('')
 
-    const handleCurrentChange = (val) => {
-      currentPage.value = val
-    }
+const handleCurrentChange = (val) => {
+  currentPage.value = val
+}
 
-    const currentPage = ref(1)
-    const pageSize = ref(30)
+const currentPage = ref(1)
+const pageSize = ref(30)
 
-    const zhiYin = ref(false)
+const zhiYin = ref(false)
 
-    const queryTerm = reactive({
-      actOrderNo: '',
-      inpatientNo: '',
-    })
+const queryTerm = reactive({
+  actOrderNo: '',
+  inpatientNo: '',
+})
 
-    /**
-     * 在输入医嘱的时候修值行这个方法
-     * 动态的在 returnData 这个数据里面 查找到数据
-     * 数据有变化就执行 这个方法*/
-    const cptTable = computed(() => {
-      return dataTable.value.filter((item) => {
-        return item.actOrderNo.toString().indexOf(actOrderNo.value) > -1
-      })
-    })
+/**
+ * 在输入医嘱的时候修值行这个方法
+ * 动态的在 returnData 这个数据里面 查找到数据
+ * 数据有变化就执行 这个方法*/
+const cptTable = computed(() => {
+  return dataTable.value.filter((item) => {
+    return item.actOrderNo.toString().indexOf(actOrderNo.value) > -1
+  })
+})
 
-    /**
-     * 提交修改审核
-     * 需要判断 是否选择了数据 以及修改的时间 必须填写一项
-     * 修改成功后把表格里面的值清空
-     * */
-    const tijiaoshenqing = () => {
-      if (!tianJiaShenHe.value.startTime && !tianJiaShenHe.value.endTime) {
-        ElMessage.warning({
-          title: '错误',
-          message: '至少选择一项，需要修改的时间 (^～^;)ゞ',
-          showClose: true,
-        })
-        return
-      }
-      if (tianJiaShenHe.value.list.length > 0) {
-        ElMessageBox.prompt('共有 ' + tianJiaShenHe.value.list.length + ' 条申请。', '请填写申请备注', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'info',
-          inputPattern: /\S/,
-          inputErrorMessage: '必填项不能为空,且不得超过100字 (∩•̀ω•́)⊃-*⋆',
-        })
-            .then(({value}) => {
-              tianJiaShenHe.value.proposeRemark = value
-              if (value.length > 100) {
-                ElMessage({
-                  type: ' warning',
-                  title: '错误',
-                  message: '审核备注不超过100字',
-                  showClose: true,
-                })
-              } else {
-                tianJiaShenHe.value.startTime = formatDatetime(tianJiaShenHe.value.startTime)
-                tianJiaShenHe.value.endTime = formatDatetime(tianJiaShenHe.value.endTime)
-                tianJiaShenHe.value.proposer = userStore.userInfo.code
-                yzModifyApply(tianJiaShenHe.value).then((res) => {
-                  actOrderNos.value = []
-                  tianJiaShenHe.value = {}
-                  tianJiaShenHe.value.list = []
-                })
-              }
+/**
+ * 提交修改审核
+ * 需要判断 是否选择了数据 以及修改的时间 必须填写一项
+ * 修改成功后把表格里面的值清空
+ * */
+const tijiaoshenqing = () => {
+  if (!tianJiaShenHe.value.startTime && !tianJiaShenHe.value.endTime) {
+    ElMessage.warning({
+      title: '错误',
+      message: '至少选择一项，需要修改的时间 (^～^;)ゞ',
+      showClose: true,
+    })
+    return
+  }
+  if (tianJiaShenHe.value.list.length > 0) {
+    ElMessageBox.prompt('共有 ' + tianJiaShenHe.value.list.length + ' 条申请。', '请填写申请备注', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'info',
+      inputPattern: /\S/,
+      inputErrorMessage: '必填项不能为空,且不得超过100字 (∩•̀ω•́)⊃-*⋆',
+    })
+        .then(({value}) => {
+          tianJiaShenHe.value.proposeRemark = value
+          if (value.length > 100) {
+            ElMessage({
+              type: ' warning',
+              title: '错误',
+              message: '审核备注不超过100字',
+              showClose: true,
             })
-            .catch(() => {
+          } else {
+            tianJiaShenHe.value.startTime = formatDatetime(tianJiaShenHe.value.startTime)
+            tianJiaShenHe.value.endTime = formatDatetime(tianJiaShenHe.value.endTime)
+            tianJiaShenHe.value.proposer = userStore.userInfo.code
+            yzModifyApply(tianJiaShenHe.value).then((res) => {
+              actOrderNos.value = []
+              tianJiaShenHe.value = {}
+              tianJiaShenHe.value.list = []
             })
-      } else {
-        ElMessage({
-          type: 'warning',
-          title: '错误',
-          message: '还没有选择要申请医嘱',
-          showClose: true,
+          }
         })
-      }
-    }
+        .catch(() => {
+        })
+  } else {
+    ElMessage({
+      type: 'warning',
+      title: '错误',
+      message: '还没有选择要申请医嘱',
+      showClose: true,
+    })
+  }
+}
 
-    const dialogFormVisible = ref(false)
-    const dialogTable = ref([])
+const dialogFormVisible = ref(false)
+const dialogTable = ref([])
 
-    //审核信息点击分页
-    const shenHeXinXiCurrentChange = (val) => {
-      shenHeXinXiCurrentPage.value = val
-      chaKanZhuangTai(userStore.userInfo.code, resShenHeActOrderNo, resShenHeInpatientNo, shenHeXinXiCurrentPage.value, shenHeXinXiPageSize.value).then((res) => {
-        resShenHeInpatientNo = shenHeInpatientNo.value
-        resShenHeActOrderNo = shenHeActOrderNo.value
-        dialogFormVisible.value = true
-        shenHeXinxiTotal.value = res.total
-        dialogTable.value = res.data
-      })
-    }
+//审核信息点击分页
+const shenHeXinXiCurrentChange = (val) => {
+  shenHeXinXiCurrentPage.value = val
+  chaKanZhuangTai(userStore.userInfo.code, resShenHeActOrderNo, resShenHeInpatientNo, shenHeXinXiCurrentPage.value, shenHeXinXiPageSize.value).then((res) => {
+    resShenHeInpatientNo = shenHeInpatientNo.value
+    resShenHeActOrderNo = shenHeActOrderNo.value
+    dialogFormVisible.value = true
+    shenHeXinxiTotal.value = res.total
+    dialogTable.value = res.data
+  })
+}
 
-    const shenHeXinxiTotal = ref(0)
-    const shenHeXinXiPageSize = ref(10)
-    const shenHeXinXiCurrentPage = ref(1)
+const shenHeXinxiTotal = ref(0)
+const shenHeXinXiPageSize = ref(10)
+const shenHeXinXiCurrentPage = ref(1)
 
-    // 审核信息中 查询修改的数据
-    const shenHeInpatientNo = ref('')
-    const shenHeActOrderNo = ref('')
+// 审核信息中 查询修改的数据
+const shenHeInpatientNo = ref('')
+const shenHeActOrderNo = ref('')
 
-    let resShenHeInpatientNo = ''
-    let resShenHeActOrderNo = ''
+let resShenHeInpatientNo = ''
+let resShenHeActOrderNo = ''
 
-    /**
-     * 点击查看 申请的状态
-     */
-    const chakan = () => {
-      chaKanZhuangTai(userStore.userInfo.code, resShenHeActOrderNo, resShenHeInpatientNo, shenHeXinXiCurrentPage.value, shenHeXinXiPageSize.value).then((res) => {
-        dialogFormVisible.value = true
-        shenHeXinxiTotal.value = res.total
-        dialogTable.value = res.data
-      })
-    }
-    //根据条件查询
-    const queryZhuangTaiClick = () => {
-      chaKanZhuangTai(userStore.userInfo.code, shenHeActOrderNo.value, shenHeInpatientNo.value, shenHeXinXiCurrentPage.value, shenHeXinXiPageSize.value).then((res) => {
-        resShenHeInpatientNo = shenHeInpatientNo.value
-        resShenHeActOrderNo = shenHeActOrderNo.value
-        dialogFormVisible.value = true
-        shenHeXinxiTotal.value = res.total
-        dialogTable.value = res.data
-      })
-    }
+/**
+ * 点击查看 申请的状态
+ */
+const chakan = () => {
+  chaKanZhuangTai(userStore.userInfo.code, resShenHeActOrderNo, resShenHeInpatientNo, shenHeXinXiCurrentPage.value, shenHeXinXiPageSize.value).then((res) => {
+    dialogFormVisible.value = true
+    shenHeXinxiTotal.value = res.total
+    dialogTable.value = res.data
+  })
+}
+//根据条件查询
+const queryZhuangTaiClick = () => {
+  chaKanZhuangTai(userStore.userInfo.code, shenHeActOrderNo.value, shenHeInpatientNo.value, shenHeXinXiCurrentPage.value, shenHeXinXiPageSize.value).then((res) => {
+    resShenHeInpatientNo = shenHeInpatientNo.value
+    resShenHeActOrderNo = shenHeActOrderNo.value
+    dialogFormVisible.value = true
+    shenHeXinxiTotal.value = res.total
+    dialogTable.value = res.data
+  })
+}
 
-    //返回数据到页面中
-    const dataTable = ref([])
+//返回数据到页面中
+const dataTable = ref([])
 
-    //执行添加医嘱 到 表格中
-    const tianJiaShenHe = ref({
-      list: [],
-      startTime: '',
-      endTime: '',
-      proposeRemark: '',
-      proposer: '',
-    })
+//执行添加医嘱 到 表格中
+const tianJiaShenHe = ref({
+  list: [],
+  startTime: '',
+  endTime: '',
+  proposeRemark: '',
+  proposer: '',
+})
 
-    //一个用来保存 需要修改的医嘱的数组
-    const actOrderNos = ref([])
-    /**
-     * 点击添加把选中的数据添加到新的数据里面并显示到页面中
-     * 不可以重复的添加
-     */
-    const tianjia = (val) => {
-      if (actOrderNos.value.indexOf(val.actOrderNo) > -1) {
-        ElMessage({
-          title: '失败',
-          message: '请勿重复添加 ( *￣▽￣)o ─═≡※:☆',
-          type: 'warning',
-          showClose: true,
-        })
-      } else {
-        actOrderNos.value.push(val.actOrderNo)
-        tianJiaShenHe.value.list.push(val)
-      }
-    }
+//一个用来保存 需要修改的医嘱的数组
+const actOrderNos = ref([])
+/**
+ * 点击添加把选中的数据添加到新的数据里面并显示到页面中
+ * 不可以重复的添加
+ */
+const tianjia = (val) => {
+  if (actOrderNos.value.indexOf(val.actOrderNo) > -1) {
+    ElMessage({
+      title: '失败',
+      message: '请勿重复添加 ( *￣▽￣)o ─═≡※:☆',
+      type: 'warning',
+      showClose: true,
+    })
+  } else {
+    actOrderNos.value.push(val.actOrderNo)
+    tianJiaShenHe.value.list.push(val)
+  }
+}
 
-    //删除申请表格里面的数据
-    const shanchu = (index) => {
-      tianJiaShenHe.value.list.splice(index, 1)
-      actOrderNos.value.splice(index, 1)
-    }
-    //调用通知
-    const choice = () => {
-      ElMessage({
-        type: 'warning',
-        message: '至少填写一项,要修改的时间',
-        showClose: true,
-        duration: 2000,
+//删除申请表格里面的数据
+const shanchu = (index) => {
+  tianJiaShenHe.value.list.splice(index, 1)
+  actOrderNos.value.splice(index, 1)
+}
+//调用通知
+const choice = () => {
+  ElMessage({
+    type: 'warning',
+    message: '至少填写一项,要修改的时间',
+    showClose: true,
+    duration: 2000,
+  })
+}
+/**
+ * 查询数据
+ * 通过住院号和医嘱号 查找，住院号是必填的
+ * */
+const query = () => {
+  if (!inpatientNo.value) {
+    ElMessage({
+      type: 'warning',
+      message: '住院号必填',
+      showClose: true,
+      duration: 2000,
+    })
+    return
+  }
+  queryTerm.actOrderNo = actOrderNo.value
+  queryTerm.inpatientNo = inpatientNo.value
+  yzQuery(queryTerm)
+      .then((res) => {
+        dataTable.value = res
       })
-    }
-    /**
-     * 查询数据
-     * 通过住院号和医嘱号 查找，住院号是必填的
-     * */
-    const query = () => {
-      if (!inpatientNo.value) {
-        ElMessage({
-          type: 'warning',
-          message: '住院号必填',
-          showClose: true,
-          duration: 2000,
-        })
-        return
-      }
-      queryTerm.actOrderNo = actOrderNo.value
-      queryTerm.inpatientNo = inpatientNo.value
-      yzQuery(queryTerm)
-          .then((res) => {
-            dataTable.value = res
-          })
-          .catch(() => {
-            dataTable.value = []
-          })
-    }
-    /**
-     * 单个修改医嘱
-     */
-    const danGeShenQingDrawer = ref(false)
-    const danGeShenQingClick = (val) => {
-      danGeShenQingDrawer.value = true
-      danGeShenQingDrawerData.value = val
-    }
-
-    const danGeShenQingDrawerData = ref()
-
-    const danGeShenQingSubmit = () => {
-      if (!danGeShenQingDrawerData.value.newStartTime && !danGeShenQingDrawerData.value.newEndTime) {
-        choice()
-        return
-      } else if (!danGeShenQingDrawerData.value.proposeRemark) {
-        ElMessage({
-          type: 'warning',
-          message: '申请备注不能为空',
-          showClose: true,
-          duration: 2500,
-        })
-        return
-      }
-      danGeShenQingDrawerData.value.newStartTime = formatDatetime(danGeShenQingDrawerData.value.newStartTime)
-      danGeShenQingDrawerData.value.newEndTime = formatDatetime(danGeShenQingDrawerData.value.newEndTime)
-      danGeShenQing(danGeShenQingDrawerData.value).then((res) => {
-        danGeShenQingDrawer.value = false
+      .catch(() => {
+        dataTable.value = []
       })
-    }
+}
+/**
+ * 单个修改医嘱
+ */
+const danGeShenQingDrawer = ref(false)
+const danGeShenQingClick = (val) => {
+  danGeShenQingDrawer.value = true
+  danGeShenQingDrawerData.value = val
+}
 
-    onActivated(() => {
-      let patNo = router.currentRoute.value.query.patNo
-      if (patNo) {
-        inpatientNo.value = patNo
-        query()
-      }
-    })
+const danGeShenQingDrawerData = ref()
 
-    return {
-      actOrderNo,
-      inpatientNo,
-      query,
-      tableHeight,
-      queryTerm,
-      handleCurrentChange,
-      dataTable,
-      currentPage,
-      pageSize,
-      tijiaoshenqing,
-      chakan,
-      dialogFormVisible,
-      dialogTable,
-      yZauditStatus,
-      tianjia,
-      tianJiaShenHe,
-      shanchu,
-      cptTable,
-      zhiYin,
-      danGeShenQingClick,
-      danGeShenQingDrawer,
-      danGeShenQingDrawerData,
-      danGeShenQingSubmit,
-      shenHeXinXiCurrentChange,
-      shenHeXinxiTotal,
-      shenHeXinXiPageSize,
-      shenHeXinXiCurrentPage,
-      shenHeInpatientNo,
-      shenHeActOrderNo,
-      queryZhuangTaiClick,
-    }
-  },
+const danGeShenQingSubmit = () => {
+  if (!danGeShenQingDrawerData.value.newStartTime && !danGeShenQingDrawerData.value.newEndTime) {
+    choice()
+    return
+  } else if (!danGeShenQingDrawerData.value.proposeRemark) {
+    ElMessage({
+      type: 'warning',
+      message: '申请备注不能为空',
+      showClose: true,
+      duration: 2500,
+    })
+    return
+  }
+  danGeShenQingDrawerData.value.newStartTime = formatDatetime(danGeShenQingDrawerData.value.newStartTime)
+  danGeShenQingDrawerData.value.newEndTime = formatDatetime(danGeShenQingDrawerData.value.newEndTime)
+  danGeShenQing(danGeShenQingDrawerData.value).then((res) => {
+    danGeShenQingDrawer.value = false
+  })
 }
-</script>
 
-<style></style>
+onActivated(() => {
+  let patNo = router.currentRoute.value.query.patNo
+  if (patNo) {
+    inpatientNo.value = patNo
+    query()
+  }
+})
+</script>

src/views/data-modify/YzActOrderModifyVerify.vue

@@ -1,266 +1,281 @@
 <template>
-  <page-layer>
-    <template #header>
-      <el-input size="small" placeholder="在此输入住院号" @keyup.enter="query" v-model="inpatientNo" clearable prefix-icon="Search" style="width: 300px">
+  <div class="layout_display_flex_y">
+    <div>
+      <el-input size="small" placeholder="在此输入住院号" @keyup.enter="query" v-model="inpatientNo" clearable
+                prefix-icon="Search" style="width: 300px">
         <template #prepend>住院号</template>
       </el-input>
-      <el-input size="small" placeholder="在此输入医嘱号" @keyup.enter="query" v-model="actOrderNo" clearable prefix-icon="Search" style="width: 300px">
+      <el-input size="small" placeholder="在此输入医嘱号" @keyup.enter="query" v-model="actOrderNo" clearable
+                prefix-icon="Search" style="width: 300px">
         <template #prepend>医嘱号</template>
       </el-input>
-      <el-select size="small" v-model="auditFlag" @change="query" placeholder="审核状态">
+      <el-select size="small"
+                 v-model="auditFlag"
+                 @change="query"
+                 style="width: 120px"
+                 placeholder="审核状态">
         <el-option v-for="item in yzZhuangTai" :key="item.code" :label="item.name" :value="item.code"></el-option>
       </el-select>
       <el-button type="primary" icon="Search" @click="query">查询</el-button>
       <el-button type="primary" icon="RefreshLeft" @click="query">刷新数据</el-button>
-    </template>
-    <template #aside>
-      <el-table :height="tableHeight" stripe highlight-current-row :data="cptTable" style="text-align: center" @row-click="clickRow" empty-text="暂无申请">
-        <el-table-column label="住院号" width="60" prop="inpatientNo"> </el-table-column>
-        <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
-        <el-table-column label="医嘱名称" show-overflow-tooltip prop="orderName"> </el-table-column>
-        <el-table-column label="审核状态">
-          <template #default="scope">
-            <span v-html="yZauditStatus(scope.row.auditFlag)"></span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-          @current-change="handleCurrentChange"
-          :page-size="queryTerm.pageSize"
-          :current-page="queryTerm.currentPage"
-          background
-          small
-          style="background-color: white"
-          layout="prev, pager, next,total"
-          :total="queryTerm.total"
-      >
-      </el-pagination>
-    </template>
-    <template #main>
-      <el-alert title="申请修改的数据为空，默认不会修改。" type="success" effect="dark" close-text="了解"></el-alert>
-      <el-descriptions border title="原数据">
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-user"></i>
-            患者姓名
-          </template>
-          {{ dataDetails.patientName }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-s-order"></i>
-            住院号
-          </template>
-          {{ dataDetails.inpatientNo }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-s-order"></i>
-            医嘱号
-          </template>
-          {{ dataDetails.actOrderNo }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-s-claim"></i>
-            医嘱名称
-          </template>
-          {{ dataDetails.orderName }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-house"></i>
-            病房
-          </template>
-          {{ dataDetails.wardCode }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-tickets"></i>
-            频次
-          </template>
-          {{ dataDetails.frequCode }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-time"></i>
-            开始时间
-          </template>
-          {{ dataDetails.startTime }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-time"></i>
-            结束时间
-          </template>
-          {{ dataDetails.endTime }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <el-divider></el-divider>
-      <el-descriptions title="申请修改数据" border direction="vertical">
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-user"></i>
-            申请人
-          </template>
-          {{ dataDetails.proposerName }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-time"></i>
-            申请时间
-          </template>
-          {{ dataDetails.proposeTime }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-s-claim"></i>
-            申请备注
-          </template>
-          {{ dataDetails.proposeRemark }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-time"></i>
-            开始时间
-          </template>
-          {{ dataDetails.newStartTime }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label>
-            <i class="el-icon-time"></i>
-            结束时间
-          </template>
-          {{ dataDetails.newEndTime }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <br />
-      <el-row v-if="dataDetails.actOrderNo">
-        <el-col :span="2">
-          <el-button type="success" size="small" icon="Check" @click="tongGuo">通过</el-button>
-        </el-col>
-        <el-col :span="2">
-          <el-button type="danger" size="small" icon="Check" @click="boHui">驳回</el-button>
-        </el-col>
-        <el-col :span="2">
-          <el-button type="warning" size="small" icon="RefreshLeft" @click="huiChe">撤回</el-button>
-        </el-col>
-      </el-row>
-    </template>
-  </page-layer>
-</template>
+    </div>
 
-<script>
-import { reactive, ref } from '@vue/reactivity'
-import { yzZhuangTai } from '@/data/index'
-import { yZauditStatus } from '@/utils/computed'
-import { chaKanZhuangTai, shenHePanDuan, shenHeXinXi } from '@/api/yz-data-mod/yz-xiugai-shenhe'
-import { computed, onActivated } from 'vue'
-import { ElMessageBox, ElNotification } from 'element-plus'
-import PageLayer from "@/layout/PageLayer";
-export default {
-  name: 'YzActOrderModifyVerify',
-  components: {PageLayer},
-  setup() {
-    const tableHeight = window.innerHeight - 70
+    <div class="layout_flex_1-y layout_display_flex">
+      <div style="width: 220px" class="layout_display_flex_y">
+        <div class="layout_flex_1-y">
+          <el-table height="100%"
+                    stripe
+                    highlight-current-row
+                    :data="cptTable"
+                    style="text-align: center"
+                    @row-click="clickRow" empty-text="暂无申请">
+            <el-table-column label="住院号" width="60" prop="inpatientNo"></el-table-column>
+            <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
+            <el-table-column label="医嘱名称" show-overflow-tooltip prop="orderName"></el-table-column>
+            <el-table-column label="审核状态">
+              <template #default="scope">
+                <span v-html="yZauditStatus(scope.row.auditFlag)"></span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div>
+          <el-pagination
+              @current-change="handleCurrentChange"
+              :page-size="queryTerm.pageSize"
+              :current-page="queryTerm.currentPage"
+              background
+              small
+              style="background-color: white"
+              layout="prev, pager, next,total"
+              :total="queryTerm.total"
+          >
+          </el-pagination>
+        </div>
+      </div>
 
-    const actOrderNo = ref('')
-    const inpatientNo = ref('')
-    const auditFlag = ref('1')
+      <div class="layout_flex_1-x ">
+        <el-alert title="申请修改的数据为空，默认不会修改。"
+                  type="warning" close-text="了解"/>
+        <el-descriptions border title="原数据">
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-user"></i>
+              患者姓名
+            </template>
+            {{ dataDetails.patientName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-s-order"></i>
+              住院号
+            </template>
+            {{ dataDetails.inpatientNo }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-s-order"></i>
+              医嘱号
+            </template>
+            {{ dataDetails.actOrderNo }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-s-claim"></i>
+              医嘱名称
+            </template>
+            {{ dataDetails.orderName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-house"></i>
+              病房
+            </template>
+            {{ dataDetails.wardCode }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-tickets"></i>
+              频次
+            </template>
+            {{ dataDetails.frequCode }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-time"></i>
+              开始时间
+            </template>
+            {{ dataDetails.startTime }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-time"></i>
+              结束时间
+            </template>
+            {{ dataDetails.endTime }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-divider></el-divider>
+        <el-descriptions title="申请修改数据" border direction="vertical">
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-user"></i>
+              申请人
+            </template>
+            {{ dataDetails.proposerName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-time"></i>
+              申请时间
+            </template>
+            {{ dataDetails.proposeTime }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-s-claim"></i>
+              申请备注
+            </template>
+            {{ dataDetails.proposeRemark }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-time"></i>
+              开始时间
+            </template>
+            {{ dataDetails.newStartTime }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label>
+              <i class="el-icon-time"></i>
+              结束时间
+            </template>
+            {{ dataDetails.newEndTime }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <br/>
+        <el-row v-if="dataDetails.actOrderNo">
+          <el-col :span="2">
+            <el-button type="success" size="small" icon="Check" @click="tongGuo">通过</el-button>
+          </el-col>
+          <el-col :span="2">
+            <el-button type="danger" size="small" icon="Check" @click="boHui">驳回</el-button>
+          </el-col>
+          <el-col :span="2">
+            <el-button type="warning" size="small" icon="RefreshLeft" @click="huiChe">撤回</el-button>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+  </div>
+</template>
 
-    const handleCurrentChange = (val) => {
-      queryTerm.currentPage = val
-      tijiao()
-    }
+<script setup>
+import {reactive, ref} from 'vue'
+import {yzZhuangTai} from '@/data/index'
+import {yZauditStatus} from '@/utils/computed'
+import {chaKanZhuangTai, shenHePanDuan, shenHeXinXi} from '@/api/yz-data-mod/yz-xiugai-shenhe'
+import {computed, onActivated} from 'vue'
+import {ElMessageBox, ElNotification} from 'element-plus'
 
-    const queryTerm = reactive({
-      actOrderNo: '',
-      inpatientNo: '',
-      auditFlag: 1,
-      currentPage: 1,
-      pageSize: 30,
-      total: 0,
-    })
 
-    const cptTable = computed(() => {
-      return dataTable.value.filter((item) => {
-        return item.actOrderNo.toString().indexOf(actOrderNo.value) > -1
-      })
-    })
+const actOrderNo = ref('')
+const inpatientNo = ref('')
+const auditFlag = ref('1')
 
-    const tijiao = () => {
-      dataDetails.value = []
-      chaKanZhuangTai(queryTerm)
-        .then((res) => {
-          dataTable.value = res.records
-          queryTerm.total = res.total
-        })
-        .catch(() => {
-          dataTable.value = []
-        })
-    }
+const handleCurrentChange = (val) => {
+  queryTerm.currentPage = val
+  tijiao()
+}
 
-    /**
-     * 用来存放右边 表格的数据
-     */
-    const dataTable = ref([])
-    /**
-     * 用来 存放点击表格后获取的具体信息
-     */
-    const dataDetails = ref([])
+const queryTerm = reactive({
+  actOrderNo: '',
+  inpatientNo: '',
+  auditFlag: 1,
+  currentPage: 1,
+  pageSize: 30,
+  total: 0,
+})
 
-    //点击 表格时触发
-    const clickRow = (row) => {
-      shenHeXinXi(row.actOrderNo).then((res) => {
-        dataDetails.value = res
+const cptTable = computed(() => {
+  return dataTable.value.filter((item) => {
+    return item.actOrderNo.toString().indexOf(actOrderNo.value) > -1
+  })
+})
+
+const tijiao = () => {
+  dataDetails.value = []
+  chaKanZhuangTai(queryTerm)
+      .then((res) => {
+        dataTable.value = res.records
+        queryTerm.total = res.total
+      })
+      .catch(() => {
+        dataTable.value = []
       })
-    }
+}
 
-    const query = () => {
-      queryTerm.actOrderNo = actOrderNo.value
-      queryTerm.inpatientNo = inpatientNo.value
-      queryTerm.auditFlag = auditFlag.value
-      tijiao()
-    }
+/**
+ * 用来存放右边 表格的数据
+ */
+const dataTable = ref([])
+/**
+ * 用来 存放点击表格后获取的具体信息
+ */
+const dataDetails = ref([])
 
-    /**
-     * 页面初始化化就 执行查询未提交的信息
-     * 以及判断是否有超过五条的数据
-     */
-    onActivated(() => {
-      tijiao()
-    })
+//点击 表格时触发
+const clickRow = (row) => {
+  shenHeXinXi(row.actOrderNo).then((res) => {
+    dataDetails.value = res
+  })
+}
 
-    const tongGuo = () => {
-      switch (dataDetails.value.auditFlag) {
-        case 2:
-          return ElNotification({
-            type: 'error',
-            title: '失败',
-            message: '审核已通过请勿重复点击 （＃￣～￣＃）',
-          })
-        case 3:
-          return ElNotification({
-            type: 'error',
-            title: '失败',
-            message: '审核已驳回请重新申请 （＃￣～￣＃）',
-          })
-        case 4:
-          return ElNotification({
-            type: 'error',
-            title: '失败',
-            message: '审核已回撤请重新申请 （＃￣～￣＃）',
-          })
-      }
+const query = () => {
+  queryTerm.actOrderNo = actOrderNo.value
+  queryTerm.inpatientNo = inpatientNo.value
+  queryTerm.auditFlag = auditFlag.value
+  tijiao()
+}
 
-      ElMessageBox.confirm('请认真核对是否通过审核', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'success',
+/**
+ * 页面初始化化就 执行查询未提交的信息
+ * 以及判断是否有超过五条的数据
+ */
+onActivated(() => {
+  tijiao()
+})
+
+const tongGuo = () => {
+  switch (dataDetails.value.auditFlag) {
+    case 2:
+      return ElNotification({
+        type: 'error',
+        title: '失败',
+        message: '审核已通过请勿重复点击 （＃￣～￣＃）',
+      })
+    case 3:
+      return ElNotification({
+        type: 'error',
+        title: '失败',
+        message: '审核已驳回请重新申请 （＃￣～￣＃）',
+      })
+    case 4:
+      return ElNotification({
+        type: 'error',
+        title: '失败',
+        message: '审核已回撤请重新申请 （＃￣～￣＃）',
       })
-        .then(() => {
-          dataDetails.value.auditRemark = '审核通过  ㄟ(≧◇≦)ㄏ'
-          shenHePanDuan(2, dataDetails.value.actOrderNo, dataDetails.value.auditRemark)
+  }
+
+  ElMessageBox.confirm('请认真核对是否通过审核', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'success',
+  })
+      .then(() => {
+        dataDetails.value.auditRemark = '审核通过  ㄟ(≧◇≦)ㄏ'
+        shenHePanDuan(2, dataDetails.value.actOrderNo, dataDetails.value.auditRemark)
             .then((res) => {
               dataDetails.value = []
               tijiao()
@@ -268,107 +283,90 @@ export default {
             .catch(() => {
               tijiao()
             })
-        })
-        .catch(() => {})
-    }
-
-    const boHui = () => {
-      switch (dataDetails.value.auditFlag) {
-        case 3:
-          return ElNotification({
-            type: 'error',
-            message: '审核已驳回请勿重复点击  (* ￣︿￣)',
-            title: '失败',
-          })
-        case 2:
-          return ElNotification({
-            type: 'error',
-            dangerouslyUseHTMLString: true,
-            message: '<p>审核已通过无法驳回</p><p>霸特您能撤回 ╮(﹀_﹀”)╭</p>',
-            title: '失败',
-          })
-        case 4:
-          return ElNotification({
-            type: 'error',
-            title: '失败',
-            message: '审核已回撤请重新申请 （＃￣～￣＃）',
-          })
-      }
+      })
+      .catch(() => {
+      })
+}
 
-      ElMessageBox.prompt('审核备注,必填', '驳回原因', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+const boHui = () => {
+  switch (dataDetails.value.auditFlag) {
+    case 3:
+      return ElNotification({
         type: 'error',
-        inputPattern: /\S/,
-        inputErrorMessage: '为什么驳回 ヽ（≧□≦）ノ',
+        message: '审核已驳回请勿重复点击  (* ￣︿￣)',
+        title: '失败',
       })
-        .then(({ value }) => {
-          dataDetails.value.auditRemark = value
-          shenHePanDuan(3, dataDetails.value.actOrderNo, dataDetails.value.auditRemark).then((res) => {
-            dataDetails.value = []
-            tijiao()
-          })
-        })
-        .catch(() => {})
-    }
+    case 2:
+      return ElNotification({
+        type: 'error',
+        dangerouslyUseHTMLString: true,
+        message: '<p>审核已通过无法驳回</p><p>霸特您能撤回 ╮(﹀_﹀”)╭</p>',
+        title: '失败',
+      })
+    case 4:
+      return ElNotification({
+        type: 'error',
+        title: '失败',
+        message: '审核已回撤请重新申请 （＃￣～￣＃）',
+      })
+  }
 
-    const huiChe = () => {
-      switch (dataDetails.value.auditFlag) {
-        case 1:
-          return ElNotification({
-            type: 'error',
-            title: '失败',
-            message: '都没有审核回撤什么 o_O???',
-          })
-        case 3:
-          return ElNotification({
-            type: 'error',
-            message: '数据已经驳回无法回撤 ╮(﹀_﹀”)╭',
-            title: '失败',
-          })
-        case 4:
-          return ElNotification({
-            type: 'error',
-            message: '近期已回撤无法再次回撤 ╮(﹀_﹀”)╭',
-            title: '失败',
-          })
-      }
+  ElMessageBox.prompt('审核备注,必填', '驳回原因', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'error',
+    inputPattern: /\S/,
+    inputErrorMessage: '为什么驳回 ヽ（≧□≦）ノ',
+  })
+      .then(({value}) => {
+        dataDetails.value.auditRemark = value
+        shenHePanDuan(3, dataDetails.value.actOrderNo, dataDetails.value.auditRemark).then((res) => {
+          dataDetails.value = []
+          tijiao()
+        })
+      })
+      .catch(() => {
+      })
+}
 
-      ElMessageBox.prompt('是否回撤到原数据', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        inputPattern: /\S/,
-        inputErrorMessage: '回撤原因 ヽ（≧□≦）ノ',
+const huiChe = () => {
+  switch (dataDetails.value.auditFlag) {
+    case 1:
+      return ElNotification({
+        type: 'error',
+        title: '失败',
+        message: '都没有审核回撤什么 o_O???',
       })
-        .then(({ value }) => {
-          dataDetails.value.auditRemark = value
-          shenHePanDuan(4, dataDetails.value.actOrderNo, dataDetails.value.auditRemark).then((res) => {
-            dataDetails.value = []
-            query()
-          })
-        })
-        .catch(() => {})
-    }
+    case 3:
+      return ElNotification({
+        type: 'error',
+        message: '数据已经驳回无法回撤 ╮(﹀_﹀”)╭',
+        title: '失败',
+      })
+    case 4:
+      return ElNotification({
+        type: 'error',
+        message: '近期已回撤无法再次回撤 ╮(﹀_﹀”)╭',
+        title: '失败',
+      })
+  }
 
-    return {
-      actOrderNo,
-      inpatientNo,
-      query,
-      tableHeight,
-      queryTerm,
-      handleCurrentChange,
-      cptTable,
-      clickRow,
-      dataDetails,
-      yZauditStatus,
-      yzZhuangTai,
-      auditFlag,
-      tongGuo,
-      huiChe,
-      boHui,
-    }
-  },
+  ElMessageBox.prompt('是否回撤到原数据', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+    inputPattern: /\S/,
+    inputErrorMessage: '回撤原因 ヽ（≧□≦）ノ',
+  })
+      .then(({value}) => {
+        dataDetails.value.auditRemark = value
+        shenHePanDuan(4, dataDetails.value.actOrderNo, dataDetails.value.auditRemark).then((res) => {
+          dataDetails.value = []
+          query()
+        })
+      })
+      .catch(() => {
+      })
 }
 </script>
 

src/views/data-modify/ZyChargeFeeModify.vue

@@ -1,131 +1,130 @@
 <template>
-  <page-layer>
-    <template #header>
-      <el-input size="small" placeholder="在此输入住院号" @keyup.enter="query()" v-model="inpatientNo" clearable prefix-icon="Search" style="width: 300px">
+  <div class="layout_display_flex_y">
+    <div>
+      <el-input size="small" placeholder="在此输入住院号" @keyup.enter="query()" v-model="inpatientNo" clearable
+                prefix-icon="Search" style="width: 300px">
         <template #prepend>住院号</template>
       </el-input>
-      <el-input size="small" placeholder="输入收费项目码" @keyup.enter="query()" v-model="chargeCodeMx" clearable prefix-icon="Search" style="width: 300px">
+      <el-input size="small" placeholder="输入收费项目码" @keyup.enter="query()" v-model="chargeCodeMx" clearable
+                prefix-icon="Search" style="width: 300px">
         <template #prepend>收费项目码</template>
       </el-input>
       <el-divider direction="vertical"></el-divider>
       <el-button type="primary" icon="Search" @click="query">查询</el-button>
-    </template>
-    <template #main>
-      <el-table :data="data.list" :height="tableHeight" stripe highlight-current-row>
-        <el-table-column prop="opIdCode" fixed label="操作人员"></el-table-column>
-        <el-table-column fixed label="描述">
-          <template #default="scope">
-            {{ describe(scope.row.serial) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="chargeCode" fixed width="100" show-overflow-tooltip label="药品/项目"></el-table-column>
-        <el-table-column width="50" label="金额">
-          <template #default="scope">
-            <span v-if="scope.row.chargeFee > 0" style="color: blue">{{ scope.row.chargeFee }}￥</span>
-            <span v-else style="color: red">{{ scope.row.chargeFee }} ￥</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="chargeAmount" width="50" label="数量"></el-table-column>
-        <el-table-column width="50" label="状态">
-          <template #default="socpe">
-            {{ costState(socpe.row.chargeStatus) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="admissTimes" width="50" label="住院次数"></el-table-column>
-        <el-table-column prop="chargeDate" sortable width="80" label="收费日期"></el-table-column>
-        <el-table-column prop="deptCode" label="科室"></el-table-column>
-        <el-table-column prop="detailSn" width="50" label="流水号"></el-table-column>
-        <el-table-column prop="execUnit" show-overflow-tooltip label="执行科室"></el-table-column>
-        <el-table-column prop="genTime" sortable width="80" label="系统时间"></el-table-column>
-        <el-table-column width="50" label="是否为婴儿">
-          <template #default="socpe">
-            {{ babyOrNot(socpe.row.infantFlag) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="ledgerSn" width="50" label="结算次数"></el-table-column>
-        <el-table-column prop="orderNo" label="医嘱号"></el-table-column>
-        <el-table-column width="50" label="是否自费">
-          <template #default="socpe">
-            {{ aerYouSure(socpe.row.selfFlag) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="wardCode" show-overflow-tooltip label="病房"></el-table-column>
-        <el-table-column label="修改金额" width="60">
-          <template #default="scope">
-            <el-button text @click="tijiao(scope.row)" size="small" type="warning">修改</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-          v-show="data.list.length"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="searchCriteria.currentPage"
-          :page-sizes="[20, 30, 40, 50, 100]"
-          :page-size="searchCriteria.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="data.totalSize"
-          style="margin-top: 5px"
-      ></el-pagination>
-    </template>
-  </page-layer>
+    </div>
+    <div class="layout_flex_1-y layout_display_flex_y">
+      <div class="layout_flex_1-y">
+        <el-table :data="data.list" height="100%" stripe highlight-current-row>
+          <el-table-column prop="opIdCode" fixed label="操作人员"></el-table-column>
+          <el-table-column fixed label="描述">
+            <template #default="scope">
+              {{ describe(scope.row.serial) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="chargeCode" fixed width="100" show-overflow-tooltip
+                           label="药品/项目"></el-table-column>
+          <el-table-column width="50" label="金额">
+            <template #default="scope">
+              <span v-if="scope.row.chargeFee > 0" style="color: blue">{{ scope.row.chargeFee }}￥</span>
+              <span v-else style="color: red">{{ scope.row.chargeFee }} ￥</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="chargeAmount" width="50" label="数量"></el-table-column>
+          <el-table-column width="50" label="状态">
+            <template #default="socpe">
+              {{ costState(socpe.row.chargeStatus) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="admissTimes" width="50" label="住院次数"></el-table-column>
+          <el-table-column prop="chargeDate" sortable width="80" label="收费日期"></el-table-column>
+          <el-table-column prop="deptCode" label="科室"></el-table-column>
+          <el-table-column prop="detailSn" width="50" label="流水号"></el-table-column>
+          <el-table-column prop="execUnit" show-overflow-tooltip label="执行科室"></el-table-column>
+          <el-table-column prop="genTime" sortable width="80" label="系统时间"></el-table-column>
+          <el-table-column width="50" label="是否为婴儿">
+            <template #default="socpe">
+              {{ babyOrNot(socpe.row.infantFlag) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="ledgerSn" width="50" label="结算次数"></el-table-column>
+          <el-table-column prop="orderNo" label="医嘱号"></el-table-column>
+          <el-table-column width="50" label="是否自费">
+            <template #default="socpe">
+              {{ aerYouSure(socpe.row.selfFlag) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="wardCode" show-overflow-tooltip label="病房"></el-table-column>
+          <el-table-column label="修改金额" width="60">
+            <template #default="scope">
+              <el-button text @click="tijiao(scope.row)" size="small" type="warning">修改</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="searchCriteria.currentPage"
+            :page-sizes="[20, 30, 40, 50, 100]"
+            :page-size="searchCriteria.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="data.totalSize"
+        ></el-pagination>
+      </div>
+    </div>
+  </div>
 </template>
 
-<script>
-import { reactive, ref } from '@vue/reactivity'
-import { queryHospitalizationExpenses, totalModify } from '@/api/yz-data-mod/zy-charge-fee-modify'
-import { ElMessageBox, ElMessage, ElNotification } from 'element-plus'
-import { describe, costState, aerYouSure, babyOrNot } from '@/utils/computed'
-import PageLayer from "@/layout/PageLayer";
+<script setup>
+import {reactive, ref} from 'vue'
+import {queryHospitalizationExpenses, totalModify} from '@/api/yz-data-mod/zy-charge-fee-modify'
+import {ElMessageBox, ElMessage, ElNotification} from 'element-plus'
+import {describe, costState, aerYouSure, babyOrNot} from '@/utils/computed'
 
-export default {
-  name: 'ZyChargeFeeModify',
-  components: {PageLayer},
-  setup() {
-    const tableHeight = window.innerHeight - 100 //获取宽度
+const searchCriteria = reactive({
+  pageSize: 30,
+  currentPage: 1,
+  inpatientNo: '',
+  chargeCodeMx: '',
+})
 
-    const searchCriteria = reactive({
-      pageSize: 30,
-      currentPage: 1,
-      inpatientNo: '',
-      chargeCodeMx: '',
-    })
-
-    const inpatientNo = ref('')
-    const chargeCodeMx = ref('')
-    const handleSizeChange = (val) => {
-      searchCriteria.pageSize = val
-      query()
-    }
-    const handleCurrentChange = (val) => {
-      searchCriteria.currentPage = val
-      query()
-    }
+const inpatientNo = ref('')
+const chargeCodeMx = ref('')
+const handleSizeChange = (val) => {
+  searchCriteria.pageSize = val
+  query()
+}
+const handleCurrentChange = (val) => {
+  searchCriteria.currentPage = val
+  query()
+}
 
-    const data = reactive({
-      list: [],
-      data: '',
-    })
+const data = reactive({
+  list: [],
+  data: '',
+  totalSize: 0
+})
 
-    const tijiao = (val) => {
-      ElMessageBox.prompt('输入修改金额', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputPattern: /^[-\+]?\d{0,8}\.{0,1}(\d{1,2})?$/,
-        inputErrorMessage: '请输入正确的金额',
-        inputValue: String(val.chargeFee),
-      })
-        .then(({ value }) => {
-          if (value === String(val.chargeFee)) {
-            ElNotification.info({
-              message: '数据没有变化，无需修改',
-            })
-            retuen
-          }
+const tijiao = (val) => {
+  ElMessageBox.prompt('输入修改金额', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    inputPattern: /^[-\+]?\d{0,8}\.{0,1}(\d{1,2})?$/,
+    inputErrorMessage: '请输入正确的金额',
+    inputValue: String(val.chargeFee),
+  })
+      .then(({value}) => {
+        if (value === String(val.chargeFee)) {
+          ElNotification.info({
+            message: '数据没有变化，无需修改',
+          })
+          retuen
+        }
 
-          data.data = val
-          data.data.newChargeFee = value
-          totalModify(data.data)
+        data.data = val
+        data.data.newChargeFee = value
+        totalModify(data.data)
             .then(() => {
               ElNotification({
                 type: 'success',
@@ -143,48 +142,29 @@ export default {
                 message: '修改失败',
               })
             })
-        })
-        .catch(() => {})
-    }
+      })
+      .catch(() => {
+      })
+}
 
-    function query() {
-      searchCriteria.inpatientNo = inpatientNo.value
-      searchCriteria.chargeCodeMx = chargeCodeMx.value
-      if (searchCriteria.inpatientNo !== '' && searchCriteria.chargeCodeMx !== '') {
-        queryHospitalizationExpenses(searchCriteria)
-          .then((res) => {
-            data.list = res.data
-            data.totalSize = res.total
-          })
-          .catch(() => {
-            data.list = []
-          })
-      } else {
-        ElMessage.error({
-          message: '两项都需要填写',
-          showClose: true,
-          duration: 2000,
+function query() {
+  searchCriteria.inpatientNo = inpatientNo.value
+  searchCriteria.chargeCodeMx = chargeCodeMx.value
+  if (searchCriteria.inpatientNo !== '' && searchCriteria.chargeCodeMx !== '') {
+    queryHospitalizationExpenses(searchCriteria)
+        .then((res) => {
+          data.list = res.data
+          data.totalSize = res.total
         })
-      }
-    }
-
-    return {
-      inpatientNo,
-      chargeCodeMx,
-      query,
-      data,
-      tijiao,
-      searchCriteria,
-      tableHeight,
-      handleSizeChange,
-      handleCurrentChange,
-      describe,
-      costState,
-      babyOrNot,
-      aerYouSure,
-    }
-  },
+        .catch(() => {
+          data.list = []
+        })
+  } else {
+    ElMessage.error({
+      message: '两项都需要填写',
+      showClose: true,
+      duration: 2000,
+    })
+  }
 }
 </script>
-
-<style></style>

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

@@ -1,6 +1,6 @@
 <template>
-  <page-layer>
-    <template #header>
+  <div class="layout_display_flex_y">
+    <div>
       <el-date-picker v-model="dateRange"
                       :shortcuts="shortcuts"
                       style="width: 220px"
@@ -14,62 +14,62 @@
       <el-button icon="Printer" type="success" @click="daYingClick">打印</el-button>
       <el-button type="primary"
                  @click="enterMedicalOrder"
-                 v-if="goToTheDoctorSOrdersPage()">医嘱录入
+                 v-if="goToTheDoctorSOrdersPage()">
+        医嘱录入
       </el-button>
       <el-tag type="danger">会诊意见限制 1100 个字</el-tag>
-    </template>
-    <template #main>
-      <pat-infomation-dialog
-          v-if="dialog"
-          @closed="dialog = false"
-          :pat-no="rowData.inpatientNo"
-          :admiss-date="rowData.admissDate"
-          :times="rowData.admissTimes"
-          :leave-hospital="1"
-          :dics="dics"/>
-      <el-container>
-        <el-aside width="500px">
-          <xc-table :local-data="huanZeData"
-                    :final-height="innerHeight / 1.1"
-                    @row-click="dianJiDanYuanGe">
-            <el-table-column label="床号" prop="bedNo" width="40px"></el-table-column>
-            <el-table-column label="住院号_次数" prop="inpatientNo">
-              <template #default="scope"> {{ scope.row.inpatientNo }}_{{
-                  scope.row.admissTimes
-                }}
-              </template>
-            </el-table-column>
-            <el-table-column label="姓名_申请次数" prop="name">
-              <template #default="scope"> {{ scope.row.name }}_{{ scope.row.reqTimes }}</template>
-            </el-table-column>
-            <el-table-column label="患者科室" prop="deptCodeName">
-              <template #default="scope">
-                {{ scope.row.deptCodeName }}
-              </template>
-            </el-table-column>
-            <el-table-column label="会诊科室" prop="reqDept1Name"></el-table-column>
-            <el-table-column label="会诊级别" prop="hzType">
-              <template #default="scope">
-                {{ hzJiBie(scope.row.hzType) }}
-              </template>
-            </el-table-column>
-            <el-table-column fixed="left" label="信息">
-              <template #default="{row}">
-                <el-button @click.stop="information(row)">信息</el-button>
-              </template>
-            </el-table-column>
-          </xc-table>
-        </el-aside>
-        <el-main>
-          <div style="overflow: auto;" :style="{height: innerHeight - 30 + 'px'}">
-            <print-the-consultation-form ref="daYingHuiZhenRef"
-                                         :show-print-button="false"
-                                         :lai-yuan="history ? 2: 1"/>
-          </div>
-        </el-main>
-      </el-container>
-    </template>
-  </page-layer>
+    </div>
+    <div class="layout_flex_1-y layout_display_flex">
+      <div style="width: 500px">
+        <xc-table :local-data="huanZeData"
+                  final-height="100%"
+                  @row-click="dianJiDanYuanGe">
+          <el-table-column label="床号" prop="bedNo" width="40px"></el-table-column>
+          <el-table-column label="住院号_次数" prop="inpatientNo">
+            <template #default="scope"> {{ scope.row.inpatientNo }}_{{
+                scope.row.admissTimes
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名_申请数" prop="name">
+            <template #default="scope"> {{ scope.row.name }}_{{ scope.row.reqTimes }}</template>
+          </el-table-column>
+          <el-table-column label="患者科室" prop="deptCodeName">
+            <template #default="scope">
+              {{ scope.row.deptCodeName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="会诊科室" prop="reqDept1Name"></el-table-column>
+          <el-table-column label="会诊级别" prop="hzType">
+            <template #default="scope">
+              {{ hzJiBie(scope.row.hzType) }}
+            </template>
+          </el-table-column>
+          <el-table-column fixed="left" label="信息">
+            <template #default="{row}">
+              <el-button @click.stop="information(row)">信息</el-button>
+            </template>
+          </el-table-column>
+        </xc-table>
+      </div>
+      <div class="layout_flex_1-x ">
+        <div style="overflow: auto;height: 100%">
+          <PrintTheConsultationForm ref="daYingHuiZhenRef"
+                                    :show-print-button="false"
+                                    :lai-yuan="history ? 2: 1"/>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <pat-infomation-dialog
+      v-if="dialog"
+      @closed="dialog = false"
+      :pat-no="rowData.inpatientNo"
+      :admiss-date="rowData.admissDate"
+      :times="rowData.admissTimes"
+      :leave-hospital="1"
+      :dics="dics"/>
 </template>
 
 <script setup>
@@ -81,7 +81,6 @@ import {stringIsBlank} from '@/utils/blank-utils'
 import {shortcuts} from '@/data/shortcuts'
 import router from '@/router'
 import {getServerDateApi} from '@/api/public-api'
-import PageLayer from "@/layout/PageLayer";
 import PrintTheConsultationForm from "@/components/hui-zhen-da-ying/PrintTheConsultationForm.vue";
 import XcTable from "@/components/xiao-chan/xc-table/XcTable.vue";
 import PatInfomationDialog from "@/components/pat-info-list/PatInfomationDialog.vue";
@@ -89,12 +88,11 @@ import {getAllDictionary} from "@/api/case-front-sheet";
 import {operations} from "@/data";
 import {autopsies, haveOrNot, yesOrNo} from "@/views/hospitalization/case-front-sheet/common";
 import {useUserStore} from "@/pinia/user-store";
+import {useCompRef} from "@/utils/useCompRef";
 
-////////////////////////////// 获取屏幕高度 /////////////////////////////////////////
-const innerHeight = window.innerHeight
 
 const userInfo = useUserStore().userInfo
-const daYingHuiZhenRef = ref(null)
+const daYingHuiZhenRef = useCompRef(PrintTheConsultationForm)
 
 
 ////////////////////////////// 获取患者信息    /////////////////////////////////////////

src/views/hospitalization/zhu-yuan-yi-sheng/PatientInformationInquiry.vue

@@ -39,6 +39,8 @@
 
         <el-form-item label="诊断代码" prop="diagnosticCode">
           <el-select-v2 v-model="param.diagnosticCode"
+                        style="width: 120px;"
+                        class="select_v2_width_150"
                         remote
                         clearable
                         filterable
@@ -171,6 +173,8 @@ import {openPatient360} from "@/views/view/patient360/src";
 import CyFlex from "@/components/cy/flex/src/CyFlex.vue";
 import UseVxeTable from "@/utils/cy-use/useVxeTable";
 import {useUserStore} from "@/pinia/user-store";
+import {useCompRef} from "@/utils/useCompRef";
+import {ElForm} from "element-plus";
 
 const userInfo = useUserStore().userInfo
 const param = ref({
@@ -189,8 +193,7 @@ const param = ref({
 })
 
 const deptWardList = ref([])
-const formRef = ref(null)
-const patInfoList = ref([])
+const formRef = useCompRef(ElForm)
 const dialog = ref(false)
 const rowData = ref()
 const dics = ref([])
@@ -237,7 +240,8 @@ const details = async (row) => {
   dialog.value = true
 }
 
-const method = (val) => {
+const method = (val: string) => {
+  if (val.length === '') return
   diagnosis(val).then((res) => {
     diagnosisData.value = res
   })
@@ -282,7 +286,7 @@ onMounted(async () => {
 })
 
 
-let audit = [
+const audit = [
   {code: 0, name: '全部'},
   {code: 1, name: '已审'},
   {code: 2, name: '未审'}

src/views/med-tec-mod/QueRenYiZhuShouFei.vue

@@ -1,147 +1,145 @@
 <template>
-  <el-container>
-    <el-main>
-      <el-row>
-        <el-col>
-          <el-date-picker
-              type="daterange"
-              v-model="dateRange"
-              placeholder="选择日期"
-              style="width: 280px"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :shortcuts="shortcuts"
-          ></el-date-picker>
-          <el-input style="width: 160px" placeholder="请输入住院号" clearable v-model.trim="queryTerm.inpatientNo"
-                    @keyup.enter="getHuanZheXinXiClick"></el-input>
-          <el-select v-model="queryTerm.wardCode" filterable clearable placeholder="请选择病区">
-            <el-option v-for="item in wardData" :key="item.code" :label="item.name" :value="item.code">
-              <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-              <el-divider direction="vertical"></el-divider>
-              <span>{{ item.name }}</span>
-            </el-option>
-          </el-select>
+  <div class="layout_display_flex_y">
+    <div class="m-b_8px">
+      <el-date-picker
+          type="daterange"
+          v-model="dateRange"
+          placeholder="选择日期"
+          style="width: 280px"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :shortcuts="shortcuts"
+      ></el-date-picker>
+      <el-input style="width: 160px" placeholder="请输入住院号" clearable v-model.trim="queryTerm.inpatientNo"
+                @keyup.enter="getHuanZheXinXiClick"></el-input>
+      <el-select v-model="queryTerm.wardCode" style="width: 150px" filterable clearable placeholder="请选择病区">
+        <el-option v-for="item in wardData" :key="item.code" :label="item.name" :value="item.code">
+          <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
           <el-divider direction="vertical"></el-divider>
-          <el-button type="primary" icon="Search" @click="getHuanZheXinXiClick">查询</el-button>
-          <el-button type="primary" icon="RefreshLeft" @click="getXuQueFeiYiZhuClick">刷新</el-button>
-        </el-col>
-        <el-col>
-          排序：
-          <el-select v-model="queryTerm.fenLei" style="width: 100px; margin: auto 10px auto 10px">
-            <el-option :value="0" label="病区"></el-option>
-            <el-option :value="1" label="执行人"></el-option>
-          </el-select>
-          <el-button type="success" @click="baoCunYiZhuQueFeiClick" icon="Upload" :disabled="queryTerm.liShi === 1"> 保存
-          </el-button>
-          <el-divider direction="vertical"></el-divider>
-          <el-radio-group v-model="queryTerm.liShi" @change="getHuanZheXinXiClick">
-            <el-radio-button :label="0">未确认</el-radio-button>
-            <el-radio-button :label="1">历史</el-radio-button>
-          </el-radio-group>
-          <el-divider direction="vertical"></el-divider>
-          <el-button type="warning" @click="chaoZuoZhiNan = true">操作指南</el-button>
-          <el-divider direction="vertical"></el-divider>
-          <el-switch
-              v-show="queryTerm.liShi === 1"
-              v-model="zhiKanZiJi"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-              active-text="只看自己"
-              inactive-text="全部"
-              :active-value="true"
-              :inactive-value="false"
-          >
-          </el-switch>
-        </el-col>
-        <el-col>
-          <div v-show="queryTerm.liShi === 0">
-            <el-table :data="huanZheYiZhuFeiYongData" :height="winHeight / 1.15" stripe highlight-current-row
-                      @cell-click="lingShiQueFeiShuJuClick" ref="tableRef">
-              <el-table-column prop="name" label="姓名" width="90">
-                <template #default="scope">
-                  <el-button size="small" :type="scope.row.shiFouYouChuYuanYiZhu === 0 ? 'success' : 'danger'"
-                             style="width: 100px"
-                  ><span style="font-size: 20px">{{ scope.row.name }}</span></el-button
-                  >
-                </template>
-              </el-table-column>
-              <el-table-column prop="inpatientNo" label="住院号" width="90"></el-table-column>
-              <el-table-column prop="admissTimes" label="住院次数" width="90"></el-table-column>
-              <el-table-column prop="bedNo" label="床号" width="50"></el-table-column>
-              <el-table-column prop="sex" label="性别">
-                <template #default="scope">
-                  {{ cptSex(scope.row.sex) }}
-                </template>
-              </el-table-column>
-              <el-table-column prop="admissDate" label="住院日期"></el-table-column>
-              <el-table-column prop="responceTypeName" label="医保身份"></el-table-column>
-              <el-table-column prop="wardName" label="病区"></el-table-column>
-              <el-table-column prop="totalCharge" label="总费用"></el-table-column>
-              <el-table-column label="操作">
-                <template #default="scope">
-                  <span v-html="chaoZuo(scope.row.list)"></span>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-pagination
-                background
-                @current-change="changeYiZhuQueFei"
-                :current-page="queryTerm.currentPage"
-                :page-size="queryTerm.pageSize"
-                layout=" prev, pager, next,total"
-                :total="queryTerm.total"
-                style="margin-top: 5px"
-                :pager-count="5"
-            ></el-pagination>
-          </div>
-          <div v-show="queryTerm.liShi === 1">
-            <el-table
-                :data="liShiShuJu.list.slice((liShiShuJu.currentPage - 1) * liShiShuJu.pageSize, liShiShuJu.currentPage * liShiShuJu.pageSize)"
-                :height="winHeight / 1.15"
-                stripe
-                highlight-current-row
-                ref="liShiShuJuRef"
-            >
-              <el-table-column label="患者姓名" prop="name">
-                <template #default="scope">
-                  <el-button size="small" :type="scope.row.color" style="width: 100px"
-                  ><span style="font-size: 20px">{{ scope.row.name }}</span></el-button
-                  >
-                </template>
-              </el-table-column>
-              <el-table-column label="住院号" prop="inpatientNo"></el-table-column>
-              <el-table-column label="住院次数" prop="admissTimes"></el-table-column>
-              <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
-              <el-table-column label="医嘱时间" prop="occTime" width="70"></el-table-column>
-              <el-table-column label="项目名称" prop="chargeName"></el-table-column>
-              <el-table-column label="金额" prop="chargeFee"></el-table-column>
-              <el-table-column label="数量" prop="orderCount"></el-table-column>
-              <el-table-column label="医生姓名" prop="docotrName"></el-table-column>
-              <el-table-column label="操作人" prop="opIdName"></el-table-column>
-              <el-table-column label="操作时间" prop="opDate" width="70"></el-table-column>
-              <el-table-column label="操作内容" prop="chargeStatus">
-                <template #default="scope">
-                  <span v-html="yiZhuZhuangTai(scope.row.chargeStatus)"></span>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-pagination
-                background
-                @current-change="liShiShuJuFanYe"
-                :current-page="liShiShuJu.currentPage"
-                :page-size="liShiShuJu.pageSize"
-                layout=" prev, pager, next,total"
-                :total="liShiShuJu.list.length"
-                style="margin-top: 5px"
-                :pager-count="5"
-            ></el-pagination>
-          </div>
-        </el-col>
-      </el-row>
-    </el-main>
-    <el-drawer v-model="xiangXiYiZhuXinXiDrawer" direction="ltr" size="70%" title="患者医嘱的详细信息">
-      <div style="margin: auto 20px auto 20px">
+          <span>{{ item.name }}</span>
+        </el-option>
+      </el-select>
+      <el-divider direction="vertical"></el-divider>
+      <el-button type="primary" icon="Search" @click="getHuanZheXinXiClick">查询</el-button>
+      <el-button type="primary" icon="RefreshLeft" @click="getXuQueFeiYiZhuClick">刷新</el-button>
+    </div>
+    <div>
+      排序：
+      <el-select v-model="queryTerm.fenLei" style="width: 100px; margin: auto 10px auto 10px">
+        <el-option :value="0" label="病区"></el-option>
+        <el-option :value="1" label="执行人"></el-option>
+      </el-select>
+      <el-button type="success" @click="baoCunYiZhuQueFeiClick" icon="Upload" :disabled="queryTerm.liShi === 1"> 保存
+      </el-button>
+      <el-divider direction="vertical"></el-divider>
+      <el-radio-group v-model="queryTerm.liShi" @change="getHuanZheXinXiClick">
+        <el-radio-button :label="0">未确认</el-radio-button>
+        <el-radio-button :label="1">历史</el-radio-button>
+      </el-radio-group>
+      <el-divider direction="vertical"></el-divider>
+      <el-button type="warning" @click="chaoZuoZhiNan = true">操作指南</el-button>
+      <el-divider direction="vertical"></el-divider>
+      <el-switch
+          v-show="queryTerm.liShi === 1"
+          v-model="zhiKanZiJi"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+          active-text="只看自己"
+          inactive-text="全部"
+          :active-value="true"
+          :inactive-value="false"
+      >
+      </el-switch>
+    </div>
+    <div class="layout_flex_1-y ">
+      <div class="layout_display_flex_y" v-show="queryTerm.liShi === 0">
+        <el-table :data="huanZheYiZhuFeiYongData" :height="winHeight / 1.15" stripe highlight-current-row
+                  @cell-click="lingShiQueFeiShuJuClick" ref="tableRef">
+          <el-table-column prop="name" label="姓名" width="90">
+            <template #default="scope">
+              <el-button size="small" :type="scope.row.shiFouYouChuYuanYiZhu === 0 ? 'success' : 'danger'"
+                         style="width: 100px"
+              ><span style="font-size: 20px">{{ scope.row.name }}</span></el-button
+              >
+            </template>
+          </el-table-column>
+          <el-table-column prop="inpatientNo" label="住院号" width="90"></el-table-column>
+          <el-table-column prop="admissTimes" label="住院次数" width="90"></el-table-column>
+          <el-table-column prop="bedNo" label="床号" width="50"></el-table-column>
+          <el-table-column prop="sex" label="性别">
+            <template #default="scope">
+              {{ cptSex(scope.row.sex) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="admissDate" label="住院日期"></el-table-column>
+          <el-table-column prop="responceTypeName" label="医保身份"></el-table-column>
+          <el-table-column prop="wardName" label="病区"></el-table-column>
+          <el-table-column prop="totalCharge" label="总费用"></el-table-column>
+          <el-table-column label="操作">
+            <template #default="scope">
+              <span v-html="chaoZuo(scope.row.list)"></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+            background
+            @current-change="changeYiZhuQueFei"
+            :current-page="queryTerm.currentPage"
+            :page-size="queryTerm.pageSize"
+            layout=" prev, pager, next,total"
+            :total="queryTerm.total"
+            style="margin-top: 5px"
+            :pager-count="5"
+        ></el-pagination>
+      </div>
+      <div class="layout_display_flex_y" v-show="queryTerm.liShi === 1">
+        <el-table
+            :data="liShiShuJu.list.slice((liShiShuJu.currentPage - 1) * liShiShuJu.pageSize, liShiShuJu.currentPage * liShiShuJu.pageSize)"
+            :height="winHeight / 1.15"
+            stripe
+            highlight-current-row
+            ref="liShiShuJuRef"
+        >
+          <el-table-column label="患者姓名" prop="name">
+            <template #default="scope">
+              <el-button size="small" :type="scope.row.color" style="width: 100px"
+              ><span style="font-size: 20px">{{ scope.row.name }}</span></el-button
+              >
+            </template>
+          </el-table-column>
+          <el-table-column label="住院号" prop="inpatientNo"></el-table-column>
+          <el-table-column label="住院次数" prop="admissTimes"></el-table-column>
+          <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
+          <el-table-column label="医嘱时间" prop="occTime" width="70"></el-table-column>
+          <el-table-column label="项目名称" prop="chargeName"></el-table-column>
+          <el-table-column label="金额" prop="chargeFee"></el-table-column>
+          <el-table-column label="数量" prop="orderCount"></el-table-column>
+          <el-table-column label="医生姓名" prop="docotrName"></el-table-column>
+          <el-table-column label="操作人" prop="opIdName"></el-table-column>
+          <el-table-column label="操作时间" prop="opDate" width="70"></el-table-column>
+          <el-table-column label="操作内容" prop="chargeStatus">
+            <template #default="scope">
+              <span v-html="yiZhuZhuangTai(scope.row.chargeStatus)"></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+            background
+            @current-change="liShiShuJuFanYe"
+            :current-page="liShiShuJu.currentPage"
+            :page-size="liShiShuJu.pageSize"
+            layout=" prev, pager, next,total"
+            :total="liShiShuJu.list.length"
+            style="margin-top: 5px"
+            :pager-count="5"
+        ></el-pagination>
+      </div>
+    </div>
+  </div>
+  <el-drawer v-model="xiangXiYiZhuXinXiDrawer" direction="ltr" size="70%" title="患者医嘱的详细信息">
+    <div class="layout_display_flex_y">
+      <div>
         <el-descriptions :title="lingShiQueFeiShuJu.name" border>
           <template #extra>
             <el-button type="success" @click="baoCunYiZhuQueFeiClick" icon="Upload" :disabled="queryTerm.liShi === 1">
@@ -157,40 +155,40 @@
           <el-descriptions-item label="医保身份">{{ lingShiQueFeiShuJu.responceTypeName }}</el-descriptions-item>
           <el-descriptions-item label="病区">{{ lingShiQueFeiShuJu.wardName }}</el-descriptions-item>
         </el-descriptions>
+      </div>
+      <div class="layout_flex_1-y layout_display_flex_y">
+        <el-divider class="el-divider_shorter">项目信息</el-divider>
         <el-table
             :data="lingShiQueFeiShuJu.list.slice((lingShiQueFeiShuJu.currentPage - 1) * lingShiQueFeiShuJu.pageSize, lingShiQueFeiShuJu.currentPage * lingShiQueFeiShuJu.pageSize)"
             highlight-current-row
             stripe
-            class="qf_table"
-            :height="getWindowSize.h / 1.5">
-          <el-table-column label="医嘱信息">
-            <el-table-column prop="actOrderNo" label="医嘱号"></el-table-column>
-            <el-table-column prop="occTime" label="医嘱日期" width="80"></el-table-column>
-            <el-table-column prop="execUnitName" label="执行科室"></el-table-column>
-            <el-table-column prop="chargeCode" label="项目编码"></el-table-column>
-            <el-table-column prop="chargeName" label="项目名称"></el-table-column>
-            <el-table-column prop="docotrName" label="医生"></el-table-column>
-            <el-table-column prop="orderCount" label="数量"></el-table-column>
-            <el-table-column prop="chargeFee" label="单价"></el-table-column>
-            <el-table-column label="金额">
-              <template #default="scope">
-                {{ (scope.row.chargeFee * scope.row.orderCount).toFixed(2) }}
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="220">
-              <template #header>
-                <el-button type="success" @click="oneClickConfirmClick('1')">确认</el-button>
-                <el-button type="danger" @click="oneClickConfirmClick('2')">取消</el-button>
-              </template>
-              <template #default="scope">
-                <el-radio-group v-model="scope.row.chargeStatus"
-                                :fill="scope.row.chargeStatus === '1' ? '#67C23A' : scope.row.chargeStatus === '2' ? '#F56C6C' : '#909399'">
-                  <el-radio-button label="1">确认</el-radio-button>
-                  <el-radio-button label="2">取消</el-radio-button>
-                  <el-radio-button label="3">不操作</el-radio-button>
-                </el-radio-group>
-              </template>
-            </el-table-column>
+            height="100%">
+          <el-table-column prop="actOrderNo" label="医嘱号"></el-table-column>
+          <el-table-column prop="occTime" label="医嘱日期" width="80"></el-table-column>
+          <el-table-column prop="execUnitName" label="执行科室"></el-table-column>
+          <el-table-column prop="chargeCode" label="项目编码"></el-table-column>
+          <el-table-column prop="chargeName" label="项目名称"></el-table-column>
+          <el-table-column prop="docotrName" label="医生"></el-table-column>
+          <el-table-column prop="orderCount" label="数量"></el-table-column>
+          <el-table-column prop="chargeFee" label="单价"></el-table-column>
+          <el-table-column label="金额">
+            <template #default="scope">
+              {{ (scope.row.chargeFee * scope.row.orderCount).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="220">
+            <template #header>
+              <el-button type="success" @click="oneClickConfirmClick('1')">确认</el-button>
+              <el-button type="danger" @click="oneClickConfirmClick('2')">取消</el-button>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-model="scope.row.chargeStatus"
+                              :fill="scope.row.chargeStatus === '1' ? '#67C23A' : scope.row.chargeStatus === '2' ? '#F56C6C' : '#909399'">
+                <el-radio-button label="1">确认</el-radio-button>
+                <el-radio-button label="2">取消</el-radio-button>
+                <el-radio-button label="3">不操作</el-radio-button>
+              </el-radio-group>
+            </template>
           </el-table-column>
         </el-table>
         <el-pagination
@@ -203,39 +201,39 @@
             :page-sizes="[8, 20, 30, 100]"
             :total="lingShiQueFeiShuJu.total"
             style="margin-top: 5px"
-            :pager-count="5"
+            :pager-count="7"
         ></el-pagination>
       </div>
-    </el-drawer>
-    <el-dialog v-model="chaoZuoZhiNan" title="操作指南(*^▽^*)" width="1000px">
-      <div id="jinRiShuJuTuXin" style="width: 100%; height: 300px"></div>
-      1、输入住院号，点击查询即可查询出该住院患者的信息，同理病区也是一样选择的病区就只会查询该病区的患者，住院号和病区二选一。
-      <br/>
-      <br/>
-      2、排序：默认根据病区来排，选择了执行人后会根据算法来把当前登陆的人员，执行过最多的患者来排到靠前的位置。
-      <br/><br/>
-      3、未确认和历史：默认会查询患者未确认的项目，点击历史后一定要选择时间，该时间是医嘱的执行时间，默认会查询当天的时间，（提示选择时间的跨度建议不要过长，可能会导致数据加载慢。）同时查询历史时
-      也可以使用住院号和病区来查询。
-      <br/>
-      <br/>
-      4、患者姓名：有出院医嘱会显示为红色，无则显示绿色。
-      <br/>
-      <br/>
-      <span style="color: red">
+    </div>
+  </el-drawer>
+  <el-dialog v-model="chaoZuoZhiNan" title="操作指南(*^▽^*)" width="1000px">
+    <div id="jinRiShuJuTuXin" style="width: 100%; height: 300px"></div>
+    1、输入住院号，点击查询即可查询出该住院患者的信息，同理病区也是一样选择的病区就只会查询该病区的患者，住院号和病区二选一。
+    <br/>
+    <br/>
+    2、排序：默认根据病区来排，选择了执行人后会根据算法来把当前登陆的人员，执行过最多的患者来排到靠前的位置。
+    <br/><br/>
+    3、未确认和历史：默认会查询患者未确认的项目，点击历史后一定要选择时间，该时间是医嘱的执行时间，默认会查询当天的时间，（提示选择时间的跨度建议不要过长，可能会导致数据加载慢。）同时查询历史时
+    也可以使用住院号和病区来查询。
+    <br/>
+    <br/>
+    4、患者姓名：有出院医嘱会显示为红色，无则显示绿色。
+    <br/>
+    <br/>
+    <span style="color: red">
         5、现在无需点击患者姓名，直接点击该栏会弹出抽屉，患者基本信息会显示在上方，请按照需求来选择对应的操作，默认每页显示八条，表格中的分页按钮，跳转至上一页或下一页。
         点击抽屉外的任意位置即可消失，或点击保存旁边的关闭按钮。
       </span>
-      <br/><br/>
-      6、分页：该分页指页面下方的分页，点击下一页后，且没有点击保存，那么您此前的操作将会丢失，请在分页之前（如果有操作）点击保存（小表格中点击分页不会出现该情况）。
-      <br/><br/>
-      7、保存：在确定数据正确后，点击保存（数据一旦，保存成功就没有回头路了，请认真仔细的确认），<span style="color: red">点击弹出来的抽屉中的保存也是一样的效果。（新增）</span>
-      <br/><br/>
-      8、错误：在点击保存后，系统会自动接受患者的费用，如出错会在右上角，出现提示，可以请对应病区的护士在出院结算页面中点击费用接受重算按钮即可，或在老系统中护士打印费用清单时，会自动接收。
-      <br/><br/>
-      9、如有新的需求或出现未知的意外可联系管理员，如是操作失误后果自负（我觉得我已经写的很详细了，各种提示都有，都是简单的操作，还出现操作失误那就没得办法了）
-      (>ω･* )ﾉ
-    </el-dialog>
-  </el-container>
+    <br/><br/>
+    6、分页：该分页指页面下方的分页，点击下一页后，且没有点击保存，那么您此前的操作将会丢失，请在分页之前（如果有操作）点击保存（小表格中点击分页不会出现该情况）。
+    <br/><br/>
+    7、保存：在确定数据正确后，点击保存（数据一旦，保存成功就没有回头路了，请认真仔细的确认），<span style="color: red">点击弹出来的抽屉中的保存也是一样的效果。（新增）</span>
+    <br/><br/>
+    8、错误：在点击保存后，系统会自动接受患者的费用，如出错会在右上角，出现提示，可以请对应病区的护士在出院结算页面中点击费用接受重算按钮即可，或在老系统中护士打印费用清单时，会自动接收。
+    <br/><br/>
+    9、如有新的需求或出现未知的意外可联系管理员，如是操作失误后果自负（我觉得我已经写的很详细了，各种提示都有，都是简单的操作，还出现操作失误那就没得办法了）
+    (>ω･* )ﾉ
+  </el-dialog>
 </template>
 
 <script setup name="QueRenYiZhuShouFei">
@@ -548,13 +546,3 @@ function oneClickConfirmClick(flag) {
 }
 
 </script>
-
-<style scoped lang="scss">
-.qf_table {
-
-  :deep(.el-table__inner-wrapper .el-table__body-wrapper ) {
-    overflow: scroll;
-  }
-
-}
-</style>

src/views/settings/menu-settings/MenuSettings.vue

@@ -74,9 +74,9 @@ onMounted(() => {
       border="inner"
       height="auto"
       show-overflow
-      :row-config="{isHover: true, useKey: true}"
+      :row-config="{isHover: true, useKey: true , isCurrent: true}"
       :column-config="{resizable: true}"
-      :tree-config="{  rowField: 'id', parentField: 'parentId', showLine: true}"
+      :tree-config="{  rowField: 'id', parentField: 'parentId', showLine: true, trigger: 'row'}"
       :data="menuTreeData">
     <vxe-column field="metaTitle" title="标题" tree-node>
       <template #default="{row}">