+
{{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}
@@ -126,6 +126,7 @@
import moment from "moment";
import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { setPrStatusColor } from "../../utlis/proFunc"
import Sortable from "sortablejs";
@@ -246,7 +247,7 @@ export default {
]),
},
methods: {
- moment, dddw, deepCopy, checkPagePriv,
+ moment, dddw, deepCopy, checkPagePriv,setPrStatusColor,
// 扩展定义表格行样式
handleRowClassName({ row, rowIndex }) {
diff --git a/src/components/patientRegister/PatientPacsRequest.vue b/src/components/patientRegister/PatientPacsRequest.vue
index a5dcbea..0dd2054 100644
--- a/src/components/patientRegister/PatientPacsRequest.vue
+++ b/src/components/patientRegister/PatientPacsRequest.vue
@@ -116,14 +116,6 @@ export default {
},
- //检验申请
- async btnLisRequest(isRequest) {
- if (this.chooseRows.length == 0) {
- this.$message.warning({ showClose: true, message: "请先选择要操作的条码记录！" })
- return
- }
- console.log('btnLisRequest',isRequest)
- },
// 打印或预览
async btnPacsPrint(isPreview) {
@@ -137,7 +129,7 @@ export default {
}
if (isPreview) {
- this.pacsPrint(this.chooseRows[0].pacsRequestId,"0004",isPreview)
+ this.pacsPrint(this.chooseRows[0].registerCheckId,"0004",isPreview)
return
}
@@ -145,11 +137,7 @@ export default {
for (let i = 0; i < this.chooseRows.length; i++) {
let e = this.chooseRows[i];
try {
- let err = await this.pacsPrint(e.pacsRequestId,"0004",isPreview)
- if(!err){
- let lfind = arrayExistObj(this.dataTransOpts.tableM.pacs_request,"lisRequestId",e.lisRequestId)
- if(lfind > -1) this.dataTransOpts.tableM.pacs_request[lfind].isPrint = "Y"
- }
+ await this.pacsPrint(e.registerCheckId,"0004",isPreview)
} catch (error) {
console.log(`打印条码或更新条码打印状态失败，原因：${error}`)
this.$message.warning({ showClose: true, message: `打印条码或更新条码打印状态失败，原因：${error}`})
@@ -170,8 +158,7 @@ export default {
IsUploadPdf: 'N',
preViewCanPrint: "N",
Parameters: [
- { Name: "printer", Value: user },
- { Name: "hisLog", Value: "pic/hisLog.jpg" },
+ { Name: "printer", Value: user },
],
BusinessCode: pacsRequestId
};
@@ -185,7 +172,7 @@ export default {
}
})
.catch((err) => {
- console.log('打印检验条码错误', err)
+ console.log('打印检查条码错误', err)
this.$message.warning({ showClose: true, message: `${err}` });
});
@@ -195,15 +182,8 @@ export default {
let Jres = JSON.parse(lres)
if(Jres.code < 0){
err = Jres.message
- console.log('打印检验条码错误', err)
- this.$message.error({ showClose: true, message: `打印检验条码错误 ${err}` });
- }else{
- // 更新条码打印状态
- // let res = await postapi('/api/app/lisrequest/updatelisrequestisprint',{});
- // if(res.code < 0){
- // err = res.message
- // this.$message.error({ showClose: true, message: `更新条码打印状态失败，原因 ${err}` });
- // }
+ console.log('打印检查条码错误', err)
+ this.$message.error({ showClose: true, message: `打印检查条码错误 ${err}` });
}
} catch (error) {
err = `${error}`
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index fecd9d3..7dec26c 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1132,7 +1132,7 @@ export default {
BusinessCode: row.id
};
- // console.log('this.$peisAPI.print', toOutShell)
+ console.log('this.$peisAPI.print', toOutShell)
if (isPreview) {
/*
postapi(
@@ -1247,25 +1247,7 @@ export default {
BusinessCode: row.id
};
- 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) {
@@ -1276,53 +1258,11 @@ 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) {
this.$message.warning({ showClose: true, message: JSON.parse(res).message });
- } else {
- return postapi("/api/app/lisrequest/updatelisrequestisprint", {
- operateType: 1,
- patientRegisterId: row.id,
- });
- }
- })
- .then(res => {
- if (res && res.code < 0) {
- this.$message.error({ showClose: true, message: `${res.message}` });
}
})
.catch((err) => {
@@ -1332,14 +1272,12 @@ export default {
}
},
-
-
//通用导出
btnExport(elId) {
// 获取HTML元素（表格）
// let table = document.getElementById(elId); //.cloneNode(true)
this.$nextTick(() => {
- let refsTable = this.$refs[elId] //.cloneNode(true) true
+ // let refsTable = this.$refs[elId] //.cloneNode(true) true
let table = document.getElementById(elId)
// console.log('table,refsTable', table, refsTable)