-
-
采图
+
+ 采图
-
-
导图
+
+ 导图
-
-
-
+
+ ">
-
+
-
+
@@ -72,35 +39,19 @@
打印
-
-
+
+
-
-
+
+
@@ -108,7 +59,7 @@
import moment from "moment";
import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { getPagePriv,checkPagePriv, deepCopy, arrayExistObj } from "../../utlis/proFunc";
+import { getPagePriv, checkPagePriv, deepCopy, arrayExistObj } from "../../utlis/proFunc";
import CheckPictureUpload from "./CheckPictureUpload.vue";
@@ -116,13 +67,14 @@ export default {
components: {
CheckPictureUpload,
},
+ props: ["doctorBtnDisabled"],
data() {
return {
- sysConfig:{}, //
- pagePriv:{
- routeUrlorPageName:'doctorCheck', //当前页面归属路由或归属页面权限名称
- privs:[] // 页面权限
- },
+ sysConfig: {}, //
+ pagePriv: {
+ routeUrlorPageName: 'doctorCheck', //当前页面归属路由或归属页面权限名称
+ privs: [] // 页面权限
+ },
checkPictures: [
{
id: "1",
@@ -150,7 +102,7 @@ export default {
created() {
//获取用户当前页面的权限
let userPriv = window.sessionStorage.getItem('userPriv')
- if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+ if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
},
//挂载完成
@@ -208,30 +160,30 @@ export default {
},
// 生成 图片预览列表
- previewSrcList(oriList,curImag){
+ previewSrcList(oriList, curImag) {
let srcList = []
let image = curImag.pictureFilename.indexOf('http') > -1
- ? curImag.pictureFilename
- : this.sysConfig.apiUrl + curImag.pictureFilename;
+ ? curImag.pictureFilename
+ : this.sysConfig.apiUrl + curImag.pictureFilename;
srcList.push(image)
- let lfind = arrayExistObj(oriList,'id',curImag.id)
- if(lfind > -1){
+ let lfind = arrayExistObj(oriList, 'id', curImag.id)
+ if (lfind > -1) {
for (let i = lfind + 1; i < oriList.length; i++) {
let e = oriList[i];
image = e.pictureFilename.indexOf('http') > -1
- ? e.pictureFilename
- : this.sysConfig.apiUrl + e.pictureFilename;
+ ? e.pictureFilename
+ : this.sysConfig.apiUrl + e.pictureFilename;
srcList.push(image)
}
for (let index = 0; index < lfind; index++) {
let e = oriList[index];
image = e.pictureFilename.indexOf('http') > -1
- ? e.pictureFilename
- : this.sysConfig.apiUrl + e.pictureFilename;
+ ? e.pictureFilename
+ : this.sysConfig.apiUrl + e.pictureFilename;
srcList.push(image)
}
}
- return srcList
+ return srcList
},
btnGetPic() {
@@ -387,7 +339,8 @@ export default {
margin: 2px 2px 0;
height: 26px;
min-width: 40px;
- padding: 5px 5px; /*原始 默认值 10px 10px */
+ padding: 5px 5px;
+ /*原始 默认值 10px 10px */
}
/* 强制出现滚动条 */
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 72ab4a1..6357534 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -10,19 +10,19 @@
小结
- 生成小结
+ 生成小结
- 新增小结
+ 新增小结
- 保存结果
+ 保存结果
- 审核
+ 审核
- 排队
+ 排队
@@ -30,12 +30,12 @@
@@ -53,7 +53,7 @@
新增建议
+ :disabled="doctorBtnDisabled('addSuggestion')">新增建议
@@ -61,12 +61,12 @@
@@ -82,7 +82,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { getPagePriv, checkPagePriv, deepCopy } from "../../utlis/proFunc";
export default {
components: {},
- props: ["registerCheckId", "isCheckPicture", "optGrant", "addSummary", "btnMakeDiagnosis", "save", "audit", "unAudit", "btnLineUp"],
+ props: ["registerCheckId", "isCheckPicture", "optGrant", "addSummary", "btnMakeDiagnosis", "save", "audit", "unAudit", "btnLineUp","doctorBtnDisabled"],
data() {
return {
pagePriv: {
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 72a58e6..ef92848 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -405,7 +405,7 @@ export default {
}
if (isPreview) {
- //
+ /*
//this.multipleSelection.forEach((item,index) =>{
postapi(
`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.multipleSelection[0].id}`
@@ -430,20 +430,32 @@ export default {
console.log('打印指引单', err)
this.$message.warning({ showClose: true, message: err });
});
- // });
+ */
+ toOutShell.BusinessCode = this.multipleSelection[0].id
+ this.$peisAPI.printPre(JSON.stringify(toOutShell))
+ .then(res => {
+ if (JSON.parse(res).code < 0) {
+ this.$message.warning({ showClose: true, message: JSON.parse(res).message });
+ }
+ })
+ .catch((err) => {
+ console.log('打印指引单', err)
+ this.$message.warning({ showClose: true, message: `${err}` });
+ });
+
} else {
this.elProgress.display = true;
this.elProgress.percentage = 0;
- let resPrintData, resPeisAPI, resPrintTimes;
for (let i = 0; i < this.multipleSelection.length; i++) {
- try {
+ try {
+ /*
resPrintData = await postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.multipleSelection[i].id}`)
if (resPrintData.code == -1) continue
toOutShell.ReportTable = resPrintData.data
resPeisAPI = await this.$peisAPI.print(JSON.stringify(toOutShell));
- console.log('壳返回结果',resPeisAPI)
+ console.log('壳返回结果', resPeisAPI)
if (JSON.parse(resPeisAPI).code < 0) continue
resPrintTimes = await postapi("/api/app/patientregister/updatepatientregisterguideprinttimesmany", [this.multipleSelection[i].id]);
if (resPrintTimes.code == -1) continue
@@ -455,15 +467,33 @@ export default {
this.tableData[lfind].guidePrintTimes = 1;
}
}
+ */
+ let patientregisterId = this.multipleSelection[i].id
+ toOutShell.BusinessCode = patientregisterId
+ let resPeisAPI = await this.$peisAPI.print(JSON.stringify(toOutShell));
+ if (JSON.parse(resPeisAPI).code < 0) continue
+ let resPrintTimes = await postapi("/api/app/patientregister/updatepatientregisterguideprinttimesmany", [patientregisterId]);
+ if (resPrintTimes.code == -1) continue
+ lfind = arrayExistObj(this.tableData, "id", patientregisterId);
+ if (lfind > -1) {
+ if (this.tableData[lfind].guidePrintTimes) {
+ this.tableData[lfind].guidePrintTimes = Number(this.tableData[lfind].guidePrintTimes) + 1;
+ } else {
+ this.tableData[lfind].guidePrintTimes = 1;
+ }
+ }
+
} catch (error) {
- console.log('打印指引单', `${error}`)
- this.$message.warning({ showClose: true, message: error });
+ console.log('打印指引单', error)
+ this.$message.warning({ showClose: true, message: `${error}` });
}
this.elProgress.percentage = Math.floor(
((i + 1) * 100) / this.multipleSelection.length
);
}
+
+ this.elProgress.display = false;
}
},
@@ -501,20 +531,20 @@ export default {
//双击事件
if (this.DbClick == 1) { //第一次点击的节点和第二次点击的节点id相同
- this.rowClickRetrieve(row)
+ this.rowClickRetrieve(row)
return;
}
setTimeout(() => { //300ms内没有第二次点击，执行单击事件
- if(this.oneClick == 1 && this.DbClick == 0) this.rowClickRetrieve(row)
+ if (this.oneClick == 1 && this.DbClick == 0) this.rowClickRetrieve(row)
}, 300)
-
+
},
rowClickRetrieve(row) {
this.oneClick = 0;
this.DbClick = 0;
-
+
// 按住了shift键
if (this.window.shift) {
//清除所有选择
@@ -576,7 +606,7 @@ export default {
},
// 双击
- rowDblclick(row){
+ rowDblclick(row) {
this.rowClick(row)
this.btnEdit()
},
@@ -1063,6 +1093,7 @@ export default {
this.$message.info("此功能，需要在壳客户端才可运行！");
return;
}
+
let token = window.sessionStorage.getItem("token");
let user = window.sessionStorage.getItem("user");
let toOutShell = {
@@ -1073,11 +1104,11 @@ export default {
{ Name: "printer", Value: user },
{ Name: "hisLog", Value: "pic/hisLog.jpg" },
],
+ BusinessCode:prId
};
if (isPreview) {
- //http://140.143.162.39:9529/api/app/printreport/getlisrequestreport?PatientRegisterId=3a0d2e90-da68-3746-6775-bf17e5f9b295
- //this.multipleSelection.forEach((item,index) =>{
+ /*
postapi(
`/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`
)
@@ -1094,8 +1125,20 @@ export default {
.catch((err) => {
this.$message.warning(err);
});
- // });
+ */
+ this.$peisAPI.printPre(JSON.stringify(toOutShell))
+ .then(res => {
+ if (JSON.parse(res).code < 0) {
+ this.$message.warning({ showClose: true, message: JSON.parse(res).message });
+ }
+ })
+ .catch((err) => {
+ console.log('打印检验条码错误', err)
+ this.$message.warning({ showClose: true, message: `${err}` });
+ });
+
} else {
+ /*
postapi(
`/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`
)
@@ -1127,6 +1170,27 @@ export default {
.catch((err) => {
this.$message.warning(err);
});
+ */
+ 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: prId,
+ });
+ }
+ })
+ .then(res => {
+ if(res && res.code < 0){
+ this.$message.error({ showClose: true, message: `${res.message}` });
+ }
+ })
+ .catch((err) => {
+ console.log('打印检验条码错误', err)
+ this.$message.error({ showClose: true, message: `${err}` });
+ });
}
},
@@ -1146,11 +1210,11 @@ export default {
{ Name: "printer", Value: user },
{ Name: "hisLog", Value: "pic/hisLog.jpg" },
],
+ BusinessCode:prId
};
if (isPreview) {
- //http://140.143.162.39:9529/api/app/printreport/getpacsnoreport?PatientRegisterId=3a0c990e-5756-2dc0-19d5-69a617fe4048
- //this.multipleSelection.forEach((item,index) =>{
+ /*
postapi(
`/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
)
@@ -1167,8 +1231,19 @@ export default {
.catch((err) => {
this.$message.warning(err);
});
- // });
+ */
+ this.$peisAPI.printPre(JSON.stringify(toOutShell))
+ .then(res => {
+ if (JSON.parse(res).code < 0) {
+ this.$message.warning({ showClose: true, message: JSON.parse(res).message });
+ }
+ })
+ .catch((err) => {
+ console.log('打印pacs条码错误', err)
+ this.$message.warning({ showClose: true, message: `${err}` });
+ });
} else {
+ /*
postapi(
`/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
)
@@ -1199,6 +1274,27 @@ export default {
.catch((err) => {
this.$message.warning(err);
});
+ */
+ 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: prId,
+ });
+ }
+ })
+ .then(res => {
+ if(res && res.code < 0){
+ this.$message.error({ showClose: true, message: `${res.message}` });
+ }
+ })
+ .catch((err) => {
+ console.log('打印pacs条码错误', err)
+ this.$message.error({ showClose: true, message: `${err}` });
+ });
}
},
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index 3133365..299d48b 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -18,7 +18,7 @@
import moment from "moment";
import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { arrayExistObj, parseID } from "../../utlis/proFunc";
+import { arrayExistObj, deepCopy,parseID } from "../../utlis/proFunc";
//import PatientRegisterList from "../doctorCheck/PatientRegisterList.vue";
export default {
diff --git a/src/components/report/PatientRegisterQueryNobtn.vue b/src/components/report/PatientRegisterQueryNobtn.vue
index d67efe3..9f24cc6 100644
--- a/src/components/report/PatientRegisterQueryNobtn.vue
+++ b/src/components/report/PatientRegisterQueryNobtn.vue
@@ -4,8 +4,10 @@
体检单位：
-
-
+
+
@@ -28,11 +30,12 @@
检查状态：
-
+
-
+
条码号：
@@ -49,18 +52,17 @@
审核：
-
-
-
+
+
+
-
+
上传：
-
-
+
+
@@ -70,13 +72,13 @@
-
-
+
+