diff --git a/public/sysConfig.json b/public/sysConfig.json
index 5cf6547..602505c 100644
--- a/public/sysConfig.json
+++ b/public/sysConfig.json
@@ -1,4 +1,4 @@
{
- "apiurl": "http://140.143.162.39:9529",
+ "apiurl": "http://192.168.2.67:9529",
"softName": "神豚体检管理系统"
}
\ No newline at end of file
diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index 5634bef..f80b8be 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -27,7 +27,7 @@
z-index: 2;
">
-
@@ -40,13 +40,14 @@
-
+
打印
+ style="width: 30px" :disabled="doctorBtnDisabled('btnSavePic')" />
@@ -158,7 +159,7 @@ export default {
this.checkPictures = res.data
this.checkPictures.forEach(e => {
e.isPrintTrans = e.isPrint == "Y" ? true : false
- });
+ });
}
});
},
@@ -192,16 +193,38 @@ export default {
btnGetPic() {
if (!this.doctorCheck.RegisterCheckId) {
- this.$message.warning({ showClose: true, message: "未选中组合项目!"});
+ this.$message.warning({ showClose: true, message: "未选中组合项目!" });
return;
}
- console.log("采图,开发中……");
+ if (!this.$peisAPI) {
+ this.$message.info({ showClose: true, message: "此功能,需要在壳客户端才可运行!" })
+ return
+ }
+
+ let toOutShell = {
+ barCode: this.doctorCheck.checkRequestNo,
+ patientName: this.dataTransOpts.tableS.patient_register.patientName,
+ sexName: this.dataTransOpts.tableS.patient_register.sexName,
+ age: (this.dataTransOpts.tableS.patient_register.age||'') + '',
+ asbitemName: this.doctorCheck.asbitemName
+ }
+ console.log('this.$peisAPI.imageAcquisition',JSON.stringify(toOutShell))
+ this.$peisAPI.imageAcquisition(JSON.stringify(toOutShell)).then(res => {
+ let lres = JSON.parse(res)
+ if (lres.code > -1) {
+ console.log(lres.data)
+ }
+ console.log('lres', lres)
+ }).catch(err => {
+ this.$message.error(err)
+ })
+
},
//导图(上传图片)
btnExpPic() {
if (!this.doctorCheck.RegisterCheckId) {
- this.$message.warning({ showClose: true, message: "未选中组合项目!"});
+ this.$message.warning({ showClose: true, message: "未选中组合项目!" });
return;
}
this.uploadSeq++;
@@ -215,7 +238,7 @@ export default {
btnSavePic() {
if (!this.doctorCheck.RegisterCheckId) {
- this.$message.warning({ showClose: true, message: "未选中组合项目!"});
+ this.$message.warning({ showClose: true, message: "未选中组合项目!" });
return;
}
@@ -230,7 +253,7 @@ export default {
// }
// ]
if (this.checkPictures.length == 0) {
- this.$message.warning({ showClose: true, message: "没有可保存的图片数据!"});
+ this.$message.warning({ showClose: true, message: "没有可保存的图片数据!" });
return;
}
@@ -282,7 +305,7 @@ export default {
type: "warning",
})
.then(() => {
- return postapi(`/api/app/registercheckpicture/deleteregistercheckpicturemany`,body);
+ return postapi(`/api/app/registercheckpicture/deleteregistercheckpicturemany`, body);
})
.then((res) => {
if (res && res.code > -1) {
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index d90c9c3..abdc2f6 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -118,6 +118,9 @@ export default {
rowClick(row) {
console.log('rowClick')
this.doctorCheck.RegisterCheckId = row.id
+ this.doctorCheck.asbitemName = row.asbitemName
+ this.doctorCheck.checkRequestNo = row.checkRequestNo
+
this.dataTransOpts.tableS.register_check.id = row.id
this.dataTransOpts.refresh.register_check.S++
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index f17be90..0e2f14e 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -326,7 +326,7 @@ export default {
{ Name: "orgSign", Value: "pic/orgSign.png" },
{ Name: 'picExtOne', Value: 'pic/hisLog.jpg' },
],
- IsHealthReport: 'Y'
+ IsHealthReport: 'Y'
};
for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
@@ -338,7 +338,7 @@ export default {
try {
if (e.completeFlag == '3') {
toOutShell.BusinessCode = e.patientRegisterId
- toOutShell.ExportDirectory = `${path}\\${e.patientRegisterNo}_${patientName}.pdf`
+ toOutShell.ExportDirectory = `${path}\\${e.patientRegisterNo}_${e.patientName}.pdf`
let jsonToOutShell = JSON.stringify(toOutShell)
console.log('toOutShell', jsonToOutShell)
let res = await this.$peisAPI.exportToPdfPre(jsonToOutShell)
diff --git a/src/views/workload/directordoctor.vue b/src/views/workload/directordoctor.vue
index de0fb31..3fa2821 100644
--- a/src/views/workload/directordoctor.vue
+++ b/src/views/workload/directordoctor.vue
@@ -363,13 +363,21 @@ export default {
}
});
},
+
getList() {
- getapi("/api/identity/users/getlist",this.pages).then((res) => {
- if (res.code != -1) {
- this.registrardata = [...res.data.items];
- }
- });
+ // getapi("/api/identity/users/getlist",this.pages).then((res) => {
+ // if (res.code != -1) {
+ // this.registrardata = [...res.data.items];
+ // }
+ // });
+ postapi('/api/identity/users/GetListByOperatorType', { operatorTypes: ["2", "3"] })
+ .then(res => {
+ if (res.code > -1) {
+ this.registrardata = res.data
+ }
+ })
},
+
getNowTime() {
var now = new Date();
var year = now.getFullYear(); // 得到年份