Browse Source

修改api 的名称

DESKTOP-MINPJAU\Administrator 3 years ago
parent
commit
4d188df694

+ 1 - 1
src/api/public-api.js

@@ -44,7 +44,7 @@ export function getServerDateApi() {
     });
 }
 
-export function yaoPinShiFouPiPeiYiBao(data) {
+export function yaoPinXiangMuPiPeiYiBao(data) {
     return request({
         url: '/publicApi/yaoPinXiangMuPiPeiYiBao',
         method: 'post',

+ 2 - 2
src/components/zhu-yuan-yi-sheng/TianJiaJianChaJianYan.vue

@@ -137,7 +137,7 @@ import {
   youWuXuanZheHuanZhe
 } from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 import router from '@/router'
-import {yaoPinShiFouPiPeiYiBao} from "@/api/public-api";
+import {yaoPinXiangMuPiPeiYiBao} from "@/api/public-api";
 import CuoWuXinXi from "@/components/zhu-yuan-yi-sheng/CuoWuXinXi.vue";
 
 export default {
@@ -233,7 +233,7 @@ export default {
       xuanZhongJianCha.value.data.forEach(item => {
         listCode.push(item.orderCode + "-00")
       })
-      yaoPinShiFouPiPeiYiBao(listCode).then((res) => {
+      yaoPinXiangMuPiPeiYiBao(listCode).then((res) => {
         if (stringNotBlank(res)) {
           cuoWuXinXi.value = res
           ElMessageBox.confirm(res, '提示', {

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

@@ -173,7 +173,7 @@ import {ElMessage, ElMessageBox} from "element-plus";
 import {stringIsBlank, stringNotBlank} from "@/utils/blank-utils";
 import ChaXuanCaoYao from "@/components/zhu-yuan-yi-sheng/cao-yao-yi-zhu/ChaXuanCaoYao.vue";
 import CaoYaoMuBan from "@/components/zhu-yuan-yi-sheng/cao-yao-yi-zhu/CaoYaoMuBan.vue";
-import {yaoPinShiFouPiPeiYiBao} from "@/api/public-api";
+import {yaoPinXiangMuPiPeiYiBao} from "@/api/public-api";
 import CuoWuXinXi from "@/components/zhu-yuan-yi-sheng/CuoWuXinXi.vue";
 
 export default {
@@ -335,21 +335,19 @@ export default {
       mingXi.value.list.forEach(item => {
         listCode.push(item.chargeCode + '-' + item.serial)
       })
-      yaoPinShiFouPiPeiYiBao(listCode).then((res) => {
-        yaoPinShiFouPiPeiYiBao(listCode).then((res) => {
-          if (stringNotBlank(res)) {
-            cuoWuXinXi.value = res
-            ElMessageBox.confirm(res, '提示', {
-              type: 'warning',
-              dangerouslyUseHTMLString: true,
-            }).then(() => {
-              baoCunShuJu()
-            }).catch(() => {
-            })
-          } else {
+      yaoPinXiangMuPiPeiYiBao(listCode).then((res) => {
+        if (stringNotBlank(res)) {
+          cuoWuXinXi.value = res
+          ElMessageBox.confirm(res, '提示', {
+            type: 'warning',
+            dangerouslyUseHTMLString: true,
+          }).then(() => {
             baoCunShuJu()
-          }
-        })
+          }).catch(() => {
+          })
+        } else {
+          baoCunShuJu()
+        }
       })
     }
 

+ 6 - 5
src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/TianJiaYiZhu.vue

@@ -228,7 +228,7 @@
     </el-row>
   </el-form>
   <el-button icon="el-icon-plus" type="primary" @click="tianJiaYiZhu">添加</el-button>
-  <xc-code code="Alt+Enter" description="键盘添加"></xc-code>
+  <xc-code code="Ctrl+S" description="键盘添加"></xc-code>
   <el-button @click="dianJiXiuGaiZhiXingKeShi">修改执行科室</el-button>
   <el-table :data="yiZhuList" :height="windowSize.h / 2.4" @selection-change="dianJiXuanZhongShuJu">
     <el-table-column type="selection"></el-table-column>
@@ -309,7 +309,7 @@ import BaoCunMuBan from '../../../../components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/B
 import {
   getServerDateApi,
   whetherThePatientHasAllergens,
-  yaoPinShiFouPiPeiYiBao
+  yaoPinXiangMuPiPeiYiBao
 } from '@/api/public-api'
 import router from '@/router'
 import SouSuoYiZhu from '@/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/SouSuoYiZhu.vue'
@@ -620,7 +620,7 @@ const baoCunYiZhuClick = () => {
   yiZhuList.value.forEach((item) => {
     yiBaoBianMaTiShi.push(item.orderCode + '-' + item.serial)
   })
-  yaoPinShiFouPiPeiYiBao(yiBaoBianMaTiShi).then((res) => {
+  yaoPinXiangMuPiPeiYiBao(yiBaoBianMaTiShi).then((res) => {
     if (stringNotBlank(res)) {
       cuoWuXinXi.value = res
       ElMessageBox.confirm(res, '提示', {
@@ -628,7 +628,7 @@ const baoCunYiZhuClick = () => {
         dangerouslyUseHTMLString: true,
         confirmButtonText: '继续录入',
       })
-          .then((res) => {
+          .then(() => {
             baoCunYiZhu()
           })
           .catch(() => {
@@ -656,7 +656,7 @@ function baoCunYiZhu() {
       console.log(res)
     })
   }
-  // return
+  return
   ElMessageBox.confirm('您确定要保存这些数据吗?请仔细检查数据。', '提示', {
     type: 'warning',
     closeOnClickModal: false,
@@ -687,6 +687,7 @@ const kangJunYaoYongYaoFangShiGaiBian = (val) => {
 let muBanDuiHuaKuang = $ref(false)
 // 这里是返回的模板数据
 const muBanShuJu = (val) => {
+  let tongZhiCiShu = 0
   val.forEach((item) => {
     let index = tianJiaYiZhuWeiYiBiaoShi.value.indexOf(item.id)
     if (index > -1) {