只剩下优化代码，和看怎么生成医嘱了。

src/App.vue

@@ -2,16 +2,16 @@
   <el-config-provider :locale="locale">
     <router-view v-slot="{ Component }">
       <keep-alive>
-        <component :is="Component" />
+        <component :is="Component"/>
       </keep-alive>
     </router-view>
   </el-config-provider>
 </template>
 
 <script>
-import { defineComponent } from 'vue'
+import {defineComponent} from 'vue'
 import locale from 'element-plus/lib/locale/lang/zh-cn'
-import { useStore } from 'vuex'
+import {useStore} from 'vuex'
 
 export default defineComponent({
   name: 'App',
@@ -38,7 +38,7 @@ export default defineComponent({
 function getWindowSize() {
   const w = window.innerWidth
   const h = window.innerHeight - 96
-  return { w, h }
+  return {w, h}
 }
 </script>
 
@@ -160,24 +160,28 @@ function getWindowSize() {
   align-items: flex-start;
   justify-content: center;
 }
+
 .component-content-box__dialog-like {
   width: 60%;
   padding: 20px;
   background: white;
   margin-top: 15vh;
 }
+
 .component-header-box {
   position: relative;
   width: 100%;
   display: flex;
   padding: 0 0 12px 0;
 }
+
 .component-header__title {
   width: 70%;
   font-size: 16px;
   display: flex;
   align-items: center;
 }
+
 .component-header__close-button {
   width: 30%;
   text-align: right;

src/api/zhu-yuan-yi-sheng/cao-yao-yi-zhu.js

@@ -66,6 +66,22 @@ export function cunMuBanApi(data) {
     })
 }
 
+export function baoCunCaoYao(data) {
+    return request({
+        url: url + 'baoCunCaoYao',
+        method: 'post',
+        data
+    })
+}
+
+export function shanChuMuBan(name, deptCode) {
+    return request({
+        url: url + 'shanChuMuBan',
+        method: 'get',
+        params: {name, deptCode}
+    })
+}
+
 
 
 

src/router/index.js

@@ -37,11 +37,7 @@ export function addRoutes() {
 const whiteList = ['/login', '/dashboard', '/404', '/401', '/']
 
 router.beforeEach((to, _from, next) => {
-    if (to.meta.passCheck) {
-        to.meta.title ? changeTitle(to.meta.title) : '' // 动态title
-        next();
-        return;
-    }
+
     if (apiUrl !== 'http://172.16.32.160:8706') {
         to.meta.title ? changeTitle(to.meta.title) : '' // 动态title
         next()

src/router/modules/dashboard.js

@@ -346,9 +346,20 @@ const route = [
                 children: [
                     {
                         path: 'yiZhuLuRu',
-                        component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/YiZhuLuRu.vue')),
+                        component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/YiZhuLuRu.vue')),
                         meta: {title: '医嘱录入', icon: 'iconfont icon-yizhuluru'},
                     },
+                    {
+                        path: 'xinZhenYiZhu',
+                        name: 'xinZhenYiZhu',
+                        component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/TianJiaYiZhu.vue')),
+                        meta: {
+                            hideTabs: true,
+                            title: '添加医嘱',
+                            property: 'tianJiaYiZhu',
+                            parent: '/inpatient/zhuYuanYiSheng/xinZhenYiZhu'
+                        }
+                    },
                     {
                         path: 'huiZhenShenQing',
                         component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/HuiZhenShenQing.vue')),
@@ -366,57 +377,40 @@ const route = [
                     },
                     {
                         path: 'shouShuShenQing',
-                        redirect: '/inpatient/zhuYuanYiSheng/shouShuShenQing/chaKanShouShu',
-                        component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/LuYouYeMian.vue')),
-                        meta: {title: '手术申请', icon: 'iconfont icon-shoushushenqing', property: 'shouShuShenQing'},
-                        children: [
-                            {
-                                path: 'chaKanShouShu',
-                                component: createNameComponent(() => import('@/components/zhu-yuan-yi-sheng/shou-shu-shen-qing/ChaKanShouShu.vue')),
-                                meta: {
-                                    title: '查看手术',
-                                    icon: 'iconfont icon-shoushushenqing',
-                                    property: 'shouShuShenQing',
-                                    passCheck: true
-                                },
-                            },
-                            {
-                                path: 'xinZengShouShuShenQing',
-                                component: createNameComponent(() => import('@/components/zhu-yuan-yi-sheng/shou-shu-shen-qing/XinZengShouShuShenQing.vue')),
-                                meta: {
-                                    title: '新增手术申请',
-                                    property: 'shouShuShenQing',
-                                    parent: '/inpatient/zhuYuanYiSheng/shouShuShenQing',
-                                    hideTabs: true
-                                },
-                            },
-                        ]
+                        component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/shou-shu-shen-qing/ShouShuShenQing.vue')),
+                        meta: {
+                            title: '查看手术',
+                            icon: 'iconfont icon-shoushushenqing',
+                            property: 'shouShuShenQing',
+                        },
+                    },
+                    {
+                        path: 'xinZengShouShuShenQing',
+                        component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/shou-shu-shen-qing/XinZengShouShuShenQing.vue')),
+                        meta: {
+                            title: '新增手术申请',
+                            property: 'shouShuShenQing',
+                            parent: '/inpatient/zhuYuanYiSheng/shouShuShenQing',
+                            hideTabs: true
+                        },
                     },
                     {
                         path: 'caoYaoYiZhu',
-                        component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/LuYouYeMian.vue')),
-                        meta: {title: '草药医嘱', icon: 'iconfont icon-caoyaoyizhu'},
-                        children: [
-                            {
-                                path: 'chaKanChaoYaoYiZhu',
-                                component: createNameComponent(() => import('@/components/zhu-yuan-yi-sheng/cao-yao-yi-zhu/ChaXunChaoYaoYiZhu.vue')),
-                                meta: {
-                                    title: '查看草药医嘱',
-                                    property: 'shouShuShenQing',
-                                    passCheck: true
-                                },
-                            }, {
-                                path: 'xinZhengCaoYao',
-                                component: createNameComponent(() => import('@/components/zhu-yuan-yi-sheng/cao-yao-yi-zhu/XinZhengCaoYao.vue')),
-                                meta: {
-                                    title: '新增草药医嘱',
-                                    property: 'shouShuShenQing',
-                                    parent: '/inpatient/zhuYuanYiSheng/caoYaoYiZhu/chaKanChaoYaoYiZhu',
-                                    hideTabs: true
-                                },
-                            },
-
-                        ]
+                        component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/cao-yao-yi-zhu/ChaXunChaoYaoYiZhu.vue')),
+                        meta: {
+                            title: '查看草药医嘱',
+                            property: 'caoYaoYiZhu',
+                        },
+                    },
+                    {
+                        path: 'xinZhengCaoYao',
+                        component: createNameComponent(() => import('@/views/hospitalization/zhu-yuan-yi-sheng/cao-yao-yi-zhu/XinZhengCaoYao.vue')),
+                        meta: {
+                            title: '新增草药医嘱',
+                            property: 'caoYaoYiZhu',
+                            parent: '/inpatient/zhuYuanYiSheng/caoYaoYiZhu',
+                            hideTabs: true
+                        },
                     },
                 ],
             },

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

@@ -21,7 +21,7 @@ import store from '../../../store'
 import {computed, onMounted, ref, watch} from "vue";
 import HuanZheLieBiao from "../../../components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/HuanZheLieBiao.vue";
 import HuanZheXinXi from "../../../components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/HuanZheXinXi.vue";
-import YiZhuLuRuZhuJian from "./YiZhuLuRu.vue";
+import YiZhuLuRuZhuJian from "./yi-zhu-lu-ru/YiZhuLuRu.vue";
 import GongJuZuJian from "../../../components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/GongJuZuJian.vue";
 import router from "@/router";
 

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

@@ -137,7 +137,7 @@ export default {
     }
 
     const DianJiXinZengChaoYao = () => {
-      router.push('/inpatient/zhuYuanYiSheng/caoYaoYiZhu/xinZhengCaoYao')
+      router.push('/inpatient/zhuYuanYiSheng/xinZhengCaoYao')
     }
 
     watch(() => huanZheXinXi.value, () => {

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

@@ -5,6 +5,8 @@
       <el-divider direction="vertical"></el-divider>
       <el-button type="primary" @click="quMuBan.dialog = true;dianJiaChaXunMuBan(0)">取模板</el-button>
       <el-button :disabled="mingXi.list.length === 0 " type="success" @click="cunMuBan.dialog = true">存模板</el-button>
+      <el-divider direction="vertical"></el-divider>
+      <el-button :disabled="mingXi.list.length === 0 " type="success" @click="dianJiBaoCunCaoYao">保存数据</el-button>
     </el-header>
     <el-main>
       <el-form label-width="120px">
@@ -130,6 +132,14 @@
             <span v-else-if="scope.row.serial === '99'">大包装</span>
           </template>
         </el-table-column>
+        <el-table-column label="操作">
+          <template #default="scope">
+            <el-button circle icon="el-icon-delete" type="danger"
+                       @click="mingXi.weiYi.splice(scope.$index,1);
+                       mingXi.list.splice(scope.$index,1)">
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </el-main>
   </el-container>
@@ -172,6 +182,12 @@
         <el-button @click="dianJiaChaXunMuBan(0)">查询</el-button>
         <el-table :data="quMuBan.muBan" :height="windowSize.h / 2.1" @row-click="dianJiChaKanMuBanXiangQing">
           <el-table-column label="名称" prop="patternName"></el-table-column>
+          <el-table-column label="操作">
+            <template #default="scope">
+              <el-button circle icon="el-icon-delete" type="danger"
+                         @click="dianJiShanChuMuBan(scope.row,scope.$index)"></el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </el-aside>
       <el-main>
@@ -206,17 +222,19 @@
 <script>
 import router from '@/router'
 import {computed, onMounted, ref, watch} from "vue";
-import {huanZheXinXi} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
+import {huanZheXinXi, youWuXuanZheHuanZhe} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 import {
+  baoCunCaoYao,
   chongFuMuBanMing,
   cunMuBanApi,
   fuYongFangFa,
   huoQuCaoYao,
   huoQuMuBan,
-  muBanXiangQing
+  muBanXiangQing,
+  shanChuMuBan
 } from "@/api/zhu-yuan-yi-sheng/cao-yao-yi-zhu";
 import store from "@/store";
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import {stringIsBlank} from "@/utils/blank-utils";
 
 export default {
@@ -384,8 +402,6 @@ export default {
       if (flag) {
         ElMessage.error('请勿重复添加。')
       }
-
-
     }
 
     /**
@@ -405,14 +421,61 @@ export default {
         } else {
           let data = {
             patternName: val,
-            deptCode: store.state.user.info.deptCode,
-            list: mingXi.value.list
+            list: mingXi.value.list,
+            deptCode: store.state.user.info.deptCode
           }
-          cunMuBanApi(data)
+          cunMuBanApi(data).then(() => {
+            cunMuBan.value.dialog = false
+            cunMuBan.value.patternName = ''
+          })
         }
       })
     }
 
+    /**
+     * 保存草药
+     */
+    const dianJiBaoCunCaoYao = () => {
+      if (youWuXuanZheHuanZhe()) return
+      if (stringIsBlank(chuFang.value.orderName)) {
+        return ElMessage.error('请输入处方名。')
+      }
+      if (chuFang.value.quantity === 0) {
+        return ElMessage.error("请选择剂数")
+      }
+      if (chuFang.value.quantityDj === 0) {
+        return ElMessage.error("请选择代煎数")
+      }
+      ElMessageBox.confirm(chuFang.value.quantity > 20 ? '剂数大于20是否继续录入？' : '请确定好数据？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        let data = chuFang.value
+        data.inpatientNo = huanZheXinXi.value.inpatientNo
+        data.admissTimes = huanZheXinXi.value.admissTimes
+        data.list = mingXi.value.list
+        data.deptCode = store.state.user.info.deptCode
+        console.log(data)
+        baoCunCaoYao(data).then((res) => {
+          console.log(res)
+        })
+      }).catch(() => {
+      })
+    }
+
+    const dianJiShanChuMuBan = (row, index) => {
+      ElMessageBox.confirm(`您确定删除<span style="color: teal">【${row.patternName}】</span>吗？`, '温馨提示', {
+        type: "warning",
+        dangerouslyUseHTMLString: true,
+      }).then(() => {
+        shanChuMuBan(row.patternName, store.state.user.info.deptCode).then(() => {
+          quMuBan.value.muBan.splice(index, 1)
+          quMuBan.value.muBanXiangQing = []
+        })
+      }).catch(() => {
+      })
+
+    }
+
 
     onMounted(() => {
       fuYongFangFa().then(res => {
@@ -450,6 +513,8 @@ export default {
       cunMuBan,
       dianJiXuanZhongMuBanShuJu,
       huoQuMuBanXuanZhongShuJu,
+      dianJiBaoCunCaoYao,
+      dianJiShanChuMuBan
     }
   }
 }

src/components/zhu-yuan-yi-sheng/shou-shu-shen-qing/ChaKanShouShu.vue → src/views/hospitalization/zhu-yuan-yi-sheng/shou-shu-shen-qing/ShouShuShenQing.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container v-show="xianShiYeMian">
+  <el-container>
     <el-header style="height: 30px">
       检查名称：
       <el-autocomplete v-model="orderName" :fetch-suggestions="querySearchAsync" clearable
@@ -27,7 +27,6 @@
           <el-table-column label="手术时间" prop="opDatetime" show-overflow-tooltip></el-table-column>
           <el-table-column fixed="right" label="操作" width="80">
             <template #default="scope">
-
               <el-button circle icon="el-icon-view" title="查看"
                          @click="dianJiChaKanShouShu(scope.row,scope.$index)"></el-button>
               <el-button circle icon="iconfont icon-dayin" title="打印"
@@ -77,7 +76,6 @@ export default {
     const dateRange = ref([])
     const daYing = ref()
     const tableIndex = ref(-1)
-    const xianShiYeMian = ref(true)
 
     const shouShuShuJu = ref({
       data: [],
@@ -158,17 +156,10 @@ export default {
       }
     }
 
-    watch(() => router.currentRoute.value.path, () => {
-      let path = router.currentRoute.value.path
-      if (path === '/inpatient/zhuYuanYiSheng/shouShuShenQing') {
-        xianShiYeMian.value = true
-      } else xianShiYeMian.value = path !== '/inpatient/zhuYuanYiSheng/shouShuShenQing/xinZengShouShuShenQing';
-    })
-
 
     const dianJiXinZhenShouShu = () => {
       if (youWuXuanZheHuanZhe()) return
-      router.push('/inpatient/zhuYuanYiSheng/shouShuShenQing/xinZengShouShuShenQing')
+      router.push('/inpatient/zhuYuanYiSheng/xinZengShouShuShenQing')
     }
 
 
@@ -186,7 +177,6 @@ export default {
       daYing,
       rowClass,
       dianJiXinZhenShouShu,
-      xianShiYeMian
     }
   }
 }

src/components/zhu-yuan-yi-sheng/shou-shu-shen-qing/XinZengShouShuShenQing.vue → src/views/hospitalization/zhu-yuan-yi-sheng/shou-shu-shen-qing/XinZengShouShuShenQing.vue

@@ -235,7 +235,7 @@ export default {
       data.list = xinZhenShuJu.value
       xinZengShouShuShenQing(data).then((res) => {
         xinZhenShuJu.value = []
-        router.push('/inpatient/zhuYuanYiSheng/shouShuShenQing')
+        router.go(-1)
       })
     }
 

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/TianJiaYiZhu.vue → src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/TianJiaYiZhu.vue

@@ -1,290 +1,286 @@
 <template>
-  <huo-qu-mu-ban @muBanShuJu="muBanShuJu" ref="muBanRef"></huo-qu-mu-ban>
+  <huo-qu-mu-ban ref="muBanRef" @muBanShuJu="muBanShuJu"></huo-qu-mu-ban>
   <bao-cun-mu-ban ref="baoCunMuBanRef"></bao-cun-mu-ban>
-  <el-dialog v-model="dialog" :title="title" width="100%" :close-on-click-modal="false" :close-on-press-escape="false"
-             :show-close="false" top="15%">
-    <template v-for="item in tiShiBiaoTi">
-      <el-alert :title="item.title" :type="item.type" effect="dark"></el-alert>
+  <template v-for="item in tiShiBiaoTi">
+    <el-alert :title="item.title" :type="item.type" effect="dark"></el-alert>
+  </template>
+  <el-button icon="el-icon-arrow-left" style="font-size: 14px" type="text" @click="router.go(-1)">返回</el-button>
+  <el-button type="primary" @click="muBanRef.dialog = true">获取模板</el-button>
+  <el-button :disabled="yiZhuList.length === 0" type="primary" @click="baoCunMuBanClick">保存模板</el-button>
+  <el-popover
+      :width="260"
+      placement="bottom-end"
+      title="错误信息"
+      trigger="click"
+  >
+    <template #reference>
+      <el-button>错误信息</el-button>
     </template>
-    <el-button type="primary" @click="muBanRef.dialog = true">获取模板</el-button>
-    <el-button type="primary" :disabled="yiZhuList.length === 0" @click="baoCunMuBanClick">保存模板</el-button>
-    <el-popover
-        placement="bottom-end"
-        title="错误信息"
-        :width="260"
-        trigger="click"
-    >
-      <template #reference>
-        <el-button>错误信息</el-button>
+    <template #default>
+      <span v-html="cuoWuXinXi"></span>
+    </template>
+  </el-popover>
+  {{ count }}
+  <el-form v-model="yiZhuData" label-width="80px" size="mini">
+    <el-row>
+      <el-col :span="span">
+        <el-form-item label="医嘱名称:" prop="orderName">
+          <el-input v-model="yiZhuData.orderName" @click="yiZhuMingDialog = true"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="规格:" prop="orderName">
+          <el-input v-model="yiZhuData.drugSpecification" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="频率:" prop="orderName">
+          <el-select v-model="yiZhuData.frequCode" :remote-method="pinLvRemoteMethod" clearable filterable remote
+                     size="mini"
+                     @change="yiZhuData.frequCode === 'ONCE' ? yiZhuData.endTime = null : '' ">
+            <el-option v-for="item in yaoPinPingLvData" :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="span">
+        <el-form-item label="一次剂量:" prop="orderName">
+          <el-input-number v-model="yiZhuData.dose" :min="0" :precision="2" style="width: 110px"
+                           @change="jiSuanLingLiang"></el-input-number>
+          <el-select v-model="yiZhuData.doseUnit" size="mini" style="width: 80px" @change="xuanZheJiLiang">
+            <el-option v-for="item in yaoPinJiLiangData" :key="item.code" :label="item.name" :value="item.code">
+              <span style="color: #8492a6; font-size: 12px">{{ item.value }}</span>
+              <el-divider direction="vertical"></el-divider>
+              <span>{{ item.name }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="领量:" prop="orderName">
+          <el-input v-model="yiZhuData.drugQuan" disabled style="width: 60px"></el-input>
+          <el-input v-model="yiZhuData.miniUnitName" disabled style="width: 60px"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="给药方式:" prop="orderName">
+          <el-select v-model="yiZhuData.supplyCode" :remote-method="geiYaoFangShiRemoteMethod" filterable remote
+                     size="mini">
+            <el-option v-for="item in geiYaoFangShiData" :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="span">
+        <el-form-item label="医嘱时间:" prop="orderName">
+          <el-input v-model="yiZhuData.orderTime" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="开始时间:" prop="orderName">
+          <el-date-picker v-model="yiZhuData.startTime"
+                          :disabled-date="disabledDate"
+                          format="YYYY-MM-DD HH:mm:ss"
+                          type="datetime"
+                          value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="停止时间:" prop="orderName">
+          <el-date-picker v-model="yiZhuData.endTime" :disabled="yiZhuData.frequCode === 'ONCE' "
+                          :disabled-date="disabledDate"
+                          format="YYYY-MM-DD HH:mm:ss"
+                          type="datetime"
+                          value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="医生:" prop="orderName">
+          {{ store.state.user.info.name }}
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="执行科室:" prop="orderName">
+          <el-select v-model="yiZhuData.execUnit" :remote-method="metZhiXingKeShi" filterable remote
+                     style="width: 120px">
+            <el-option v-for="item in zhiXingKeShiData" :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="span">
+        <el-form-item label="父医嘱:" prop="orderName">
+          <el-select v-model="yiZhuData.parentNo" :disabled="yiZhuData.serial === '00' "
+                     clearable @clear="yiZhuData.parentNo = null"
+                     @click="fuYiZhuClick">
+            <el-option v-for="item in fuYiZhuData" :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="span" :title="yiZhuData.discription">
+        <el-form-item label="医嘱描述:" prop="orderName">
+          <el-input v-model="yiZhuData.discription" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="医生嘱托:" prop="orderName">
+          <el-input v-model="yiZhuData.instruction" clearable maxlength="50" show-word-limit style="width: 130px"
+                    type="textarea"></el-input>
+          <el-select v-model="yiZhuData.kfFlag" clearable style="width: 80px" @clear="yiZhuData.kfFlag = null">
+            <el-option key="1" label="饭前" value="1"></el-option>
+            <el-option key="2" label="饭后" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="费用标志:" prop="orderName">
+          <el-select v-model="yiZhuData.selfBuy" clearable style="width: 120px" @clear="yiZhuData.selfBuy = null">
+            <el-option key="1" label="自备" value="1"></el-option>
+            <el-option key="2" label="嘱托" value="2"></el-option>
+            <el-option key="3" label="基数药" value="3"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="医保自费:" prop="orderName">
+          <el-switch
+              v-model="yiZhuData.ybSelfFlag"
+              active-color="#13ce66"
+              active-text="自费"
+              active-value="1"
+              inactive-color="#ff4949"
+              inactive-text="记账"
+              inactive-value="0">
+          </el-switch>
+        </el-form-item>
+      </el-col>
+      <el-col :span="span">
+        <el-form-item label="是否紧急:" prop="orderName">
+          <el-switch
+              v-model="yiZhuData.emergencyFlag"
+              active-color="#13ce66"
+              active-text="是"
+              active-value="1"
+              inactive-color="#ff4949"
+              inactive-text="否"
+              inactive-value="0">
+          </el-switch>
+        </el-form-item>
+      </el-col>
+      <el-col v-if="yiZhuData.kjywFlag !== 0" :span="span">
+        <el-form-item label="用药方式:">
+          <el-select v-model="yiZhuData.yyfs" style="width: 120px;"
+                     @change="kangJunYaoYongYaoFangShiGaiBian">
+            <el-option v-for="item in kangJunYaoWuYongYaoFangShi" :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="span">
+        <el-form-item v-if="yiZhuData.kjywFlag !== 0" label="切口等级:">
+          <el-select v-model="yiZhuData.ssqk"
+                     :disabled="yiZhuData.yyfs !== 1 && yiZhuData.yyfs !== 2 && yiZhuData.yyfs !== null"
+                     clearable style="width: 120px;" @clear="yiZhuData.ssqk = null">
+            <el-option v-for="item in kangJunYaoWuQieKou" :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="span">
+        <el-form-item v-if="yiZhuData.kjywFlag !== 0" label="用药时间:">
+          <el-select v-model="yiZhuData.yysj"
+                     :disabled="yiZhuData.yyfs !== 1 && yiZhuData.yyfs !== 2 && yiZhuData.yyfs !== null"
+                     clearable
+                     style="width: 120px;" @clear="yiZhuData.yysj = null">
+            <el-option v-for="item in kangJunYaoWuYongYaoShiJian" :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-row>
+  </el-form>
+  <el-button icon="el-icon-plus" type="primary" @click="tianJiaYiZhu">添加</el-button>
+  <el-button icon="el-icon-check" type="success" @click="baoCunYiZhuClick">保存
+  </el-button>
+  <el-button icon="el-icon-close" type="danger" @click="dialog = false">关闭</el-button>
+  <el-button @click="dianJiXiuGaiZhiXingKeShi">修改执行科室</el-button>
+  <el-table :data="yiZhuList" :height="windowSize.h / 3"
+            @selection-change="dianJiXuanZhongShuJu">
+    <el-table-column type="selection"></el-table-column>
+    <el-table-column label="排序" type="index"></el-table-column>
+    <el-table-column label="uuid" prop="id"></el-table-column>
+    <el-table-column label="医嘱编码" prop="orderCode"></el-table-column>
+    <el-table-column label="医嘱名称" prop="orderName" show-overflow-tooltip></el-table-column>
+    <el-table-column label="医嘱时间" prop="orderTime" width="70"></el-table-column>
+    <el-table-column label="开始时间" prop="startTime" width="70"></el-table-column>
+    <el-table-column label="结束时间" prop="endTime" width="70"></el-table-column>
+    <el-table-column label="规格" prop="drugSpecification"></el-table-column>
+    <el-table-column label="频率" prop="frequCodeName"></el-table-column>
+    <el-table-column label="一次剂量" prop="dose">
+      <template #default="scope">
+        {{ scope.row.dose }} {{ scope.row.doseUnitName }}
       </template>
-      <template #default>
-        <span v-html="cuoWuXinXi"></span>
+    </el-table-column>
+    <el-table-column label="领量" prop="drugQuan">
+      <template #default="scope">
+        {{ scope.row.drugQuan }} {{ scope.row.miniUnitName }}
       </template>
-    </el-popover>
-    {{ count }}
-    <el-form v-model="yiZhuData" label-width="80px" size="mini">
-      <el-row>
-        <el-col :span="span">
-          <el-form-item label="医嘱名称:" prop="orderName">
-            <el-input v-model="yiZhuData.orderName" @click="yiZhuMingDialog = true"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="规格:" prop="orderName">
-            <el-input v-model="yiZhuData.drugSpecification" disabled></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="频率:" prop="orderName">
-            <el-select v-model="yiZhuData.frequCode" size="mini" remote filterable clearable
-                       @change="yiZhuData.frequCode === 'ONCE' ? yiZhuData.endTime = null : '' "
-                       :remote-method="pinLvRemoteMethod">
-              <el-option v-for="item in yaoPinPingLvData" :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="span">
-          <el-form-item label="一次剂量:" prop="orderName">
-            <el-input-number v-model="yiZhuData.dose" :precision="2" :min="0" style="width: 110px"
-                             @change="jiSuanLingLiang"></el-input-number>
-            <el-select v-model="yiZhuData.doseUnit" size="mini" style="width: 80px" @change="xuanZheJiLiang">
-              <el-option v-for="item in yaoPinJiLiangData" :key="item.code" :label="item.name" :value="item.code">
-                <span style="color: #8492a6; font-size: 12px">{{ item.value }}</span>
-                <el-divider direction="vertical"></el-divider>
-                <span>{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="领量:" prop="orderName">
-            <el-input v-model="yiZhuData.drugQuan" disabled style="width: 60px"></el-input>
-            <el-input v-model="yiZhuData.miniUnitName" disabled style="width: 60px"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="给药方式:" prop="orderName">
-            <el-select v-model="yiZhuData.supplyCode" size="mini" remote filterable
-                       :remote-method="geiYaoFangShiRemoteMethod">
-              <el-option v-for="item in geiYaoFangShiData" :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="span">
-          <el-form-item label="医嘱时间:" prop="orderName">
-            <el-input v-model="yiZhuData.orderTime" disabled></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="开始时间:" prop="orderName">
-            <el-date-picker type="datetime" :disabled="title==='医嘱模板编辑' "
-                            value-format="YYYY-MM-DD HH:mm:ss"
-                            format="YYYY-MM-DD HH:mm:ss"
-                            :disabled-date="disabledDate"
-                            v-model="yiZhuData.startTime"></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="停止时间:" prop="orderName">
-            <el-date-picker type="datetime" :disabled="title==='医嘱模板编辑' || yiZhuData.frequCode === 'ONCE' "
-                            value-format="YYYY-MM-DD HH:mm:ss"
-                            format="YYYY-MM-DD HH:mm:ss"
-                            :disabled-date="disabledDate"
-                            v-model="yiZhuData.endTime"></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="医生:" prop="orderName">
-            {{ store.state.user.info.name }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="执行科室:" prop="orderName">
-            <el-select v-model="yiZhuData.execUnit" remote filterable :remote-method="metZhiXingKeShi"
-                       style="width: 120px">
-              <el-option v-for="item in zhiXingKeShiData" :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="span">
-          <el-form-item label="父医嘱:" prop="orderName">
-            <el-select v-model="yiZhuData.parentNo" :disabled="yiZhuData.serial === '00' "
-                       @click="fuYiZhuClick" clearable
-                       @clear="yiZhuData.parentNo = null">
-              <el-option v-for="item in fuYiZhuData" :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="span" :title="yiZhuData.discription">
-          <el-form-item label="医嘱描述:" prop="orderName">
-            <el-input v-model="yiZhuData.discription" disabled></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="医生嘱托:" prop="orderName">
-            <el-input v-model="yiZhuData.instruction" type="textarea" clearable show-word-limit maxlength="50"
-                      style="width: 130px"></el-input>
-            <el-select v-model="yiZhuData.kfFlag" style="width: 80px" clearable @clear="yiZhuData.kfFlag = null">
-              <el-option key="1" label="饭前" value="1"></el-option>
-              <el-option key="2" label="饭后" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="费用标志:" prop="orderName">
-            <el-select v-model="yiZhuData.selfBuy" style="width: 120px" clearable @clear="yiZhuData.selfBuy = null">
-              <el-option key="1" label="自备" value="1"></el-option>
-              <el-option key="2" label="嘱托" value="2"></el-option>
-              <el-option key="3" label="基数药" value="3"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="医保自费:" prop="orderName">
-            <el-switch
-                :disabled="title==='医嘱模板编辑' "
-                v-model="yiZhuData.ybSelfFlag"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
-                active-text="自费"
-                inactive-text="记账"
-                active-value="1"
-                inactive-value="0">
-            </el-switch>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span">
-          <el-form-item label="是否紧急:" prop="orderName">
-            <el-switch
-                :disabled="title==='医嘱模板编辑' "
-                v-model="yiZhuData.emergencyFlag"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
-                active-text="是"
-                inactive-text="否"
-                active-value="1"
-                inactive-value="0">
-            </el-switch>
-          </el-form-item>
-        </el-col>
-        <el-col :span="span" v-if="yiZhuData.kjywFlag !== 0">
-          <el-form-item label="用药方式:">
-            <el-select v-model="yiZhuData.yyfs" style="width: 120px;"
-                       @change="kangJunYaoYongYaoFangShiGaiBian">
-              <el-option v-for="item in kangJunYaoWuYongYaoFangShi" :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="span" v-if="title ==='添加医嘱' ">
-          <el-form-item label="切口等级:" v-if="yiZhuData.kjywFlag !== 0">
-            <el-select v-model="yiZhuData.ssqk"
-                       :disabled="yiZhuData.yyfs !== 1 && yiZhuData.yyfs !== 2 && yiZhuData.yyfs !== null"
-                       style="width: 120px;" @clear="yiZhuData.ssqk = null" clearable>
-              <el-option v-for="item in kangJunYaoWuQieKou" :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="span">
-          <el-form-item label="用药时间:" v-if="yiZhuData.kjywFlag !== 0">
-            <el-select v-model="yiZhuData.yysj" style="width: 120px;"
-                       :disabled="yiZhuData.yyfs !== 1 && yiZhuData.yyfs !== 2 && yiZhuData.yyfs !== null"
-                       @clear="yiZhuData.yysj = null" clearable>
-              <el-option v-for="item in kangJunYaoWuYongYaoShiJian" :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-row>
-    </el-form>
-    <el-button type="primary" @click="tianJiaYiZhu" icon="el-icon-plus">添加</el-button>
-    <el-button type="success" @click="baoCunYiZhuClick" :disabled="title === '医嘱模板编辑'"
-               icon="el-icon-check">保存
-    </el-button>
-    <el-button type="danger" @click="dialog = false" icon="el-icon-close">关闭</el-button>
-    <el-button @click="dianJiXiuGaiZhiXingKeShi">修改执行科室</el-button>
-    <el-table :data="yiZhuList" :height="windowSize.h / 3"
-              @selection-change="dianJiXuanZhongShuJu">
-      <el-table-column type="selection"></el-table-column>
-      <el-table-column type="index" label="排序"></el-table-column>
-      <el-table-column label="uuid" prop="id"></el-table-column>
-      <el-table-column label="医嘱编码" prop="orderCode"></el-table-column>
-      <el-table-column label="医嘱名称" prop="orderName" show-overflow-tooltip></el-table-column>
-      <el-table-column label="医嘱时间" prop="orderTime" width="70"></el-table-column>
-      <el-table-column label="开始时间" prop="startTime" width="70"></el-table-column>
-      <el-table-column label="结束时间" prop="endTime" width="70"></el-table-column>
-      <el-table-column label="规格" prop="drugSpecification"></el-table-column>
-      <el-table-column label="频率" prop="frequCodeName"></el-table-column>
-      <el-table-column label="一次剂量" prop="dose">
-        <template #default="scope">
-          {{ scope.row.dose }} {{ scope.row.doseUnitName }}
-        </template>
-      </el-table-column>
-      <el-table-column label="领量" prop="drugQuan">
-        <template #default="scope">
-          {{ scope.row.drugQuan }} {{ scope.row.miniUnitName }}
-        </template>
-      </el-table-column>
-      <el-table-column label="给药方式" prop="supplyCodeName"></el-table-column>
-      <el-table-column label="执行科室" prop="execUnitName"></el-table-column>
-      <el-table-column label="父医嘱" prop="parentNo"></el-table-column>
-      <el-table-column label="类型" prop="drugFlag"></el-table-column>
-      <el-table-column label="费用标志" prop="selfBuy">
-        <template #default="scope">
-          {{ getSelfBuy(scope.row.selfBuy) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="医保自费">
-        <template #default="scope">
-          <el-tag v-if="scope.row.ybSelfFlag === '1'">是</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否紧急">
-        <template #default="scope">
-          <el-tag v-if="scope.row.emergencyFlag === '1'">是</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="120" fixed="right">
-        <template #default="scope">
-          <el-button @click="xiuGaiYiZhu(scope.row)" icon="el-icon-edit" type="warning" circle></el-button>
-          <el-button @click="shanChuBiaoGeYiZhu(scope.$index)" icon="el-icon-delete" type="danger" circle></el-button>
-          <el-button @click="fuZhiYiZhu(scope.row)" type="info" class="iconfont icon-fuzhi" circle></el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-dialog>
-  <el-dialog v-model="yiZhuMingDialog" title="搜索医嘱名" width="95%" :before-close="guanBiSouSuoXiangMu">
-    <el-input v-model="orderName" @keyup.enter="queryYiZhuClick" ref="searchInput" style="width: 220px;"
-              clearable></el-input>
-    <el-button @click="queryYiZhuClick" type="primary" icon="el-icon-search">搜索</el-button>
+    </el-table-column>
+    <el-table-column label="给药方式" prop="supplyCodeName"></el-table-column>
+    <el-table-column label="执行科室" prop="execUnitName"></el-table-column>
+    <el-table-column label="父医嘱" prop="parentNo"></el-table-column>
+    <el-table-column label="类型" prop="drugFlag"></el-table-column>
+    <el-table-column label="费用标志" prop="selfBuy">
+      <template #default="scope">
+        {{ getSelfBuy(scope.row.selfBuy) }}
+      </template>
+    </el-table-column>
+    <el-table-column label="医保自费">
+      <template #default="scope">
+        <el-tag v-if="scope.row.ybSelfFlag === '1'">是</el-tag>
+      </template>
+    </el-table-column>
+    <el-table-column label="是否紧急">
+      <template #default="scope">
+        <el-tag v-if="scope.row.emergencyFlag === '1'">是</el-tag>
+      </template>
+    </el-table-column>
+    <el-table-column fixed="right" label="操作" width="120">
+      <template #default="scope">
+        <el-button circle icon="el-icon-edit" type="warning" @click="xiuGaiYiZhu(scope.row)"></el-button>
+        <el-button circle icon="el-icon-delete" type="danger" @click="shanChuBiaoGeYiZhu(scope.$index)"></el-button>
+        <el-button circle class="iconfont icon-fuzhi" type="info" @click="fuZhiYiZhu(scope.row)"></el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+  <el-dialog v-model="yiZhuMingDialog" :before-close="guanBiSouSuoXiangMu" title="搜索医嘱名" width="95%">
+    <el-input ref="searchInput" v-model="orderName" clearable style="width: 220px;"
+              @keyup.enter="queryYiZhuClick"></el-input>
+    <el-button icon="el-icon-search" type="primary" @click="queryYiZhuClick">搜索</el-button>
     <el-table
         :data="orderData.data.slice((orderData.currentPage - 1) * orderData.pageSize , orderData.currentPage * orderData.pageSize)"
-        :height="windowSize.h / 1.6" stripe highlight-current-row>
+        :height="windowSize.h / 1.6" highlight-current-row stripe>
       <el-table-column label="编码" prop="code">
         <template #default="scope">
           <el-button @click="xuanZhongFeiYong(scope.row)">{{ scope.row.orderCode }}</el-button>
@@ -303,43 +299,46 @@
       <el-table-column label="毒麻类型" prop="drugFlagName"></el-table-column>
     </el-table>
     <el-pagination
+        :current-page="orderData.currentPage"
         :page-size="orderData.pageSize"
-        layout="total,prev,pager,next,jumper"
         :total="orderData.data.length"
-        @current-change="orderDataCurrent"
-        :current-page="orderData.currentPage">
+        layout="total,prev,pager,next,jumper"
+        @current-change="orderDataCurrent">
     </el-pagination>
   </el-dialog>
 </template>
 
 <script>
-import {computed, ref, watch} from "vue";
+import {computed, onActivated, ref, watch} from "vue";
 import {
   huoQuFeiYongXinXi,
   huoQuGeiYaoFangShi,
   huoQuXiangMu,
-  huoQuZhuYuanPinLv,
   huoQuZhiXinKeShi,
+  huoQuZhuYuanPinLv,
   shangChuanYiZhu,
 } from "@/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru";
-import {huanZheXinXi, getSelfBuy} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng"
-import store from "../../../store";
+import {
+  getSelfBuy,
+  huanZheXinXi,
+  youWuXuanZheHuanZhe
+} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng"
+import store from "../../../../store";
 import {listIsBlank, listNotBlank, stringIsBlank, stringNotBlank} from "@/utils/blank-utils";
 import {kangJunYaoWuQieKou, kangJunYaoWuYongYaoFangShi, kangJunYaoWuYongYaoShiJian} from "@/data";
 import {ElMessage, ElMessageBox} from "element-plus";
 import {clone} from "@/utils/clone";
-import HuoQuMuBan from "./HuoQuMuBan.vue";
+import HuoQuMuBan from "../../../../components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/HuoQuMuBan.vue";
 import {uuid} from "@/utils/getUuid";
-import BaoCunMuBan from "./BaoCunMuBan.vue";
+import BaoCunMuBan from "../../../../components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/BaoCunMuBan.vue";
 import {getServerDateApi} from "@/api/public-api";
+import router from "@/router";
 
 
 export default {
   name: "TianJiaHuoXiuGaiYiZhu",
   components: {BaoCunMuBan, HuoQuMuBan},
   setup() {
-    const dialog = ref(false)
-    const title = ref('添加医嘱')
     const windowSize = computed(() => {
       return store.state.app.windowSize
     })
@@ -681,6 +680,7 @@ export default {
       if (listIsBlank(yiZhuList.value)) {
         return ElMessage.error('请先选择数据')
       }
+      if (youWuXuanZheHuanZhe()) return
       let data = {
         inpatientNo: huanZheXinXi.value.inpatientNo,
         admissTimes: huanZheXinXi.value.admissTimes,
@@ -688,7 +688,7 @@ export default {
         list: yiZhuList.value
       }
       shangChuanYiZhu(data).then((res) => {
-        dialog.value = false
+        router.go(-1)
       }).catch((e) => {
         cuoWuXinXi.value = e
       })
@@ -765,17 +765,6 @@ export default {
       ]
     })
 
-    watch(() => dialog.value, () => {
-      qingKong()
-      if (dialog.value && title.value === '添加医嘱') {
-        kaiQiDaoJiShi()
-      } else {
-        clearInterval(daoJiShi)
-        tianJiaYiZhuWeiYiBiaoShi.value = []
-        yiZhuList.value = []
-      }
-    })
-
     watch(() => yiZhuMingDialog.value, () => {
       if (yiZhuMingDialog.value) {
         setTimeout(() => {
@@ -867,6 +856,16 @@ export default {
 
     let daoJiShi = null
 
+    onActivated(() => {
+      if (stringIsBlank(huanZheXinXi.value.inpatientNo)) {
+        ElMessage.warning('您现在进入的是医嘱模板编辑')
+      } else {
+        ElMessage.warning('您现在进入的是医嘱编辑模块，' +
+            '您的编辑时间有 10 分钟,你准备好了吗？Are ya ready kids?')
+        kaiQiDaoJiShi()
+      }
+    })
+
     // 倒计时功能
     const kaiQiDaoJiShi = () => {
       seconds.value = 600
@@ -878,16 +877,15 @@ export default {
     }
 
     const countDown = () => {
-      let m = parseInt(seconds.value / 60 % 60);
+      let m = parseInt((seconds.value / 60 % 60).toString());
       m = m < 10 ? "0" + m : m
-      let s = parseInt(seconds.value % 60);
+      let s = parseInt((seconds.value % 60).toString());
       s = s < 10 ? "0" + s : s
       count.value = '剩余操作时间 ' + m + '分' + s + '秒'
       if (seconds.value === 300) {
         ElMessageBox.alert('您的操作时间过半', '提示', {
           type: "warning"
         }).then((res) => {
-
         })
       } else if (seconds.value === 60 || seconds.value === 30 || seconds.value === 20) {
         ElMessage({
@@ -899,14 +897,13 @@ export default {
         })
       } else if (seconds.value === 0) {
         clearInterval(daoJiShi)
-        dialog.value = false
+        router.go(-1)
       }
     }
 
 
     return {
-      dialog,
-      title,
+      router,
       yiZhuData,
       span,
       searchInput,

src/views/hospitalization/zhu-yuan-yi-sheng/YiZhuLuRu.vue → src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/YiZhuLuRu.vue

@@ -133,7 +133,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange">
       </el-pagination>
-      <tian-jia-huo-xiu-gai-yi-zhu ref="tianJiaXiuGaiYiZhu"></tian-jia-huo-xiu-gai-yi-zhu>
+      <!--      <tian-jia-huo-xiu-gai-yi-zhu ref="tianJiaXiuGaiYiZhu"></tian-jia-huo-xiu-gai-yi-zhu>-->
     </el-main>
     <el-dialog v-model="yiZhuChaoZuoDialog"
                :close-on-click-modal="false"
@@ -169,12 +169,13 @@ import {
   piLiangXiuGaiTingZhiShiJian,
   yiZhuChaoZuo,
 } from "@/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru";
-import {huanZhePinLvData, huanZheXinXi, youWuXuanZheHuanZhe,} from './public-js/zhu-yuan-yi-sheng'
+import {huanZhePinLvData, huanZheXinXi, youWuXuanZheHuanZhe,} from '../public-js/zhu-yuan-yi-sheng'
 
 import {getDateRangeFormatDate} from "@/utils/date";
-import store from '../../../store'
+import store from '../../../../store'
 import {stringIsBlank, stringNotBlank} from '@/utils/blank-utils';
-import TianJiaHuoXiuGaiYiZhu from "../../../components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/TianJiaYiZhu.vue";
+import TianJiaHuoXiuGaiYiZhu from "./TianJiaYiZhu.vue";
+import router from "@/router";
 
 export default {
   name: "YiZhuLuRuZhuJian",
@@ -277,13 +278,16 @@ export default {
      */
     const tianJiaXiuGaiYiZhu = ref(null)
     const addYiZhuClick = () => {
-      if (youWuXuanZheHuanZhe()) {
-        tianJiaXiuGaiYiZhu.value.dialog = true
-        tianJiaXiuGaiYiZhu.value.title = '医嘱模板编辑'
-      } else {
-        tianJiaXiuGaiYiZhu.value.dialog = true
-        tianJiaXiuGaiYiZhu.value.title = '添加医嘱'
-      }
+      // if (youWuXuanZheHuanZhe()) {
+      //   tianJiaXiuGaiYiZhu.value.dialog = true
+      //   tianJiaXiuGaiYiZhu.value.title = '医嘱模板编辑'
+      // } else {
+      //   tianJiaXiuGaiYiZhu.value.dialog = true
+      //   tianJiaXiuGaiYiZhu.value.title = '添加医嘱'
+      // }
+      router.push({
+        name: 'xinZhenYiZhu',
+      })
     }
 
     watch(() => huanZheXinXi.value, () => {
@@ -438,7 +442,7 @@ function getYiZhuFlag(val) {
 
 <style scoped>
 :deep(.el-table .children-row) {
-  background: rgba(145, 247, 145, 0.5);
+  background: rgba(145, 247, 145, 0.93);
 }
 
 :deep(.el-table) {