diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 844fc9a..1f9dd7d 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -460,7 +460,7 @@ -
@@ -480,6 +480,8 @@ import LisRequest from "./LisRequest.vue"; import MergeAsbitem from "./MergeAsbitem.vue"; import Charge from "../../views/charge/charge.vue"; import PatientRegisterEditQuery from "../../components/patientRegister/PatientRegisterEditQuery.vue"; +import proApi from "../../utlis/proApi"; + export default { components: { Camera, @@ -596,7 +598,6 @@ export default { dialogCamera: false, //拍照组件 - chargeVisible:false, //用于收费 chargePatientRegisterNo:'', //对哪个条码客户收费 //人员登记,组合项目明细操作相关参数 @@ -1619,13 +1620,26 @@ export default { this.patientRegister.mergeAsbitemVisble = true; }, - toCharge(patientRegisterNo) { + async toCharge(patientRegisterNo){ + if(!patientRegisterNo){ this.$message.warning("请先保存人员信息!") return } - - this.chargeVisible = true + + try { + let res = await proApi.getPrAsb(this.form.id) + if(res.code == -1){ + this.$message.warning(`操作失败,原因:${res.message}`) + return + } + + } catch (error) { + this.$message.warning(`操作失败,原因:${error}`) + return + } + + this.dialogWin.charge = true //多次重复点击时,刷新处理 this.chargePatientRegisterNo = patientRegisterNo setTimeout(() => { diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index 1310042..6f78b70 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -309,8 +309,7 @@ export default { //获取用户当前页面的权限 let userPriv = window.sessionStorage.getItem('userPriv') if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName)) - - this.headerCols = deepCopy(this.dropCol) + this.loadOptsInit = Object.assign({}, this.loadOpts) }, @@ -321,6 +320,7 @@ export default { this.peisid = window.sessionStorage.getItem('peisid'); // 初始化可以拖动的列 + this.headerCols = deepCopy(this.dropCol) this.dropCol = this.columnDrop(this.dropCol); this.$nextTick(() => { diff --git a/src/store/index.js b/src/store/index.js index 84deeb9..1fc7dd8 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -359,7 +359,8 @@ export default new Vuex.Store({ // 弹窗控制 dialogWin: { - CustomerOrgGroupEdit: false, // 单位分组 新增/编辑 + CustomerOrgGroupEdit: false, // 单位分组 新增/编辑 + charge:false, // 收费窗口 PatientList: false, // 体检人员档案列表 PatientRegisterEdit: false, // 体检人员登记 新增/编辑 PatientRegisterForChoose: false, // 体检人员登记列表 diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue index fc655ba..7fb138e 100644 --- a/src/views/charge/charge.vue +++ b/src/views/charge/charge.vue @@ -1,21 +1,25 @@