diff --git a/public/pic/evaluate.jpg b/public/pic/evaluate.jpg
new file mode 100644
index 0000000..8975082
Binary files /dev/null and b/public/pic/evaluate.jpg differ
diff --git a/src/components/doctorCheck/RegisterCheckEdit.vue b/src/components/doctorCheck/RegisterCheckEdit.vue
index 3ba9847..bb16d8e 100644
--- a/src/components/doctorCheck/RegisterCheckEdit.vue
+++ b/src/components/doctorCheck/RegisterCheckEdit.vue
@@ -7,44 +7,34 @@
- 检查医生
-
-
+ 检查
+
+
-
-
- 检查日期
-
+
- 审核医生
-
-
+ 审核
+
+
-
-
- 审核日期
-
-
-
+
+
- 操作者
+ 操作
-
-
- 操作日期
-
+
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 3ce0df1..810a537 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -2616,9 +2616,10 @@ export default {
preViewCanPrint: 'N',
BusinessCode: this.form.id,
Parameters: [
- { Name: 'printer', Value: user },
- { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
- { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
+ { Name: 'printer', Value: user }, // 打印人
+ { Name: 'hisLog', Value: 'pic/hisLog.jpg' }, // 院标
+ { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' }, //公众号
+ { Name: "picExtOne", Value: "pic/evaluate.jpg" }, // 客户评价二维码(检后评价)
],
};
console.log('this.$peisAPI.print', JSON.stringify(toOutShell))
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index a7e7f39..5d62aab 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1134,6 +1134,7 @@ export default {
{ Name: "printer", Value: user },
{ Name: "hisLog", Value: "pic/hisLog.jpg" },
{ Name: "pageFooter", Value: "pic/peisQrCode.jpg" },
+ { Name: "picExtOne", Value: "pic/evaluate.jpg" }, // 客户评价二维码(检后评价)
],
};
let lfind = -1;
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 9e8c4a0..8409647 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -351,9 +351,8 @@ export default {
this.query.patientName = idNos.Name
this.query.sex = idNos.sexId
this.query.idCardNo = idNos.IDCode
-
- this.query.times++;
-
+ // 触发按身份证查询
+ this.btnQuery('idCardNo')
} else {
this.$message.error({ showClose: true, message: lres.message })
}
diff --git a/src/components/report/TurnoverReportReal.vue b/src/components/report/TurnoverReportReal.vue
index c1c80d5..fd74b16 100644
--- a/src/components/report/TurnoverReportReal.vue
+++ b/src/components/report/TurnoverReportReal.vue
@@ -75,6 +75,13 @@
+
+ 支付方式：
+
+
+
+
@@ -92,21 +99,23 @@
-
+ min-width="80" align="center" />
+
-
+
-
+
-
+
-
- {{ scope.row[col] }}
+
+ {{ scope.row[col] }}
@@ -140,7 +149,6 @@ export default {
medicalType: [],
personnelType: [],
dictSalesman: [],
-
query: {
dateType: '6',
startDate: '',
@@ -149,6 +157,7 @@ export default {
medicalTypeIds: [],
personnelTypeIds: [],
salesmans: [],
+ payModeIds: [],
// isMedicalTypeId: 'Y',
isPreRegistration: 'N',
isChild: 'Y',
@@ -177,7 +186,7 @@ export default {
},
computed: {
- ...mapState(["pickerOptions","window", "dict", "patientRegister", "report"]),
+ ...mapState(["pickerOptions", "window", "dict", "patientRegister", "report"]),
},
methods: {
//获取初始数据
@@ -218,6 +227,12 @@ export default {
}
})
+ //支付方式
+ getapi("/api/app/pay-mode").then((res) => {
+ if (res.code == 1) {
+ this.dict.payMode = res.data;
+ }
+ });
},
//通用导出
@@ -251,11 +266,9 @@ export default {
btnQuery() {
//let body = deepCopy(this.query)
postapi("/api/app/CustomerReport/GetCustomerOrgAmountReceivedStatistics", this.query).then(res => {
- if (res.code > -1) {
- if (Array.isArray(res.data) && res.data.length > 0) {
- // 动态生成新的显示数据
- this.makeDispData(res.data)
- }
+ if (res.code > -1) {
+ // 动态生成新的显示数据
+ this.makeDispData(res.data)
}
})
},
@@ -264,6 +277,9 @@ export default {
makeDispData(orgData) {
this.tableData = []
this.asyncCols = []
+ // 没有数据返回
+ if (!(Array.isArray(orgData) && orgData.length > 0)) return
+
orgData.forEach(e => {
if (this.query.isChild == 'Y') {
e.customerOrgName = (e.customerOrgName == e.departmentName ? e.customerOrgName : e.customerOrgName + '--' + e.departmentName)
@@ -272,8 +288,8 @@ export default {
e.refundTotal = 0
e.feeDetail.forEach(c => {
e.chargeTotal = Number(e.chargeTotal) + Number(c.chargeMoney)
- e.refundTotal = Number(e.refundTotal) + Number(c.refundMoney)
- if(!this.asyncCols.includes(c.payModeName)){
+ e.refundTotal = Number(e.refundTotal) + Number(c.refundMoney)
+ if (!this.asyncCols.includes(c.payModeName)) {
this.asyncCols.push(c.payModeName)
}
e[c.payModeName] = Math.round((Number(c.chargeMoney) + Number(c.refundMoney)) * 100) / 100
@@ -288,7 +304,7 @@ export default {
this.tableData.forEach(e => {
this.asyncCols.forEach(col => {
- if(!e[col]){
+ if (!e[col]) {
e[col] = 0
}
});
@@ -308,22 +324,22 @@ export default {
// }
const { columns, data } = param;
- let count = 7,sumCol = [] //需合计的列
+ let count = 7, sumCol = [] //需合计的列
const sums = [];
- if (this.query.isCustomerOrgRegister == 'Y'){
- sumCol = [2,3,4,5,6,7]
+ if (this.query.isCustomerOrgRegister == 'Y') {
+ sumCol = [2, 3, 4, 5, 6, 7]
count = 8
- }else{
- sumCol = [2,3,4,5,6]
+ } else {
+ sumCol = [2, 3, 4, 5, 6]
}
- this.asyncCols.forEach(() => {
+ this.asyncCols.forEach(() => {
sumCol.push(count++)
});
-
- console.log('sumCol',sumCol)
+
+ console.log('sumCol', sumCol)
columns.forEach((column, index) => {
- console.log('column.property, index,data',column.property, index,data)
+ console.log('column.property, index,data', column.property, index, data)
//显示合计列
if (index === 1) {
sums[index] = '合计';