Skip to content

省
省二结算
Commit 0b3e0c25 authored by 任鸿志's avatar 任鸿志
Browse files
Options

feat(env): 更新环境变量并添加新配置 

- 修改 .env.development 和 .env.production 中的 API 地址
- 在 package.json 中添加 lodash-es 依赖并更新其他依赖版本
- 修改多个组件中的 API 调用路径和参数
- 优化 outpatientCharging 和 outpatientTwo 组件中的结算逻辑
- 在 vue.config.js 中添加新的环境变量输出
parent 8bcbd215
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 27 deletions
.env.development
View file @ 0b3e0c25
...@@ -10,8 +10,8 @@ VUE_APP_BASE_API = '' ...@@ -10,8 +10,8 @@ VUE_APP_BASE_API = ''
# VUE_APP_BASE_URL = 'http://10.10.9.219:9902' # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
# VUE_APP_BASE_URL = 'http://10.10.40.69:9903' # VUE_APP_BASE_URL = 'http://10.10.40.69:9903'
VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy' VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
VUE_APP_BASE_URL = 'http://127.0.0.1:9902' # VUE_APP_BASE_URL = 'http://127.0.0.1:9902'
# VUE_APP_BASE_URL = 'http://10.10.9.219:9902' VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802' VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802'
# VUE_APP_BASE_URL_SFC = 'http://127.0.0.1:9902' # VUE_APP_BASE_URL_SFC = 'http://127.0.0.1:9902'
# VUE_APP_BASE_URL = 'http://192.169.4.171:8002' # VUE_APP_BASE_URL = 'http://192.169.4.171:8002'
......
.env.production
View file @ 0b3e0c25
...@@ -9,6 +9,6 @@ VUE_APP_BASE_API = '' ...@@ -9,6 +9,6 @@ VUE_APP_BASE_API = ''
# VUE_APP_BASE_URL = 'http://newfinance-system.fancyinfo.net' # VUE_APP_BASE_URL = 'http://newfinance-system.fancyinfo.net'
VUE_APP_BASE_URL = 'http://10.10.9.219:9902' VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:9902' VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy' VUE_APP_BASE_URL_change = 'http://10.10.9.198:6200/fancy'
# VUE_APP_BASE_URL = 'http://med-api.fancyinfo.net' # VUE_APP_BASE_URL = 'http://med-api.fancyinfo.net'
# VUE_APP_BASE_URL = 'http://10.10.40.10:9902' # VUE_APP_BASE_URL = 'http://10.10.40.10:9902'
src/api/all.js
View file @ 0b3e0c25
...@@ -169,7 +169,7 @@ export const api = { ...@@ -169,7 +169,7 @@ export const api = {
updates:'/api/settlement/update_cost', updates:'/api/settlement/update_cost',
preSettlementGetPatientInfo:'/api/patient/zy',//出院获取患者信 preSettlementGetPatientInfo:'/api/patient/zy',//出院获取患者信
recharge:'/outpatient-fees/pay/recharge',//出院获取患者信 recharge:'/outpatient-fees/pay/recharge',//出院获取患者信
outinvoicing:'/outpatient-fees/invoice/outinvoicing',//出院获取患者信 outinvoicing:'/invoice/api/outinvoicing',//出院获取患者信
zyByIdCard:'/api/patient/zyByIdCard',//出院获取患者信 zyByIdCard:'/api/patient/zyByIdCard',//出院获取患者信
zyByInpatientNo:'/api/patient/zyByInpatientNo',//出院获取患者信 zyByInpatientNo:'/api/patient/zyByInpatientNo',//出院获取患者信
preSettlement:'/api/settlement',//出院获取患者信 preSettlement:'/api/settlement',//出院获取患者信
......
src/components/Cardlist/index.vue
View file @ 0b3e0c25
...@@ -457,7 +457,7 @@ export default { ...@@ -457,7 +457,7 @@ export default {
printmis({ printmis({
patient_id: e.his_patient_id, patient_id: e.his_patient_id,
settle_id: e.id settle_id: e.jshid
}) })
.then(response => { .then(response => {
this.$message({ this.$message({
......
src/components/ReadcardsSFC/index.vue
View file @ 0b3e0c25
...@@ -214,6 +214,7 @@ export default { ...@@ -214,6 +214,7 @@ export default {
let data = '' let data = ''
if (this.isJSON(evt.data) && evt?.data) { if (this.isJSON(evt.data) && evt?.data) {
data = JSON.parse(evt.data) data = JSON.parse(evt.data)
console.log(data,'data')
} }
// 开启读卡设备并且设置定时任务 // 开启读卡设备并且设置定时任务
if (data?.MethodName === 'OpenDevice' && data?.RespCode === 0) { if (data?.MethodName === 'OpenDevice' && data?.RespCode === 0) {
......
src/components/invoicepost/index.vue
View file @ 0b3e0c25
...@@ -116,6 +116,7 @@ export default { ...@@ -116,6 +116,7 @@ export default {
this.outinvoicform.name = this.patientData.patient.name this.outinvoicform.name = this.patientData.patient.name
this.outinvoicform.patientId = this.patientData.patient.his_id this.outinvoicform.patientId = this.patientData.patient.his_id
this.outinvoicform.totalAmount = this.patientData.patient_burden this.outinvoicform.totalAmount = this.patientData.patient_burden
this.outinvoicform.rcpt_no = this.patientData.rcpt_no
}) })
} else { } else {
return false return false
...@@ -127,15 +128,15 @@ export default { ...@@ -127,15 +128,15 @@ export default {
// 开票 // 开票
async InvoicingFun() { async InvoicingFun() {
let param = { let param = {
cardNo: this.outinvoicform.patient.his_id, cardNo: this.outinvoicform.patientId,
idCard:this.outinvoicform.id_card, idCard:this.outinvoicform.id_card,
jobNumber: localStorage.getItem('jobNumber') ?? '', jobNumber: localStorage.getItem('jobNumber') ?? '',
jshId: this.outinvoicform.jshId, jshId: this.outinvoicform.jshId,
mobile: this.outinvoicform.mobile, mobile: this.outinvoicform.mobile,
name: this.outinvoicform.name, name: this.outinvoicform.name,
patientId: this.outinvoicform.patient.his_id, patientId: this.outinvoicform.patientId,
payerType: this.outinvoicform.payerType, payerType: this.outinvoicform.payerType,
rcptNo: this.outinvoicform.jshId, rcptNo: this.outinvoicform.rcpt_no,
totalAmount: this.outinvoicform.totalAmount, totalAmount: this.outinvoicform.totalAmount,
} }
...@@ -147,6 +148,12 @@ export default { ...@@ -147,6 +148,12 @@ export default {
}) })
this.isOpenCardeds = false this.isOpenCardeds = false
} }
else {
this.$message({
message: res.msg,
type: 'error',
})
}
}, },
// // 关闭弹窗 // // 关闭弹窗
// handleCloseModal() { // handleCloseModal() {
......
src/views/jiesuan/outpatientCharging.vue
View file @ 0b3e0c25
...@@ -2062,21 +2062,28 @@ export default { ...@@ -2062,21 +2062,28 @@ export default {
this.invoicepostData=response.data this.invoicepostData=response.data
this.invoicepostVisible=true this.invoicepostVisible=true
// _this.printcard(jshidprint) // _this.printcard(jshidprint)
if ( this.cardType == 'SOCIAL_CARD') {
this.selectCardYiboInfo({
sfzh:response.data.id_card_number
})
}else{
this.selectCardYiboInfo() this.selectCardYiboInfo()
//刷新列表
var obj = {
patient_id: this.patientData.patient_id, //this.cardNo,
} }
pdxq(obj)
.then(response => { //刷新列表
this.tableData.cost = response.data // var obj = {
this.tableDataList = response.data // patient_id: this.patientData.patient_id, //this.cardNo,
this.tylist = response.data // }
this.tiles(this.tylist) // pdxq(obj)
}) // .then(response => {
.finally(res => { // this.tableData.cost = response.data
this.loading = false // this.tableDataList = response.data
}) // this.tylist = response.data
// this.tiles(this.tylist)
// })
// .finally(res => {
// this.loading = false
// })
}) })
.finally(res => { .finally(res => {
this.saveLoding=false this.saveLoding=false
......
src/views/jiesuan/outpatientTwo.vue
View file @ 0b3e0c25
...@@ -436,6 +436,7 @@ ...@@ -436,6 +436,7 @@
<Readcards :isOpenCarded="carddialogFormVisible" @getyibaoinfo="getyibaoinfo" @closeReadcard="closeReadcard" /> <Readcards :isOpenCarded="carddialogFormVisible" @getyibaoinfo="getyibaoinfo" @closeReadcard="closeReadcard" />
<!-- 确认结算-新-不选择卡类型 --> <!-- 确认结算-新-不选择卡类型 -->
<ReadcardsNew :isOpenCarded="yibaoshowNew" :patientcard="form" :patientData="patientData" :selectTableArr="selectTableArr" @getyibaoinfo="selectCardYiboPreselect" @close="closeSelectCard" /> <ReadcardsNew :isOpenCarded="yibaoshowNew" :patientcard="form" :patientData="patientData" :selectTableArr="selectTableArr" @getyibaoinfo="selectCardYiboPreselect" @close="closeSelectCard" />
<invoicepost :isOpenCarded="invoicepostVisible" :patientData="invoicepostData"></invoicepost>
<!-- loaidng 动画 --> <!-- loaidng 动画 -->
<div v-if="false" class="grey-cloth" id="loading"> <div v-if="false" class="grey-cloth" id="loading">
<div id="img"> <div id="img">
...@@ -462,6 +463,7 @@ ...@@ -462,6 +463,7 @@
</template> </template>
<script> <script>
import Cardlist from '@/components/Cardlist' import Cardlist from '@/components/Cardlist'
import invoicepost from '@/components/invoicepost'
import Readcards from '@/components/Readcards' import Readcards from '@/components/Readcards'
import editProp1 from './components/editProp' //修改自付比例 import editProp1 from './components/editProp' //修改自付比例
import { pdxx, mzxx, mzxxs, mzxxs_ewm, settle_fee_self2yb, settle_fee2yb, bxxx, jsxx, hiscard, printmis, queryReadRard } from '@/api/mz' import { pdxx, mzxx, mzxxs, mzxxs_ewm, settle_fee_self2yb, settle_fee2yb, bxxx, jsxx, hiscard, printmis, queryReadRard } from '@/api/mz'
...@@ -481,6 +483,8 @@ export default { ...@@ -481,6 +483,8 @@ export default {
name: 'Outpatient', name: 'Outpatient',
data() { data() {
return { return {
invoicepostData:{},
invoicepostVisible:false,
checked: false, checked: false,
moreLoading: false, moreLoading: false,
moreshowdata: { moreshowdata: {
...@@ -1785,8 +1789,10 @@ export default { ...@@ -1785,8 +1789,10 @@ export default {
this.fullscreenLoading = false this.fullscreenLoading = false
this.jeizhishow = false this.jeizhishow = false
const jshidprint = response.data const jshidprint = response.data
this.invoicepostData=response.data
this.invoicepostVisible=true
// setTimeout(function () { // setTimeout(function () {
_this.printcard(jshidprint) // _this.printcard(jshidprint)
// }, 5000) // }, 5000)
//刷新列表 //刷新列表
...@@ -2345,7 +2351,7 @@ export default { ...@@ -2345,7 +2351,7 @@ export default {
</div> </div>
<div style="margin:-5px 0px 0px 18px;position: relative"> <div style="margin:-5px 0px 0px 18px;position: relative">
<div class="conline"><span>姓名:</span><span class="money">${this.patientData.name}</span></div> <div class="conline"><span>姓名:</span><span class="money">${this.patientData.name}</span></div>
<div class="conline"><span>性别:</span><span class="money">${this.patientData.sex}</span></div> <div class="conline"><span>性别:</span><span class="money">${this.patientData?.sex.name}</span></div>
<div class="conline"><span>年龄:</span><span class="money">${this.patientData.age}</span></div> <div class="conline"><span>年龄:</span><span class="money">${this.patientData.age}</span></div>
<div class="conline"><span>就诊卡号：</span><span class="money">${e.id_card}</span></div> <div class="conline"><span>就诊卡号：</span><span class="money">${e.id_card}</span></div>
<div class="conline"><span>交易方式:</span><span class="money">${e.trade_type}</span></div> <div class="conline"><span>交易方式:</span><span class="money">${e.trade_type}</span></div>
...@@ -2529,8 +2535,10 @@ export default { ...@@ -2529,8 +2535,10 @@ export default {
this.fullscreenLoading = false this.fullscreenLoading = false
this.jeizhishow = false this.jeizhishow = false
const jshidprint = response.data const jshidprint = response.data
this.invoicepostData=response.data
this.invoicepostVisible=true
// setTimeout(function () { // setTimeout(function () {
_this.printcard(jshidprint) // _this.printcard(jshidprint)
// }, 5000) // }, 5000)
//刷新列表 //刷新列表
......
vue.config.js
View file @ 0b3e0c25
...@@ -127,6 +127,7 @@ function judgementEnv () { ...@@ -127,6 +127,7 @@ function judgementEnv () {
console.log({ '当前环境:': process.env.NODE_ENV }) console.log({ '当前环境:': process.env.NODE_ENV })
console.log({ '当前地址:': process.env.VUE_APP_BASE_URL },'+++++++++++++++') console.log({ '当前地址:': process.env.VUE_APP_BASE_URL },'+++++++++++++++')
console.log({ '当前地址:': process.env.VUE_APP_BASE_URL_SFC },'-------------') console.log({ '当前地址:': process.env.VUE_APP_BASE_URL_SFC },'-------------')
console.log({ '当前地址:': process.env.VUE_APP_BASE_URL_change },'-------------')
console.log('=========') console.log('=========')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment