diff --git a/src/router/index.js b/src/router/index.js index d885595..9fdb0d5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -488,6 +488,36 @@ const routes = [{ component: () => import ("../views/workload/individualfeedetails.vue"), }, + { + path: "/peispersontime", + name: "体检人次汇总", + component: () => + import ("../views/workload/peispersontime.vue"), + }, + { + path: "/departmentalfees", + name: "科室收费汇总", + component: () => + import ("../views/workload/departmentalfees.vue"), + }, + { + path: "/feeforservice", + name: "项目收费汇总", + component: () => + import ("../views/workload/feeforservice.vue"), + }, + { + path: "/summaryoftollcollectors", + name: "收费员收费汇总", + component: () => + import ("../views/workload/summaryoftollcollectors.vue"), + }, + { + path: "/financialsettlement", + name: "财务结算", + component: () => + import ("../views/workload/financialsettlement.vue"), + }, { path: "/membershipcard", name: "会员卡分类统计", diff --git a/src/views/basic-dictionary/MedicalConclusionType.vue b/src/views/basic-dictionary/MedicalConclusionType.vue index 47e7d30..2897099 100644 --- a/src/views/basic-dictionary/MedicalConclusionType.vue +++ b/src/views/basic-dictionary/MedicalConclusionType.vue @@ -163,7 +163,7 @@ +
+
+
+
+ 收费统计 / + 科室收费汇总 +
+
+
+
+
+ 科室: + + + +
+
+ 开始日期: + + +
+
+ 结束日期: + + +
+
+ 查询 +
+
+ 导出excel +
+
+ 打印 +
+
+ 柱状图 +
+
+ 饼图 +
+
+
+
+ + + + + + + + + + + + + + + +
+
+
+ 科室收费汇总 +
+
+ +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/src/views/workload/deskwork.vue b/src/views/workload/deskwork.vue index d59a280..5699779 100644 --- a/src/views/workload/deskwork.vue +++ b/src/views/workload/deskwork.vue @@ -13,7 +13,24 @@
科室: - + +
开始日期: @@ -357,6 +374,9 @@ export default { }); } }, + ischangsItemTypeId(v) { + this.$refs.example.toggleDropDownVisible(); + }, peiChart() { let option2 = { // title: { @@ -537,6 +557,9 @@ page-break-before: avoid;}}`, // 去除页眉页脚 endDate: that.endDate, }).then((res) => { if (res.code != -1) { + this.pieData=[]; + this.yAxisData=[]; + this.seriesData=[]; that.computedStandardTableData(res.data); } }); @@ -728,9 +751,20 @@ page-break-before: avoid;}}`, // 去除页眉页脚 projectlist().then((res) => { if (res.code != -1) { this.registrardata = [...res.data]; + this.registrardata = this.formatData(this.registrardata); } }); }, + formatData(dataList) { + for (let i = 0; i < dataList.length; i++) { + if (dataList[i].treeChildren.length < 1) { + dataList[i].treeChildren = undefined; + } else { + this.formatData(dataList[i].treeChildren); + } + } + return dataList; + }, getNowTime() { var now = new Date(); var year = now.getFullYear(); // 得到年份 diff --git a/src/views/workload/feeforservice.vue b/src/views/workload/feeforservice.vue new file mode 100644 index 0000000..275752e --- /dev/null +++ b/src/views/workload/feeforservice.vue @@ -0,0 +1,677 @@ + + + \ No newline at end of file diff --git a/src/views/workload/financialsettlement.vue b/src/views/workload/financialsettlement.vue new file mode 100644 index 0000000..f63de96 --- /dev/null +++ b/src/views/workload/financialsettlement.vue @@ -0,0 +1,511 @@ + + + \ No newline at end of file diff --git a/src/views/workload/individualfeedetails.vue b/src/views/workload/individualfeedetails.vue index 0c130bf..fdb1d9d 100644 --- a/src/views/workload/individualfeedetails.vue +++ b/src/views/workload/individualfeedetails.vue @@ -1,148 +1,1144 @@ + + \ No newline at end of file diff --git a/src/views/workload/peispersontime.vue b/src/views/workload/peispersontime.vue new file mode 100644 index 0000000..61e0be8 --- /dev/null +++ b/src/views/workload/peispersontime.vue @@ -0,0 +1,438 @@ + + + \ No newline at end of file diff --git a/src/views/workload/registrar.vue b/src/views/workload/registrar.vue index efbbce0..21f3664 100644 --- a/src/views/workload/registrar.vue +++ b/src/views/workload/registrar.vue @@ -346,6 +346,7 @@ export default { that.tableData = [...res.data]; this.yAxisData = []; this.seriesData = []; + this.pieData=[] let pies = { name: "", value: 0, diff --git a/src/views/workload/summaryoftollcollectors.vue b/src/views/workload/summaryoftollcollectors.vue new file mode 100644 index 0000000..6fb682a --- /dev/null +++ b/src/views/workload/summaryoftollcollectors.vue @@ -0,0 +1,486 @@ + + + \ No newline at end of file diff --git a/src/views/workload/tollcollector.vue b/src/views/workload/tollcollector.vue index 9544ae2..d5d0b44 100644 --- a/src/views/workload/tollcollector.vue +++ b/src/views/workload/tollcollector.vue @@ -1,136 +1,1234 @@ \ No newline at end of file