优化

package-lock.json

@@ -42,6 +42,7 @@
         "vue-router": "4.0.16",
         "vue3-json-viewer": "2.2.2",
         "vue3-print-nb": "0.1.4",
+        "vxe-pc-ui": "^4.0.67",
         "vxe-table": "^4.7.50",
         "vxe-table-plugin-export-xlsx": "4.0.1",
         "xe-utils": "3.5.26",

package.json

@@ -42,6 +42,7 @@
     "vue-router": "4.0.16",
     "vue3-json-viewer": "2.2.2",
     "vue3-print-nb": "0.1.4",
+    "vxe-pc-ui": "^4.0.67",
     "vxe-table": "^4.7.50",
     "vxe-table-plugin-export-xlsx": "4.0.1",
     "xe-utils": "3.5.26",

src/views/hospitalization/zhu-yuan-yi-sheng/cao-yao-yi-zhu/ChaXunChaoYaoYiZhu.vue

@@ -1,6 +1,6 @@
 <template>
-  <CyFlex>
-    <template #header>
+  <div class="layout_container">
+    <header>
       <el-date-picker
           v-model="dateRange"
           :shortcuts="shortcuts"
@@ -14,69 +14,51 @@
       ></el-date-picker>
       <el-divider direction="vertical"></el-divider>
       <el-button @click="dianJiChaXunYiZhu(0)">查询</el-button>
-      <el-divider direction="vertical"></el-divider>
-    </template>
-
-    <el-dialog v-model="xiangQing.dialog" title="草药医嘱详情">
-      <el-table :close-on-click-modal="false" :data="xiangQing.data" highlight-current-row stripe>
-        <el-table-column label="编码" prop="chargeCode"></el-table-column>
-        <el-table-column label="名称" prop="chargeCodeName"></el-table-column>
-        <el-table-column label="药房" prop="groupNoName"></el-table-column>
-        <el-table-column label="数量" prop="quantity"></el-table-column>
-        <el-table-column label="单价" prop="unitPrice"></el-table-column>
-        <el-table-column label="说明" prop="instruction"></el-table-column>
-        <el-table-column label="包装规格" prop="serial">
-          <template #default="scope">
-            <span v-if="scope.row.serial === '01'">小包装</span>
-            <span v-else-if="scope.row.serial === '99'">小包装</span>
+    </header>
+    <div class="layout_main">
+      <CyTabs height="100%" v-model="tabsName">
+        <CyTabPane :name="0" label="历史信息">
+          <template #default={height}>
+            <el-table :data="caoYaoShuJu.data" :height="height - 30">
+              <el-table-column label="名称" prop="orderName"></el-table-column>
+              <el-table-column label="药单号" prop="pageNo"></el-table-column>
+              <el-table-column label="开单时间" prop="inputDate" show-overflow-tooltip></el-table-column>
+              <el-table-column label="医生" prop="doctorCodeName"></el-table-column>
+              <el-table-column label="状态" prop="statusFlag">
+                <template #default="scope">
+                  {{ getHerbsStatusFlag(scope.row.statusFlag) }}
+                </template>
+              </el-table-column>
+              <el-table-column label="处方总额" prop="zongJia"></el-table-column>
+              <el-table-column label="剂数" prop="quantity"></el-table-column>
+              <el-table-column label="单剂金额" prop="orderJe"></el-table-column>
+              <el-table-column label="医嘱号" prop="orderNo"></el-table-column>
+              <el-table-column label="执行科室" prop="execDeptName"></el-table-column>
+              <el-table-column label="操作" width="90">
+                <template #default="scope">
+                  <el-button-group>
+                    <el-button type="primary" @click="caoYaoYiZhuXiangQing(scope.row)" icon="View"
+                               title="查看详情">
+                      明细
+                    </el-button>
+                    <el-button icon="Delete"
+                               type="danger"
+                               @click="dianJiShanChu(scope.row, scope.$index)"
+                               title="删除">
+                      删除
+                    </el-button>
+                  </el-button-group>
+                </template>
+              </el-table-column>
+            </el-table>
           </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
-    <CyTabs height="100%" v-model="tabsName">
-      <CyTabPane :name="0" label="历史信息">
-        <template #default={height}>
-          <el-table :data="caoYaoShuJu.data" :height="height - 30">
-            <el-table-column label="名称" prop="orderName"></el-table-column>
-            <el-table-column label="药单号" prop="pageNo"></el-table-column>
-            <el-table-column label="开单时间" prop="inputDate" show-overflow-tooltip></el-table-column>
-            <el-table-column label="医生" prop="doctorCodeName"></el-table-column>
-            <el-table-column label="状态" prop="statusFlag">
-              <template #default="scope">
-                {{ getHerbsStatusFlag(scope.row.statusFlag) }}
-              </template>
-            </el-table-column>
-            <el-table-column label="处方总额" prop="zongJia"></el-table-column>
-            <el-table-column label="剂数" prop="quantity"></el-table-column>
-            <el-table-column label="单剂金额" prop="orderJe"></el-table-column>
-            <el-table-column label="医嘱号" prop="orderNo"></el-table-column>
-            <el-table-column label="执行科室" prop="execDeptName"></el-table-column>
-            <el-table-column label="操作" width="90">
-              <template #default="scope">
-                <el-button-group>
-                  <el-button type="primary" @click="caoYaoYiZhuXiangQing(scope.row)" icon="View"
-                             title="查看详情">
-                    明细
-                  </el-button>
-                  <el-button icon="Delete"
-                             type="danger"
-                             @click="dianJiShanChu(scope.row, scope.$index)"
-                             title="删除">
-                    删除
-                  </el-button>
-                </el-button-group>
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </CyTabPane>
-      <CyTabPane :name="1" label="新增草药">
-        <xin-zheng-cao-yao :save-success="saveSuccess"/>
-      </CyTabPane>
-    </CyTabs>
-  </CyFlex>
-
+        </CyTabPane>
+        <CyTabPane :name="1" label="新增草药">
+          <XinZhengCaoYao :save-success="saveSuccess"/>
+        </CyTabPane>
+      </CyTabs>
+    </div>
+  </div>
 </template>
 
 <script setup>
@@ -91,7 +73,6 @@ import {ref} from 'vue'
 import {ElMessageBox} from 'element-plus'
 import XinZhengCaoYao from "@/views/hospitalization/zhu-yuan-yi-sheng/cao-yao-yi-zhu/XinZhengCaoYao";
 import {getHerbsStatusFlag} from "@/views/hospitalization/zhu-yuan-yi-sheng/cao-yao-yi-zhu/cao-yao";
-import CyFlex from "@/components/cy/flex/src/CyFlex.vue";
 import CyTabs from "@/components/cy/tabs/src/CyTabs";
 import CyTabPane from "@/components/cy/tabs/src/CyTabPane.vue";
 

src/views/hospitalization/zhu-yuan-yi-sheng/cao-yao-yi-zhu/XinZhengCaoYao.vue

@@ -1,6 +1,6 @@
 <template>
-  <CyFlex content-size>
-    <template #header>
+  <div class="layout_container" style="min-height: 600px">
+    <header>
       <div>
         <el-button type="primary" @click="openCaoYaoTemplate">取模板</el-button>
         <el-button :disabled="mingXi.list.length === 0" type="success" @click="cunMuBan.dialog = true">存模板
@@ -8,7 +8,8 @@
         <el-divider direction="vertical"></el-divider>
         <el-button :disabled="mingXi.list.length === 0" type="success" @click="dianJiBaoCunCaoYao">保存数据
         </el-button>
-        <cao-yao-cuo-wu-xin-xin :data="errorMsg"/>
+        <el-divider direction="vertical"></el-divider>
+        <CaoYaoCuoWuXinXin :data="errorMsg"/>
       </div>
       <div style="margin-top: 5px">
         <el-form label-width="120px">
@@ -32,7 +33,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item class="bi_tian" label="执行科室：">
-                <dept-select v-model="chuFang.execDept"/>
+                <SystemDeptSelect v-model="chuFang.execDept"/>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -132,12 +133,10 @@
           </el-row>
         </el-form>
       </div>
-    </template>
-
-    <template #default="{height}">
+    </header>
+    <div class="layout_main layout_el-table">
       <el-table :data="mingXi.list"
                 style="width: 100%"
-                :height="height"
                 highlight-current-row stripe
                 @row-click="dianJiBianJi">
         <el-table-column type="index"></el-table-column>
@@ -167,9 +166,8 @@
           </template>
         </el-table-column>
       </el-table>
-    </template>
-  </CyFlex>
-
+    </div>
+  </div>
   <!-- 获取草药模板 -->
   <cao-yao-mu-ban v-if="muBanZuJian"
                   @close="muBanZuJian = false"
@@ -204,12 +202,11 @@ import CaoYaoMuBan from '@/components/zhu-yuan-yi-sheng/cao-yao-yi-zhu/CaoYaoMuB
 import {yaoPinXiangMuPiPeiYiBao} from '@/api/public-api'
 import sleep from "@/utils/sleep";
 import CaoYaoCuoWuXinXin from "@/components/zhu-yuan-yi-sheng/cao-yao-yi-zhu/CaoYaoCuoWuXinXin.vue";
-import DeptSelect from "@/components/xiao-chan/dept-code/DeptSelect.vue";
 import Dig from "@/utils/math";
-import CyFlex from "@/components/cy/flex/src/CyFlex.vue";
 import CyComboGrid from "@/components/cy/combo-grid/src/CyComboGrid.vue";
 import {useUserStore} from "@/pinia/user-store";
 import useDialogToJs from "@/components/js-dialog-comp/useDialogToJs";
+import SystemDeptSelect from "@/components/system/dept-select/SystemDeptSelect.vue";
 
 const props = defineProps({
   saveSuccess: Function