shentun
/
peisweb
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

label seo

master
pengjun 2 years ago
parent
11e38f79ca
commit
7ef0cc7279
4 changed files with 36 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      src/components/patientRegister/PatientLis.vue
  2. 36
      src/components/patientRegister/PatientPacsRequest.vue
  3. 26
      src/components/patientRegister/PatientRegisterEdit.vue
  4. 2
      src/components/patientRegister/PatientRegisterList.vue

54
src/components/patientRegister/PatientLis.vue
View File

@ -462,25 +462,7 @@ export default {
BusinessCode: prId
};
if (isPreview) {
/*
postapi(
`/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
)
.then((res) => {
if (res.code != -1) {
toOutShell.ReportTable = { lisRequest: res.data };
console.log(
"JSON.stringify(toOutShell)",
JSON.stringify(toOutShell)
);
return this.$peisAPI.printPre(JSON.stringify(toOutShell));
}
})
.catch((err) => {
this.$message.warning(err);
});
*/
if (isPreview) {
this.$peisAPI.printPre(JSON.stringify(toOutShell))
.then(res => {
if (JSON.parse(res).code < 0) {
@ -491,39 +473,7 @@ export default {
console.log('打印pacs条码错误', err)
this.$message.warning({ showClose: true, message: `${err}` });
});
} else {
/*
postapi(
`/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
)
.then((res) => {
if (res.code != -1) {
toOutShell.ReportTable = { lisRequest: res.data };
console.log(
"JSON.stringify(toOutShell)",
JSON.stringify(toOutShell)
);
return this.$peisAPI.print(JSON.stringify(toOutShell));
}
})
.then((res) => {
if (JSON.parse(res).code >= 0) {
//更新打印状态 /api/app/lisrequest/updatelisrequestisprint
// {
// "operateType": 0, 操作类型（1.按PatientRegisterId 2.按LisRequestId）
// "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
// "lisRequestId": "3fa85f64-5717-4562-b3fc-2c963f66afa6"
// }
return postapi("/api/app/lisrequest/updatelisrequestisprint", {
operateType: 1,
patientRegisterId: prId,
});
}
})
.catch((err) => {
this.$message.warning(err);
});
*/
} else {
this.$peisAPI.print(JSON.stringify(toOutShell))
.then(res => {
if (JSON.parse(res).code < 0) {

36
src/components/patientRegister/PatientPacsRequest.vue
View File

@ -4,10 +4,10 @@
<el-table :data="pacsRequest" border @row-click="rowClick"
:height="window.pageHeight < 600 ? 140 : Math.floor((window.pageHeight - 250) * 2 / 5)" size="small"
highlight-current-row ref="pacs_request" :row-class-name="handleRowClassName">
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
<el-table-column prop="checkRequestNo" label="条码号" min-width="120" align="center" />
<el-table-column prop="asbitemName" label="检查项目" min-width="120" />
<el-table-column prop="checkRequestNo" label="条码号" min-width="120" align="center" />
<el-table-column prop="asbitemName" label="检查项目" min-width="120" />
</el-table>
</div>
<div style="margin-left: 10px;width: 110px;">
@ -48,7 +48,7 @@ export default {
routeUrlorPageName: 'patientLis', //当前页面归属路由或归属页面权限名称
privs: [] // 页面权限
},
pacsRequest:[], // 检查申请单
pacsRequest: [], // 检查申请单
chooseRows: [], // 选中的行
};
},
@ -65,7 +65,7 @@ export default {
},
//挂载完成
mounted() {
mounted() {
this.retrieve_pacs_request(this.dataTransOpts.tableS.patient_register.id)
},
@ -87,9 +87,9 @@ export default {
}
},
// 选中行
rowClick(row) {
rowClick(row) {
this.btnChoose(false)
this.chooseRows = [row]
this.$refs['pacs_request'].setCurrentRow(row);
@ -98,7 +98,7 @@ export default {
// 全选 / 取消全选
btnChoose(isChooseAll) {
if (isChooseAll) {
this.chooseRows = deepCopy(this.pacsRequest)
this.chooseRows = deepCopy(this.pacsRequest)
this.pacsRequest.forEach(e => {
e.choosed = true;
this.$refs['pacs_request'].setCurrentRow(e);
@ -113,7 +113,7 @@ export default {
this.$nextTick(() => {
this.$refs['pacs_request'].doLayout()
})
},
@ -126,10 +126,10 @@ export default {
if (!this.$peisAPI) {
this.$message.warning({ showClose: true, message: "此功能需要在壳客户端中方可运行！" })
return
}
}
if (isPreview) {
this.pacsPrint(this.chooseRows[0].registerCheckId,"0004",isPreview)
this.pacsPrint(this.chooseRows[0].registerCheckId, "0004", isPreview)
return
}
@ -137,10 +137,10 @@ export default {
for (let i = 0; i < this.chooseRows.length; i++) {
let e = this.chooseRows[i];
try {
await this.pacsPrint(e.registerCheckId,"0004",isPreview)
await this.pacsPrint(e.registerCheckId, "0004", isPreview)
} catch (error) {
console.log(`打印条码或更新条码打印状态失败，原因：${error}`)
this.$message.warning({ showClose: true, message: `打印条码或更新条码打印状态失败，原因：${error}`})
this.$message.warning({ showClose: true, message: `打印条码或更新条码打印状态失败，原因：${error}` })
}
}
},
@ -158,7 +158,7 @@ export default {
IsUploadPdf: 'N',
preViewCanPrint: "N",
Parameters: [
{ Name: "printer", Value: user },
{ Name: "printer", Value: user },
],
BusinessCode: pacsRequestId
};
@ -176,11 +176,11 @@ export default {
this.$message.warning({ showClose: true, message: `${err}` });
});
} else {
} else {
try {
let lres = await this.$peisAPI.print(JSON.stringify(toOutShell))
let Jres = JSON.parse(lres)
if(Jres.code < 0){
if (Jres.code < 0) {
err = Jres.message
console.log('打印检查条码错误', err)
this.$message.error({ showClose: true, message: `打印检查条码错误 ${err}` });
@ -198,7 +198,7 @@ export default {
this.pacsRequest = []
if (!patientRegisterId) return
// console.log(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, res)
postapi(`/api/app/PrintReport/getpacsnoreport?PatientRegisterId=${patientRegisterId}`)
postapi('/api/app/PrintReport/getpacsnoreport', { patientRegisterId })
.then(res => {
if (res.code > -1) {
this.pacsRequest = res.data
@ -215,7 +215,7 @@ export default {
// immediate:true,
handler(newVal, oldVal) {
console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
if(newVal != oldVal) this.retrieve_pacs_request(this.dataTransOpts.tableS.patient_register.id)
if (newVal != oldVal) this.retrieve_pacs_request(this.dataTransOpts.tableS.patient_register.id)
}
},
}

26
src/components/patientRegister/PatientRegisterEdit.vue
View File

@ -422,6 +422,7 @@
<div v-show="checkPagePriv(pagePriv.privs, '复制新增')" class="btn">
<el-button type="primary" class="commonbutton" @click="rdCopy">复制新增</el-button>
</div>
<div v-show="checkPagePriv(pagePriv.privs, '保存')" class="btn">
<el-button type="success" class="commonbutton" @click="btnSubmit('form', true)">保存</el-button>
</div>
@ -751,6 +752,7 @@ export default {
dialogOrg: false,
printing: false, // 是否打印中，控制一次只能有一个任务
completeFlag:'0', // 默认预登记，首次正式登记或者预登记转正式登记，提示打印条码与指引单
};
},
@ -950,9 +952,6 @@ export default {
this.dialogOrg = false
},
// 获取登记信息 初始form表单数据
async initFormData(patientRegisterId) {
this.peisid = window.sessionStorage.getItem('peisid');
@ -976,12 +975,14 @@ export default {
this.form.customerOrgParentId = customerOrgParentId //体检父单位
this.form.customerOrgName = customerOrgName
this.handleFormData()
this.completeFlag = '0'
} else {
// let res = await getapi(`/api/app/patient-register/${patientRegisterId}`)
postapi('/api/app/patientregister/getinfoorpatient', { patientRegisterId }).then(res => {
if (res.code > -1) {
// this.form = res.data 这种方式，会造成 checkbox 值变化不响应，故取消
this.form = res.data
this.completeFlag = this.form.completeFlag
this.handleFormData()
}
})
@ -1484,13 +1485,13 @@ export default {
//一般读身份证照片时，会出现这种情况
if (this.peoplePhoto && this.peoplePhoto.indexOf("data:image") > -1) await savePeoplePhoto(res.data.id, this.peoplePhoto);
// 保存即发送收费申请
if (this.LocalConfig.patientRegister.immediateToHisCharge) {
// 保存即发送收费申请 正式登记的才发送申请
if (this.form.completeFlag != '0' && this.LocalConfig.patientRegister.immediateToHisCharge) {
await this.immediateToHisCharge(this.form.id)
}
// 新增保存时，提示是否打条码 (预登记一般不打条码)
if (!body.id && this.form.completeFlag != '0') {
// 首次正式登记或者预登记转正式登记，提示打印条码与指引单
if (this.completeFlag == '0' && this.form.completeFlag != '0') {
if (Array.isArray(this.LocalConfig.patientRegister.printGuideLabel) && this.LocalConfig.patientRegister.printGuideLabel.length > 0) {
this.$confirm("是否打印 指引单、检验条码及 Pacs 条码?", "提示", {
confirmButtonText: "是",
@ -1508,10 +1509,13 @@ export default {
console.log(error)
}
})
.catch((err) => {
// if (err == "cancel") {
// this.$message.info({ showClose: true, message: "已取消操作" });
// }
.catch((err) => {
if (err != "cancel") {
console.log(err)
}
})
.finally(() => {
this.completeFlag = this.form.completeFlag
});
}
}

2
src/components/patientRegister/PatientRegisterList.vue
View File

@ -1260,7 +1260,7 @@ export default {
],
BusinessCode: row.id
};
console.log('this.$peisAPI.print',toOutShell)
if (isPreview) {
this.$peisAPI.printPre(JSON.stringify(toOutShell))
.then(res => {

Write Preview
Loading…
Cancel
Save