@@ -275,7 +277,9 @@ export default {
patientRegister: {
edit: 'standard', //standard/qztl 人员登记组件版本
editHeight: 0, // 相较与标准版，选组合项目组件，减少高度
- immediateToHisCharge: false, // 人员登记保存后，立即发送收费申请
+ immediateToHisCharge: false, // 人员登记保存后，立即发送第三方申请--收费申请
+ immediateToLisReq:false, // 人员登记保存后，立即发送第三方申请--检验申请
+ immediateToPacsReq:false, // 人员登记保存后，立即发送第三方申请--检查申请
findPatientByName: true, // 人员登记，启有人名查询
printGuideLabel: ["guide", "pacs", "lis"], // 保存后打印指引单与条码
dispCustomerOrgCode: 'N', // 人员登记列表--单位树是否显示 customerOrgCode
@@ -345,6 +349,7 @@ export default {
btnOk() {
this.LocalConfig.patientRegister.printGuideLabel = deepCopy(this.printGuideLabel)
window.localStorage.setItem("LocalConfig", JSON.stringify(this.LocalConfig))
+ this.dialogWin.LocalConfig = false
},
// 获取字典数据
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 1f9d77b..6fd9acc 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -546,11 +546,7 @@
收费
-
-
- 收费申请
-
+
复制分组
@@ -559,6 +555,21 @@
复制套餐
+
+
+
+ 第三方申请
+
+
+ 收费申请
+ 检验申请
+ 检查申请
+
+
+
@@ -699,10 +710,22 @@
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -858,7 +881,9 @@ import Camera from "./Camera.vue";
import PatientRegisterItem from "./PatientRegisterItem.vue";
import LisRequest from "./LisRequest.vue";
import MergeAsbitem from "./MergeAsbitem.vue";
-import AsbChargeRequest from "./AsbChargeRequest.vue";
+import ThirdChargeRequest from "./ThirdChargeRequest.vue";
+import ThirdLisRequest from "./ThirdLisRequest.vue";
+import ThirdPacsRequest from "./ThirdPacsRequest.vue";
import Charge from "../../views/charge/charge.vue";
import PatientRegisterEditQuery from "../../components/patientRegister/PatientRegisterEditQuery.vue";
import OccDisease from "../../components/occDisease/OccDisease.vue"
@@ -875,7 +900,9 @@ export default {
MergeAsbitem,
PatientRegisterItem,
Charge,
- AsbChargeRequest,
+ ThirdChargeRequest,
+ ThirdLisRequest,
+ ThirdPacsRequest,
PatientRegisterEditQuery,
OccDisease,
PatientLisRequest,
@@ -1156,6 +1183,12 @@ export default {
}
return isPersonOrgId
},
+
+ // 是否显示 第三方申请
+ dispThirdRequest(){
+ return this.checkPagePriv(this.pagePriv.privs, '收费申请')||this.checkPagePriv(this.pagePriv.privs, '检验申请')||this.checkPagePriv(this.pagePriv.privs, '检查申请')
+ },
+
},
methods: {
...mapActions(['getPatientRegisterAbs']),
@@ -3063,6 +3096,23 @@ export default {
}
},
+ // 第三方申请
+ btnMoreThird(oprType){
+ switch (oprType) {
+ case "收费申请":
+ this.thirdChargeRequest(this.form)
+ break;
+ case "检验申请":
+ this.thirdLisRequest(this.form)
+ break;
+ case "检查申请":
+ this.thirdPacsRequest(this.form)
+ break;
+ default:
+ break;
+ }
+ },
+
//条码合并
reLisRequest() {
if (!this.form.id) {
@@ -3146,17 +3196,80 @@ export default {
})
},
- // 收费申请
- chargeRequest(form) {
- if (!form.id) {
- this.$message.warning({ showClose: true, message: "请先保存人员信息！" })
- return
- }
- if (form.completeFlag == '0') {
- this.$message.warning({ showClose: true, message: "预登记的人员不可执行此操作！" })
- return
+ // 检查人员是否保存及是否预登记状态
+ checkPatientCompleteFlag(form){
+ let message = ''
+ if(!form?.id){
+ message = "请先保存人员信息！"
+ }else if(form?.completeFlag == '0'){
+ message = "预登记的人员不可执行此操作！"
}
+ return message
+ },
+ // 第三方申请--检验申请
+ thirdLisRequest(form) {
+ let message = this.checkPatientCompleteFlag(form)
+ if(message){
+ this.$message.warning({ showClose: true, message})
+ return
+ }
+ this.dialogWin.ThirdLisRequest = true
+ // this.getAsb(form.id)
+ // .then(() => {
+ // let chargeMoney = Number(0)
+ // //支付方式,比如是0自费、2免费、1单位支付
+ // this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
+ // if (e.payTypeFlag == '0') chargeMoney += Number(e.total)
+ // });
+
+ // if (chargeMoney == 0) {
+ // this.$message.warning({ showClose: true, message: '没有可收费或退费的记录！' })
+ // } else {
+ // // 显示
+ // this.dataTransOpts.refresh.charge.S++
+ // this.dialogWin.ThirdChargeRequest = true
+ // }
+ // })
+ // .catch(err => {
+ // this.$message.error(err.message)
+ // })
+ },
+ // 第三方申请--检查申请
+ thirdPacsRequest(form) {
+ let message = this.checkPatientCompleteFlag(form)
+ if(message){
+ this.$message.warning({ showClose: true, message})
+ return
+ }
+ this.dialogWin.ThirdPacsRequest = true
+ // this.getAsb(form.id)
+ // .then(() => {
+ // let chargeMoney = Number(0)
+ // //支付方式,比如是0自费、2免费、1单位支付
+ // this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
+ // if (e.payTypeFlag == '0') chargeMoney += Number(e.total)
+ // });
+
+ // if (chargeMoney == 0) {
+ // this.$message.warning({ showClose: true, message: '没有可收费或退费的记录！' })
+ // } else {
+ // // 显示
+ // this.dataTransOpts.refresh.charge.S++
+ // this.dialogWin.ThirdChargeRequest = true
+ // }
+ // })
+ // .catch(err => {
+ // this.$message.error(err.message)
+ // })
+ },
+ // 第三方申请--收费申请
+ thirdChargeRequest(form) {
+ let message = this.checkPatientCompleteFlag(form)
+ if(message){
+ this.$message.warning({ showClose: true, message})
+ return
+ }
this.getAsb(form.id)
.then(() => {
@@ -3171,7 +3284,7 @@ export default {
} else {
// 显示
this.dataTransOpts.refresh.charge.S++
- this.dialogWin.AsbChargeRequest = true
+ this.dialogWin.ThirdChargeRequest = true
}
})
.catch(err => {
@@ -3208,6 +3321,7 @@ export default {
},
//关闭收费窗口时，刷新收费状态信息
+ // 其他第三方申请 窗口关闭时，可共用
closeDialogCharge() {
// this.prAsbOpraOpts.prAsbQuery++
this.dataTransOpts.refresh.patient_register.S++
@@ -3921,7 +4035,7 @@ export default {
handler(newVal, oldVal) {
// console.log('从体检人员登记列表 点登记，触发', newVal, oldVal)
if (newVal != oldVal) {
- if(this?.refQueryCondition?.customerOrgId) this.preCustomerOrgId = this.refQueryCondition.customerOrgId
+ if (this?.refQueryCondition?.customerOrgId) this.preCustomerOrgId = this.refQueryCondition.customerOrgId
}
}
},
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index fcf6a09..0716416 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -272,12 +272,6 @@
体检表回收
-
-
-
-
-
-
@@ -672,7 +660,6 @@ import PatientRegisterEditMedicalTypeBatch from "./PatientRegisterEditMedicalTyp
import PatientRegisterEditPersonnelTypeBatch from "./PatientRegisterEditPersonnelTypeBatch.vue";
import PatientRegisterEditRemarkBatch from "./PatientRegisterEditRemarkBatch.vue";
import ImportOrgData from "./ImportOrgData.vue";
-import LocalConfig from "../../components/common/LocalConfig.vue";
import Queue from "../../components/queue/Queue.vue";
import { UTable, UTableColumn } from "umy-ui";
@@ -688,7 +675,6 @@ export default {
PatientRegisterEditPersonnelTypeBatch, // 批量调整体检类别
PatientRegisterEditRemarkBatch, // 批量调整体检类别
ElProgressOCX,
- LocalConfig,
ImportOrgData,
Queue,
DownloadExcel: JsonExcel,
diff --git a/src/components/patientRegister/ThirdChargeRequest.vue b/src/components/patientRegister/ThirdChargeRequest.vue
new file mode 100644
index 0000000..3a46d04
--- /dev/null
+++ b/src/components/patientRegister/ThirdChargeRequest.vue
@@ -0,0 +1,298 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ setChargeRequestFlag(scope.row.chargeRequestFlag) }}
+
+
+
+
+
+
+
+
+
+
+
+ 刷新状态
+ 撤消申请
+ 退费申请
+
+
+
+
+
+ 申请单包含项目
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 刷新
+
+
+ 收费申请
+
+
+ 关闭
+
+
+
+
- 关闭
+ 关闭
diff --git a/src/components/patientRegister/ThirdPacsRequest.vue b/src/components/patientRegister/ThirdPacsRequest.vue
new file mode 100644
index 0000000..e14e152
--- /dev/null
+++ b/src/components/patientRegister/ThirdPacsRequest.vue
@@ -0,0 +1,298 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ setChargeRequestFlag(scope.row.chargeRequestFlag) }}
+
+
+
+
+
+
+
+
+
+
+
+ 刷新状态
+ 撤消申请
+ 退费申请
+
+
+
+
+
+ 申请单包含项目
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 刷新
+
+
+ 收费申请
+
+
+ 关闭
+
+
+
+
-
-
-
-
@@ -207,10 +207,10 @@ export default {
{ required: true, message: "请输入新密码", trigger: "blur" },
],
},
- LocalConfig: {
+ localConfig: {
normal: { // 常规参数
isDevTool: false, // 壳端是否显示打开调试工具的按钮
- displayTab:false// 是否显示标签页
+ displayTab: false// 是否显示标签页
}
},
LocalConfigInit: {},
@@ -224,7 +224,7 @@ export default {
...mapState(["window", "dialogWin", "sysConfig"]),
},
created() {
-
+
let expires_in = parseInt(window.sessionStorage.getItem("expires_in"));
//console.log("dqtime / expires_in",dqtime,expires_in)
if (!expires_in) {
@@ -246,7 +246,7 @@ export default {
this.LocalConfigInit = deepCopy(this.LocalConfig)
let LocalConfig = window.localStorage.getItem("LocalConfig") || null
try {
- this.LocalConfig = Object.assign({}, this.LocalConfig, JSON.parse(LocalConfig) || {})
+ this.localConfig = Object.assign({}, this.localConfig, JSON.parse(LocalConfig) || {})
} catch (error) {
console.log('window.localStorage.getItem("LocalConfig")', error)
}
@@ -261,7 +261,7 @@ export default {
methods: {
onContextmenu(event) {
- if (!this.$peisAPI) return
+ if (!this.$peisAPI) return
console.log('this.$peisAPI.contextMenuForPeis()')
this.$peisAPI.contextMenuForPeis()
.then(res => {
@@ -286,7 +286,7 @@ export default {
const targetPath = node.routeUrl && node.routeUrl.startsWith('/') ? node.routeUrl : '/' + node.routeUrl;
if (currentPath === targetPath) return;
- if (this.LocalConfig.normal.displayTab) {
+ if (this.localConfig.normal.displayTab) {
const exists = this.$store.state.tabsList.some(tab => tab.displayName === node.displayName);
if (exists) {
// 已在标签页中：使用 tabsList 中保存的 routeUrl（可能包含时间戳），避免刷新
@@ -418,20 +418,18 @@ export default {
// 本地设置
localSet() {
- // this.dialogWin.LocalConfig = true
-
- this.$router.push({ path: "/LocalConfig" });
+ this.dialogWin.LocalConfig = true
},
- localDBclear(){
+ localDBclear() {
clearDBCom()
- .then(() => {
- this.$message.success({showClose:true,message:'操作成功！'})
- })
- .catch(err => {
- console.error(err)
- this.$message.error({showClose:true,message:err.message})
- })
+ .then(() => {
+ this.$message.success({ showClose: true, message: '操作成功！' })
+ })
+ .catch(err => {
+ console.error(err)
+ this.$message.error({ showClose: true, message: err.message })
+ })
},
//打开客户端调试工具
@@ -687,7 +685,7 @@ export default {
}
.el-main {
- height: calc(100vh,-200px);
+ height: calc(100vh, -200px);
}
.el-menu-vertical-demo .el-menu {