优化代码

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

@@ -42,11 +42,11 @@ export function huoQuShengQingXiangQing(reqNo) {
     })
 }
 
-export function queryCheckTextResults(patNo, times, reqNo) {
+export function queryCheckTextResults(patNo, reqNo) {
     return request({
         url: url + 'queryCheckTextResults',
         method: 'get',
-        params: {patNo, times, reqNo}
+        params: {patNo, reqNo}
     })
 }
 

src/components/med-tec-mod/YiJiXiangMuLuRu.vue

@@ -83,7 +83,7 @@
           <el-table-column label="数量" prop="amount" width="130">
             <template #default="scope">
               <el-input-number v-model="scope.row.amount" :min="0"
-                               :precision="scope.row.serial === '00' ? 1 : 0"
+                               :precision="scope.row.serial === '00' ? 1 : 3"
                                style="width: 120px"/>
             </template>
           </el-table-column>

src/components/si-sheet-upload/jian-yan-jian-cha/jianYanJianCha.vue

@@ -1,129 +0,0 @@
-<template>
-    <el-tabs v-model="asideTabs">
-        <el-tab-pane :name="0" label="检查记录">
-            <el-container>
-                <el-aside width="450px">
-                    <check-application-history :data="jianChaShuJu"
-                                               :returnData="dianJiaJianChaXiangQing"
-                                               :current-change="handleCurrentChange"/>
-                </el-aside>
-                <el-main>
-                    <jian-cha-jie-guo ref="jianChaJieGuoRef" :pat-info="props.huanZheXinXi"/>
-                </el-main>
-            </el-container>
-        </el-tab-pane>
-        <el-tab-pane :name="1" label="检验记录">
-
-        </el-tab-pane>
-    </el-tabs>
-
-</template>
-
-<script setup name="jianYanJianCha">
-
-import {computed, ref, watch} from 'vue'
-import {
-    baoCunJianYanJianCha,
-    diagnosisInOurHospital, getJcItem,
-    huoQuJianChaShenQing,
-    huoQuJianYanJianChaMing,
-    huoQuShengQingXiangQing,
-    queryCheckTextResults,
-} from '@/api/zhu-yuan-yi-sheng/jian-yan-jian-cha-shen-qing'
-import store from '@/store'
-import {getDateRangeFormatDate} from '@/utils/date'
-import {shortcuts} from '@/data/shortcuts'
-import {ElMessageBox} from 'element-plus'
-import CheckApplicationHistory from "@/components/zhu-yuan-yi-sheng/jian-cha-shen-qing/aside/CheckApplicationHistory";
-import InspectionRequisition
-    from "@/views/hospitalization/zhu-yuan-yi-sheng/jian-cha-jian-yan-shen-qing/InspectionRequisition";
-import SaveTemplateInspection
-    from "@/views/hospitalization/zhu-yuan-yi-sheng/jian-cha-jian-yan-shen-qing/SaveTemplateInspection";
-import {BizException, ExceptionEnum} from "@/utils/BizException";
-import {getServerDateApi, yaoPinXiangMuPiPeiYiBao} from "@/api/public-api";
-import {stringNotBlank} from "@/utils/blank-utils";
-import JianChaJieGuo from "@/components/zhu-yuan-yi-sheng/jian-cha-shen-qing/da-ying/JianChaJieGuo.vue";
-import XcTable from "@/components/xiao-chan/xc-table/XcTable.vue";
-import XcDialogV2 from "@/components/xiao-chan/dialog/XcDialogV2.vue";
-import XcComboGrid from "@/components/xiao-chan/combo-grid/XcComboGrid.vue";
-
-const props = defineProps({
-    huanZheXinXi: {
-        type: Object,
-        default: {}
-    },
-    height: {
-        type: Number,
-        default: 600
-    }
-})
-const asideTabs = ref(0)
-
-const jianChaShuJu = ref({
-    delFlag:1,
-    currentPage: 1,
-    total: 0,
-    pageSize: 20,
-    data: [],
-})
-
-const daYingJianChaRef = ref()
-// 检查结果
-const jianChaJieGuoRef = ref()
-
-onMounted(() => {
-    handleCurrentChange()
-})
-
-/**
- * 点击查看检查申请单详情
- * @param row 行数据
- */
-const dianJiaJianChaXiangQing = (row) => {
-    queryCheckTextResults(row.inpatientNo, row.admissTimes, row.reqNo).then((res) => {
-        res.row = row
-        jianChaJieGuoRef.value.fillData(res).then(() => {
-        })
-    }).catch((e) => {
-        jianChaJieGuoRef.value.fillData({
-            record: {}, recordReport: {}, row: {}
-        })
-    })
-
-    huoQuShengQingXiangQing(row.reqNo).then((res) => {
-        // daYingJianChaRef.value.jieShouShuJu(res)
-    })
-}
-
-/**
- * 检查申请单分页
- * @param val
- */
-const handleCurrentChange = (val) => {
-    jianChaShuJu.value.currentPage = val
-    dianJiChaXunHuanZheJianCha(jianChaShuJu.value.total)
-}
-
-/**
- * 点击查询患者检查
- * @param total
- */
-const dianJiChaXunHuanZheJianCha = (total) => {
-    let param = {
-        patNo: props.huanZheXinXi.inpatientNo,
-        times: props.huanZheXinXi.admissTimes,
-        orderName: '',
-        total: 0,
-        currentPage: jianChaShuJu.value.currentPage,
-        pageSize: jianChaShuJu.value.pageSize,
-        startTime:'',
-        endTime: '',
-    }
-    huoQuJianChaShenQing(param).then((res) => {
-        if (total === 0) {
-            jianChaShuJu.value.total = res.total
-        }
-        jianChaShuJu.value.data = res.records
-    })
-}
-</script>

src/components/zhu-yuan-yi-sheng/jian-cha-shen-qing/da-ying/JianChaJieGuo.vue

@@ -34,14 +34,14 @@
             检查所见：
           </div>
           <div style="border: 1px solid;height: 400px;">
-            {{ data.recordReport.textJc }}
+            {{ data.record.checkWhatYouSee }}
           </div>
         </div>
 
         <div style="margin-top: 3px">
           <div>诊断意见：</div>
           <div style="height: 100px">
-            {{ data.record.fsIcdText }}
+            {{ data.record.diagnosticOpinion }}
           </div>
         </div>
 
@@ -92,7 +92,6 @@ const props = defineProps({
 
 let data = $ref({
   record: {},
-  recordReport: {},
   row: {}
 })
 

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/RationalDrugUseWindow.vue

@@ -37,7 +37,7 @@ const continueToSubmit = async () => {
   let temp = await auditingInterface(rationalUse.getResultUrl)
   if (temp.success && temp.resultcode === 0) {
     // 审核通过
-    xcMessage.success(temp.sh_msg);
+    xcMessage.success(temp.sh_msg ? temp.sh_msg : '审核通过。');
     emit('submit')
     dialog = false
   } else if (temp.success && temp.resultcode === 1) {

src/layout/HeaderV2/function-list/user-info/UserInfoDisplay.vue

@@ -6,6 +6,12 @@
         {{ userInfo[key] }}
       </div>
     </li>
+    <li class="list-group-item">
+      浏览器版本
+      <div>
+        {{ getBrowserNameVersion() }}
+      </div>
+    </li>
   </ul>
 </template>
 
@@ -26,6 +32,28 @@ let userUlList = {
   ybCode: '医保编码'
 }
 
+// 获取浏览器名称及其版本号
+function getBrowserNameVersion() {
+  var Sys = {};
+  var ua = navigator.userAgent.toLowerCase();
+  var s;
+  (s = ua.match(/rv:([\d.]+)\) like gecko/)) ? Sys.ie = s[1] :
+      (s = ua.match(/msie ([\d\.]+)/)) ? Sys.ie = s[1] :
+          (s = ua.match(/edge\/([\d\.]+)/)) ? Sys.edge = s[1] :
+              (s = ua.match(/firefox\/([\d\.]+)/)) ? Sys.firefox = s[1] :
+                  (s = ua.match(/(?:opera|opr).([\d\.]+)/)) ? Sys.opera = s[1] :
+                      (s = ua.match(/chrome\/([\d\.]+)/)) ? Sys.chrome = s[1] :
+                          (s = ua.match(/version\/([\d\.]+).*safari/)) ? Sys.safari = s[1] : 0;
+  // 根据关系进行判断
+  if (Sys.ie) return ('IE: ' + Sys.ie);
+  if (Sys.edge) return ('EDGE: ' + Sys.edge);
+  if (Sys.firefox) return ('Firefox: ' + Sys.firefox);
+  if (Sys.chrome) return ('Chrome: ' + Sys.chrome);
+  if (Sys.opera) return ('Opera: ' + Sys.opera);
+  if (Sys.safari) return ('Safari: ' + Sys.safari);
+  return 'Unkonwn';
+}
+
 </script>
 
 <style scoped lang="scss">

src/views/hospitalization/zhu-yuan-yi-sheng/jian-cha-jian-yan-shen-qing/JianChaShenQing.vue

@@ -209,14 +209,14 @@ const handleCurrentChange = (val) => {
  * @param row 行数据
  */
 const dianJiaJianChaXiangQing = (row) => {
-  queryCheckTextResults(row.inpatientNo, row.admissTimes, row.reqNo).then((res) => {
+  queryCheckTextResults(row.inpatientNo, row.reqNo).then((res) => {
     res.row = row
     jianChaJieGuoRef.value.fillData(res).then(() => {
       mainTabs.value = 1
     })
   }).catch((e) => {
     jianChaJieGuoRef.value.fillData({
-      record: {}, recordReport: {}, row: {}
+      record: {}, row: {}
     })
   })