Commit 05d111f1 authored by 任鸿志's avatar 任鸿志

refactor(env): 更新 API 地址并调整结算相关功能

- 修改 VUE_APP_BASE_URL_SFC 为 http://10.10.40.69:9903
- 更新读卡器组件中的测试数据
- 优化结算功能,增加订单号和序列号的处理逻辑
parent da179085
...@@ -13,8 +13,8 @@ VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy' ...@@ -13,8 +13,8 @@ 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:8802' # VUE_APP_BASE_URL = 'http://10.10.9.219:8802'
# 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://10.10.40.69:9903' VUE_APP_BASE_URL_SFC = 'http://10.10.40.69:9903'
# VUE_APP_BASE_URL = 'http://192.169.4.171:8002' # VUE_APP_BASE_URL = 'http://192.169.4.171:8002'
# VUE_APP_BASE_URL = 'http://10.10.40.10:8099' # VUE_APP_BASE_URL = 'http://10.10.40.10:8099'
# VUE_APP_BASE_URL = 'http://newfinance.fanxyinfo.cn' # VUE_APP_BASE_URL = 'http://newfinance.fanxyinfo.cn'
......
...@@ -129,15 +129,15 @@ export default { ...@@ -129,15 +129,15 @@ export default {
methods: { methods: {
ceshi(){ ceshi(){
this.param = { this.param = {
sbm: "370100D15600000500F419DFE0F220AA", sbm: "620100D156000005A02F8CD6022F9153",
name: "边勇", name: "邱慧",
xzbz: "C", xzbz: "C",
cache: "1", cache: "1",
is_yd: "0", is_yd: "0",
yltclb: "4", yltclb: "0",
card_no: "A91091958", card_no: "21808258X",
dzpzywm: "301", dzpzywm: "301",
id_card: "370111196401043518", id_card: "620102196806161120",
qr_code: "", qr_code: "",
card_type: "03", card_type: "03",
insurance: "LOCAL" insurance: "LOCAL"
...@@ -442,7 +442,7 @@ export default { ...@@ -442,7 +442,7 @@ export default {
is_yd: this.isYDpatint == true ? '1' : '0', is_yd: this.isYDpatint == true ? '1' : '0',
insurance: this.insurance, //this.insurance insurance: this.insurance, //this.insurance
cache: '1', cache: '1',
yltclb:'0',//this.man_name=='4'?'4': this.selectTableArr[0].settle_type.is_mb ? '4' : '6', yltclb:this.man_name=='4'?'4': this.selectTableArr[0].settle_type.is_mb ? '4' : '6',
card_type: '03', card_type: '03',
qr_code: '', qr_code: '',
id_card: this.form.physicalCard, //,'370104202109020049' id_card: this.form.physicalCard, //,'370104202109020049'
...@@ -471,7 +471,7 @@ export default { ...@@ -471,7 +471,7 @@ export default {
is_yd: this.isYDpatint == true ? '1' : '0', is_yd: this.isYDpatint == true ? '1' : '0',
insurance: this.insurance, //this.insurance insurance: this.insurance, //this.insurance
cache: '1', cache: '1',
yltclb:'0',//this.man_name=='4'?'4': this.selectTableArr[0].settle_type.is_mb ? '4' : '6', yltclb:this.man_name=='4'?'4': this.selectTableArr[0].settle_type.is_mb ? '4' : '6',
card_type: '01', card_type: '01',
id_card: this.patientData.id_card, id_card: this.patientData.id_card,
qr_code: this.form.physicalCard, qr_code: this.form.physicalCard,
......
...@@ -1729,19 +1729,27 @@ export default { ...@@ -1729,19 +1729,27 @@ export default {
var orders = [] var orders = []
var costint = [] var costint = []
var cost_ids = [] var cost_ids = []
var order_no = []
var serial_arr = [];
x.slice(0, x.length - 1).forEach(function (element) { x.slice(0, x.length - 1).forEach(function (element) {
let obj={}
total += element.total * 1 * 1 total += element.total * 1 * 1
orders.push(element.settle_type) orders.push(element.settle_type)
cost_ids.push(element.serial_no) cost_ids.push(element.serial_no)
order_no.push(element.order_no)
obj['serial_no']=element.serial_no
obj['order_no']=element.order_no
serial_arr.push(obj)
costint.push(element) costint.push(element)
}) })
console.log(order_no,'99999999999999')
this.cost_id = cost_ids this.cost_id = cost_ids
this.orders = orders this.orders = orders
this.total = total.toFixed(2) this.total = total.toFixed(2)
if (array.length != 0) { if (array.length != 0) {
info({ info({
order_no:serial_arr,
serial_no: cost_ids.toString(), serial_no: cost_ids.toString(),
patient_id: this.patientData.patient_id, patient_id: this.patientData.patient_id,
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '', settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
...@@ -1768,19 +1776,28 @@ export default { ...@@ -1768,19 +1776,28 @@ export default {
var orders = [] var orders = []
var costint = [] var costint = []
var cost_ids = [] var cost_ids = []
var order_no = []
var serial_arr = [];
array.forEach(function (element) { array.forEach(function (element) {
let obj={}
total += element.total * 1 * 1 total += element.total * 1 * 1
orders.push(element.settle_type) orders.push(element.settle_type)
cost_ids.push(element.serial_no) cost_ids.push(element.serial_no)
order_no.push(element.order_no)
costint.push(element) costint.push(element)
obj['serial_no']=element.serial_no
obj['order_no']=element.order_no
serial_arr.push(obj)
}) })
console.log(serial_arr)
this.cost_id = cost_ids this.cost_id = cost_ids
this.orders = orders this.orders = orders
this.total = total.toFixed(2) this.total = total.toFixed(2)
if (array.length != 0) { if (array.length != 0) {
info({ info({
order_no:serial_arr,
serial_no: cost_ids.toString(), serial_no: cost_ids.toString(),
patient_id: this.patientData.patient_id, patient_id: this.patientData.patient_id,
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '', settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
...@@ -1808,11 +1825,16 @@ export default { ...@@ -1808,11 +1825,16 @@ export default {
var orders = [] var orders = []
var costint = [] var costint = []
var cost_ids = [] var cost_ids = []
var serial_arr = [];
array.forEach(function (element) { array.forEach(function (element) {
let obj={}
total += element.total * 1 * 1 total += element.total * 1 * 1
orders.push(element.settle_type) orders.push(element.settle_type)
cost_ids.push(element.serial_no) cost_ids.push(element.serial_no)
costint.push(element) costint.push(element)
obj['serial_no']=element.serial_no
obj['order_no']=element.order_no
serial_arr.push(obj)
}) })
this.cost_id = cost_ids this.cost_id = cost_ids
...@@ -1820,7 +1842,8 @@ export default { ...@@ -1820,7 +1842,8 @@ export default {
this.total = total.toFixed(2) this.total = total.toFixed(2)
if (array.length != 0) { if (array.length != 0) {
info({ info({
serial_no: cost_ids.toString(), order_no:serial_arr,
serial_no: serial_arr,
patient_id: this.patientData.patient_id, patient_id: this.patientData.patient_id,
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '', settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
}) })
......
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