完成检查申请。

src/App.vue

@@ -98,7 +98,7 @@ function getWindowSize() {
 .el-checkbox__inner {
   width: 16px;
   height: 16px;
-  border: 2px solid #000;
+  border: 1px solid #000;
   border-radius: 4px;
 }
 

src/api/zhu-yuan-yi-sheng/jian-cha-shen-qing.js

@@ -91,6 +91,16 @@ export function baoCunJianChaJianYanMuBan(data) {
     })
 }
 
+export function baoCunJianYanJianCha(data) {
+    return request({
+        url: url + 'baoCunJianYanJianCha',
+        method: 'post',
+        data
+    })
+}
+
+
+
 
 
 

src/components/zhu-yuan-yi-sheng/hui-zhen-shen-qing/TianJiaHuiZhenShenQing.vue

@@ -40,6 +40,28 @@
                      :value="item.code"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="自费:" prop="ybSelfFlag">
+        <el-switch
+            v-model="huiZhenShenQing.ybSelfFlag"
+            :active-value="1"
+            :inactive-value="null"
+            active-color="#13ce66"
+            active-text="是"
+            inactive-color="#ff4949"
+            inactive-text="否">
+        </el-switch>
+      </el-form-item>
+      <el-form-item label="紧急:" prop="emergencyFlag">
+        <el-switch
+            v-model="huiZhenShenQing.emergencyFlag"
+            :active-value="1"
+            :inactive-value="null"
+            active-color="#13ce66"
+            active-text="是"
+            inactive-color="#ff4949"
+            inactive-text="否">
+        </el-switch>
+      </el-form-item>
       <el-form-item label="病情简介:" prop="reqComment">
         <el-input v-model="huiZhenShenQing.reqComment" :rows="3" placeholder="请输入内容" type="textarea"></el-input>
       </el-form-item>
@@ -112,6 +134,8 @@ export default {
       actOrderNo: '', //新开的医嘱号
       hzDoctor1: '', //会诊的医生
       name: '', // 申请人
+      emergencyFlag: null, // 医嘱紧急
+      ybSelfFlag: null, // 自费
       huiZhenKeShi: {},
     })
 

src/components/zhu-yuan-yi-sheng/jian-cha-shen-qing/BianJiJianChaShenQing.vue

@@ -1,5 +1,13 @@
 <template>
   <el-dialog v-model="dialog" title="编辑检查" @close="guanBi">
+    <el-pagination
+        :current-page="index"
+        :page-size="1"
+        :total="count"
+        background
+        layout="total,  prev, pager, next"
+        @current-change="bianJiFenYe">
+    </el-pagination>
     <el-form label-width="100px" size="mini">
       <el-row>
         <el-col :span="12">
@@ -24,7 +32,7 @@
             {{ bianJiJianChaShuJu.execDeptName }}
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="急诊:">
             <el-switch
                 v-model="bianJiJianChaShuJu.jzFlag"
@@ -37,9 +45,22 @@
             </el-switch>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="自费:">
+            <el-switch
+                v-model="bianJiJianChaShuJu.ybSelfFlag"
+                :active-value="1"
+                :inactive-value="null"
+                active-color="#13ce66"
+                active-text="急诊"
+                inactive-color="#ff4949"
+                inactive-text="普通">
+            </el-switch>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="病室摘要:">
-            <el-input v-model="bianJiJianChaShuJu.reqComment" maxlength="125" show-word-limit
+            <el-input v-model="bianJiJianChaShuJu.reqComment" :rows="6" maxlength="125" show-word-limit
                       type="textarea"></el-input>
           </el-form-item>
         </el-col>
@@ -48,13 +69,13 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="体征信息:">
-            <el-input v-model="bianJiJianChaShuJu.reqTzComment" maxlength="125" show-word-limit
+            <el-input v-model="bianJiJianChaShuJu.reqTzComment" :rows="6" maxlength="125" show-word-limit
                       type="textarea"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="相关辅检结果:">
-            <el-input v-model="bianJiJianChaShuJu.reqOtherResult" maxlength="125" show-word-limit
+            <el-input v-model="bianJiJianChaShuJu.reqOtherResult" :rows="6" maxlength="125" show-word-limit
                       type="textarea"></el-input>
           </el-form-item>
         </el-col>
@@ -93,6 +114,9 @@
               inactive-text="本院">
           </el-switch>
         </el-col>
+        <el-col :offset="20" :span="24">
+          <el-button icon="el-icon-check" type="primary" @click="guanBi">确定</el-button>
+        </el-col>
       </el-row>
     </el-form>
   </el-dialog>
@@ -110,7 +134,8 @@ import {huoQuLinChuangZhenDuan} from "@/api/zhu-yuan-yi-sheng/jian-cha-shen-qing
 export default {
   name: "BianJiJianChaShenQing",
   components: {ShuoMingMuBan},
-  setup() {
+  emits: ['fan-ye'],
+  setup(props, ctx) {
     const windowSize = computed(() => {
       return store.state.app.windowSize
     })
@@ -121,6 +146,9 @@ export default {
     const linChuangZhenDuanShuJu = ref([])
     const linChuangDangQianYe = ref(1)
 
+    const count = ref(0)
+    const index = ref(0)
+
     const shuoMingMuBan = ref({
       dialog: true,
       data: [],
@@ -132,7 +160,9 @@ export default {
     // 诊断来源
     const zhenDuanLaiYuan = ref(false)
 
-    const daKaiBenDuiHua = (val) => {
+    const daKaiBenDuiHua = (val, xiaBiao, zhongShu) => {
+      index.value = xiaBiao + 1
+      count.value = zhongShu
       dialog.value = true
       bianJiJianChaShuJu.value = val
       if (stringNotBlank(val.diagCode)) {
@@ -172,6 +202,11 @@ export default {
       }
     }
 
+    const bianJiFenYe = (val) => {
+      index.value = val
+      ctx.emit('fan-ye', {val})
+    }
+
     const linChuangFanYe = (val) => {
       linChuangDangQianYe.value = val
     }
@@ -179,6 +214,7 @@ export default {
     const guanBi = () => {
       linChuangZhenDuanShuJu.value = []
       bianJiJianChaShuJu.value = {}
+      dialog.value = false
     }
 
 
@@ -197,7 +233,10 @@ export default {
       huoQuXiangXiZhenDuan,
       linChuangDangQianYe,
       linChuangFanYe,
-      guanBi
+      guanBi,
+      bianJiFenYe,
+      count,
+      index
     }
   }
 }

src/components/zhu-yuan-yi-sheng/jian-cha-shen-qing/ShuoMingMuBan.vue

@@ -9,15 +9,17 @@
     <el-button @click="huoQuShuoMingMuBan(0)">查询</el-button>
     <el-button @click="xinZengMuBan">新建</el-button>
     <el-table :data="shuoMingMuBan.data" :height="windowSize.h / 2">
-      <el-table-column type="expand">
+      <el-table-column label="名称" prop="name"></el-table-column>
+      <el-table-column label="说明" prop="jcText">
         <template #default="scope">
-          <pre>
-            {{ scope.row.jcText }}
-          </pre>
+          <el-popover :width="500">
+            <template #reference>
+              <el-button>详情</el-button>
+            </template>
+            <el-input v-model="scope.row.jcText" :rows="9" type="textarea"></el-input>
+          </el-popover>
         </template>
       </el-table-column>
-      <el-table-column label="名称" prop="name"></el-table-column>
-      <el-table-column label="说明" prop="jcText" show-overflow-tooltip></el-table-column>
       <el-table-column fixed="right" label="操作">
         <template #default="scope">
           <el-dropdown size="small" split-button type="primary" @click="handleClick('选中',scope.row)">

src/components/zhu-yuan-yi-sheng/jian-cha-shen-qing/TianJiaJianCha.vue

@@ -39,11 +39,7 @@
         <el-table :data="xuanZhongJianCha.data" :height="windowSize.h / 1.9">
           <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="startTime">
-            <template #default="scope">
-              <span v-html="huanHangXianShi(scope.row.startTime)"></span>
-            </template>
-          </el-table-column>
+          <el-table-column label="检查时间" prop="startTime" show-overflow-tooltip></el-table-column>
           <el-table-column label="执行科室" prop="execDeptName"></el-table-column>
           <el-table-column label="急诊标识" prop="jzFlag">
             <template #default="scope">
@@ -55,9 +51,11 @@
           <el-table-column label="临床诊断" prop="diagText" show-overflow-tooltip></el-table-column>
           <el-table-column label="编辑" width="120">
             <template #default="scope">
-              <el-button icon="el-icon-edit" round type="primary" @click="dianJiBianJi(scope.row)"></el-button>
+              <el-button icon="el-icon-edit" round type="primary"
+                         @click="dianJiBianJi(scope.row,scope.$index)"></el-button>
               <el-button icon="el-icon-delete" round type="danger"
-                         @click="xuanZhongJianCha.data.splice(scope.$index,1)"></el-button>
+                         @click="xuanZhongJianCha.data.splice(scope.$index,1);
+                         xuanZhongJianCha.weiBianMa.splice(scope.$index,1)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -109,13 +107,14 @@
       </el-row>
     </el-form>
   </el-dialog>
-  <bian-ji-jian-cha-shen-qing ref="bianJiRef"></bian-ji-jian-cha-shen-qing>
+  <bian-ji-jian-cha-shen-qing ref="bianJiRef" @fanYe="bianJiFanYe"></bian-ji-jian-cha-shen-qing>
 </template>
 
 <script>
 import {computed, onMounted, ref} from "vue";
 import {
   baoCunJianChaJianYanMuBan,
+  baoCunJianYanJianCha,
   chaKanFenLeiXiangQing,
   huoQuJianChaMing,
   jianChaMuBanMing,
@@ -127,12 +126,13 @@ import {ElMessage, ElMessageBox} from "element-plus";
 import {listNotBlank} from "@/utils/blank-utils";
 import BianJiJianChaShenQing from "@/components/zhu-yuan-yi-sheng/jian-cha-shen-qing/BianJiJianChaShenQing.vue";
 import {huanHangXianShi} from "@/utils/date";
+import {huanZheXinXi, youWuXuanZheHuanZhe} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 
 export default {
   name: "TianJiaJianCha",
   components: {BianJiJianChaShenQing},
   setup() {
-    const tianJiaJianChaHuiHua = ref(true)
+    const tianJiaJianChaHuiHua = ref(false)
     const chaZhaoLeiXing = ref(2)
     const xuanZhongJianCha = ref({
       data: [],
@@ -197,8 +197,8 @@ export default {
       xiangXiShuJu.value.dialog = false
     }
 
-    const dianJiBianJi = (row) => {
-      bianJiRef.value.daKaiBenDuiHua(row)
+    const dianJiBianJi = (row, index) => {
+      bianJiRef.value.daKaiBenDuiHua(row, index, xuanZhongJianCha.value.data.length)
     }
 
     const closeDialog = () => {
@@ -206,7 +206,14 @@ export default {
     }
 
     const baoCunJianChaShenQing = () => {
-      console.log(xuanZhongJianCha.value)
+      if (youWuXuanZheHuanZhe()) return
+      let data = huanZheXinXi.value
+      data.list = xuanZhongJianCha.value.data
+      data.reqType = 3
+      baoCunJianYanJianCha(data).then(res => {
+        xuanZhongJianCha.value.weiBianMa = []
+        xuanZhongJianCha.value.data = []
+      })
     }
 
 
@@ -251,7 +258,7 @@ export default {
               confirmButtonText: '覆盖',
               cancelButtonText: '取消',
             }).then(() => {
-              faSongBaoCunMuBan(true)
+              faSongBaoCunMuBan()
             }).catch((e) => {
             })
           }
@@ -261,15 +268,20 @@ export default {
       }
     }
 
-    const faSongBaoCunMuBan = (flag) => {
-      baoCunMuBan.value.fuGaiYuanShuJu = flag
+    const faSongBaoCunMuBan = () => {
       baoCunMuBan.value.reqType = 3
       baoCunMuBan.value.list = xuanZhongJianCha.value.data
+      baoCunMuBan.value.tcExec = store.state.user.info.deptCode
       baoCunJianChaJianYanMuBan(baoCunMuBan.value).then((res) => {
-        console.log(res)
+        dianJiLeiXingChaXun()
       })
     }
 
+    const bianJiFanYe = (val) => {
+      let index = val.val - 1
+      bianJiRef.value.daKaiBenDuiHua(xuanZhongJianCha.value.data[index], index, xuanZhongJianCha.value.data.length)
+    }
+
     onMounted(() => {
       dianJiLeiXingChaXun()
     })
@@ -295,6 +307,7 @@ export default {
       baoCunMuBanRef,
       dianJiBaoCunMuBan,
       baoCunMuBanJiaoYan,
+      bianJiFanYe
     }
   }
 }