diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index 78cf07b..466675b 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -10,8 +10,7 @@
-
+
@@ -19,24 +18,22 @@
姓名：
-
+
性别：
-
+
检查状态：
-
+
-
@@ -167,7 +164,7 @@
+ width="800px" height="600px" >
@@ -196,6 +193,20 @@ export default {
local: {
query: {
+ dateType: 'creationTime', //登记日期
+ dateRange: null, //日期范围
+ startDate: null,
+ endDate: null,
+ containRefuse: true, //包含弃检项目
+ times: 0, //触发查询次数
+ customerOrgId: "", //体检单位ID
+ CustomerOrgParentId: "", //单位父级ID
+ customerOrgFlag: true, //单位作为查询条件
+ customerOrgRegister: { id: '' }, //单位体检次数
+ checkAsbs: null,
+ patientName: '', //姓名
+ sex: '', //性别
+ idCardNo: '', //身份证号
haveImage: false,
checkAsb: '', //检查项目
},
@@ -217,7 +228,7 @@ export default {
//挂载完成
mounted() { },
computed: {
- ...mapState(["window", "dataTransOpts", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck", "report"]),
+ ...mapState(["window", "dataTransOpts", "dict", "customerOrg","patientRegister", "doctorCheck", "sumDoctorCheck", "report"]),
},
methods: {
...mapMutations(['doctorCheckPrBaseInit', 'sumPREditInit']),
@@ -252,6 +263,7 @@ export default {
this.local.completeFlag.splice(0, 1) //预记选项去掉
},
+
//快速选择组合项目时，调整可按拼间简码及简称查找
filterMethod(keyWords) {
//console.log('filterMethod',this.asbItemQuick)
@@ -300,12 +312,12 @@ 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)
},
@@ -329,7 +341,7 @@ export default {
this.sumDoctorCheck.sumDoctorCheckDialogVisible = false
// console.log('rowDblclick', this.doctorCheck.doctorCheckDialogVisible, this.sumDoctorCheck.sumDoctorCheckDialogVisible)
},
-
+
lmoment(date, forMat) {
return moment(new Date(date)).format(forMat);
},
@@ -361,10 +373,10 @@ export default {
}
body.customerOrgs = customerOrgs
- if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
- if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
- if (this.patientRegister.query.isAudit) body.isAudit = this.patientRegister.query.isAudit
- if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+ if (this.local.query.patientName) body.patientName = this.local.query.patientName
+ if (this.local.query.sex) body.sexId = this.local.query.sex
+ if (this.local.query.isAudit) body.isAudit = this.local.query.isAudit
+ if (this.local.query.completeFlag) body.completeFlag = this.local.query.completeFlag
if (this.local.query.checkAsb) body.asbitems = [this.local.query.checkAsb]
if (this.local.query.haveImage) body.isPicture = 'Y'
diff --git a/src/components/patientRegister/PatientLis.vue b/src/components/patientRegister/PatientLis.vue
index 6a28945..5d0e3e4 100644
--- a/src/components/patientRegister/PatientLis.vue
+++ b/src/components/patientRegister/PatientLis.vue
@@ -7,8 +7,7 @@
+ @selection-change="handleSelectionChange" ref="info" id="info" :row-class-name="handleRowClassName">
-
+
+
@@ -132,7 +138,14 @@
撤消申请
-
+
+
@@ -149,6 +162,7 @@
import moment from "moment";
import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { photoParse } from "../../utlis/proFunc"
import Sortable from "sortablejs";
import FileSaver from 'file-saver';
import html2canvas from 'html2canvas';
@@ -246,6 +260,8 @@ export default {
oneClick: 0, // 1 表示行单击一次
DbClick: 0, // 1 表示行有单击第二次
+
+ lisLabel:'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg',
};
},
@@ -259,7 +275,7 @@ export default {
//挂载完成
mounted() {
-
+
// 初始化可以拖动的列
this.headerCols = deepCopy(this.dropCol)
this.dropCol = this.columnDrop(this.dropCol);
@@ -278,6 +294,10 @@ export default {
"patientRegister",
"customerOrg",
]),
+
+ peoplePhoto() {
+ return photoParse(this.tableDataCurrentRow.photo)
+ }
},
methods: {
...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
@@ -296,11 +316,22 @@ export default {
},
// 全选 取消全选
- btnChooseAll(type){
- if(type == 1){
+ btnChooseAll(type) {
+ if (type == 1) {
// 全选
- }else{
+ this.tableData.forEach(e => {
+ e.choosed = true;
+ e.highLightBg = "selected";
+ });
+ this.multipleSelection = deepCopy(this.tableData)
+ } else {
+ this.tableData.forEach(e => {
+ e.choosed = false;
+ e.highLightBg = "";
+ });
+ this.multipleSelection = []
+ this.$refs['info'].setCurrentRow();
}
},
@@ -315,7 +346,7 @@ export default {
setData(this, item, v)
},
-
+
handleSelectionChange(rows) {
//this.multipleSelection = rows;
@@ -333,7 +364,7 @@ export default {
this.multipleSelection = JSON.parse(JSON.stringify(rows));
},
- //点击体检次数行
+ //点击体检次数行
rowClick(row) {
if (this.oneClick == 0) {
this.oneClick = 1;
@@ -422,7 +453,7 @@ export default {
this.rowClick(row)
this.btnEdit()
},
-
+
//查询
async Query() {
// 查询时，清掉明细数据 （滚动时不清）
@@ -563,24 +594,24 @@ export default {
}
})
},
-
+
// 预览设置
- btnPrintPre(){
+ btnPrintPre() {
},
// 打印
- btnPrint(){
+ btnPrint() {
},
// 发送检验申请
- btnSendLis(){
+ btnSendLis() {
console.log('btnSendLis')
},
// 撤消检验申请
- btnUndoLis(){
+ btnUndoLis() {
console.log('btnUndoLis')
},
@@ -651,7 +682,7 @@ export default {
{ Name: "printer", Value: user },
{ Name: "hisLog", Value: "pic/hisLog.jpg" },
],
- BusinessCode:prId
+ BusinessCode: prId
};
if (isPreview) {
@@ -722,7 +753,7 @@ export default {
.then(res => {
if (JSON.parse(res).code < 0) {
this.$message.warning({ showClose: true, message: JSON.parse(res).message });
- }else{
+ } else {
return postapi("/api/app/lisrequest/updatelisrequestisprint", {
operateType: 1,
patientRegisterId: prId,
@@ -730,7 +761,7 @@ export default {
}
})
.then(res => {
- if(res && res.code < 0){
+ if (res && res.code < 0) {
this.$message.error({ showClose: true, message: `${res.message}` });
}
})
@@ -757,7 +788,7 @@ export default {
{ Name: "printer", Value: user },
{ Name: "hisLog", Value: "pic/hisLog.jpg" },
],
- BusinessCode:prId
+ BusinessCode: prId
};
if (isPreview) {
@@ -826,7 +857,7 @@ export default {
.then(res => {
if (JSON.parse(res).code < 0) {
this.$message.warning({ showClose: true, message: JSON.parse(res).message });
- }else{
+ } else {
return postapi("/api/app/lisrequest/updatelisrequestisprint", {
operateType: 1,
patientRegisterId: prId,
@@ -834,7 +865,7 @@ export default {
}
})
.then(res => {
- if(res && res.code < 0){
+ if (res && res.code < 0) {
this.$message.error({ showClose: true, message: `${res.message}` });
}
})
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 03fac22..477efbf 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -103,7 +103,8 @@ export default {
// this.$message.info("此功能，需要在壳客户端才可运行！");
// console.log('this.$peisAPI',this.$peisAPI)
this.$peisAPI.getIsCheckPicture().then(res => {
- if (res) this.isCheckPicture = res
+ console.log("this.$peisAPI.getIsCheckPicture()",res)
+ if (res) this.isCheckPicture = res.toUpperCase() == 'Y' ? true:false
})
}