diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index ca25afd..824449b 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -439,7 +439,7 @@ export default { //获取用户当前页面的权限 let userPriv = window.sessionStorage.getItem('userPriv') if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName)) - + this.LocalConfigInit = deepCopy(this.LocalConfig) let LocalConfig = window.localStorage.getItem("LocalConfig") || null // console.log('LocalConfig',LocalConfig) @@ -449,7 +449,7 @@ export default { console.log('window.localStorage.getItem("LocalConfig")', error) } // console.log('this.LocalConfig',this.LocalConfig) - this.loadOpts.maxResultCount = Number(this.LocalConfig.normal.maxResultCount||100) + this.loadOpts.maxResultCount = Number(this.LocalConfig.normal.maxResultCount || 100) this.loadOptsInit = Object.assign({}, this.loadOpts) @@ -1147,9 +1147,9 @@ export default { // let oldCount = 0 // 处理分组/套餐 排序混乱的问题 curLoad.forEach(e => { - if(e.customerOrgId == this.dict.personOrgId){ + if (e.customerOrgId == this.dict.personOrgId) { e.groupPack = e.medicalPackageId - }else{ + } else { e.groupPack = e.customerOrgGroupId } }); @@ -1244,7 +1244,7 @@ export default { patientRegisterId: row.id } this.dialogWin.queue = true - this.dataTransOpts.plus.queue++ + this.dataTransOpts.plus.queue++ }, //右击菜单 @@ -1259,6 +1259,13 @@ export default { let row = { ...this.rClickRow }; let items = [] //菜单项 + // items.push({ + // label: "一级菜单", + // children: [ + // { label: "修改姓名", onClick: () => { this.fnUpBaseInfo(row, 'patientName'); } } + // ] + // }) + if (checkPagePriv(this.pagePriv.privs, '修改姓名') && row.completeFlag != '0') items.push({ label: "修改姓名", @@ -1294,55 +1301,74 @@ export default { this.lisRequest(row); }, }) + // 预览条码 + let subMenuPre = [] if (checkPagePriv(this.pagePriv.privs, '预览人员条码') && row.completeFlag != '0') - items.push({ + subMenuPre.push({ label: "预览人员条码", onClick: () => { this.guidePrintPromise("0008", true, row); }, }) if (checkPagePriv(this.pagePriv.privs, '预览检验条码') && row.completeFlag != '0') - items.push({ + subMenuPre.push({ label: "预览检验条码", onClick: () => { this.lisPrint(row, "0002", true); }, }) - if (checkPagePriv(this.pagePriv.privs, '打印检验条码') && row.completeFlag != '0') - items.push({ - label: "打印检验条码", - onClick: () => { - this.lisPrint(row, "0002", false); - }, - }) if (checkPagePriv(this.pagePriv.privs, '预览Pacs条码') && row.completeFlag != '0') - items.push({ + subMenuPre.push({ label: "预览Pacs条码", onClick: () => { + // console.log('预览Pacs条码 row',row) this.pacsPrint(row, "0004", true); }, }) + if (subMenuPre.length > 0) items.push({ label: "预览条码", children: subMenuPre }) + + + let subMenuPrint = [] + if (checkPagePriv(this.pagePriv.privs, '打印人员条码') && row.completeFlag != '0') + subMenuPrint.push({ + label: "打印人员条码", + onClick: () => { + this.guidePrintPromise("0008", false, row); + }, + }) + if (checkPagePriv(this.pagePriv.privs, '打印检验条码') && row.completeFlag != '0') + subMenuPrint.push({ + label: "打印检验条码", + onClick: () => { + this.lisPrint(row, "0002", false); + }, + }) if (checkPagePriv(this.pagePriv.privs, '打印Pacs条码') && row.completeFlag != '0') - items.push({ + subMenuPrint.push({ label: "打印Pacs条码", onClick: () => { this.pacsPrint(row, "0004", false); }, }) + if (subMenuPrint.length > 0) items.push({ label: "打印条码", children: subMenuPrint }) + + let subMenuImp = [] if (checkPagePriv(this.pagePriv.privs, '导入检查结果') && row.completeFlag != '0') - items.push({ + subMenuImp.push({ label: "导入检查结果", onClick: () => { this.importResult('pacs', row); }, }) if (checkPagePriv(this.pagePriv.privs, '导入检验结果') && row.completeFlag != '0') - items.push({ + subMenuImp.push({ label: "导入检验结果", onClick: () => { this.importResult('lis', row); }, }) + if (subMenuImp.length > 0) items.push({ label: "导入结果", children: subMenuImp }) + if (checkPagePriv(this.pagePriv.privs, '批量更新组合项目明细') && this.multipleSelection.length > 0) items.push({ label: "批量更新组合项目明细",