From c75027743ea7c3ecc2d0885f01d11d2ad78679a3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 14:23:26 +0800
Subject: [PATCH] Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/statistics/chargeStatistics/index.vue | 186 +++++++++++++---------------------------------
1 files changed, 53 insertions(+), 133 deletions(-)
diff --git a/src/views/project/statistics/chargeStatistics/index.vue b/src/views/project/statistics/chargeStatistics/index.vue
index dedf037..9046ff8 100644
--- a/src/views/project/statistics/chargeStatistics/index.vue
+++ b/src/views/project/statistics/chargeStatistics/index.vue
@@ -1,46 +1,23 @@
<!-- -->
<template>
<div class="app-container">
- 缁╂晥
<el-form
+ class="opo-query-form"
:model="queryParams"
ref="queryForm"
:inline="true"
label-width="70px"
>
<el-row :gutter="8">
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="鍖婚櫌鍚嶇О">
- <el-select
- v-model="queryParams.pabonustype"
- placeholder="璇烽�夋嫨妗堜緥鐘舵��"
- >
- <el-option
- v-for="item in reportlist"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ <org-selecter
+ ref="orgSelecter"
+ :org-type="'4'"
+ v-model="queryParams.pahospitalno"
+ />
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="缁熻绫诲瀷">
- <el-select
- v-model="queryParams.pabonustype"
- placeholder="璇烽�夋嫨妗堜緥鐘舵��"
- >
- <el-option
- v-for="item in reportlist"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="8">
<el-col :span="12">
<el-form-item label="缁熻鏃ユ湡">
<el-date-picker
@@ -56,7 +33,8 @@
</el-date-picker>
</el-form-item>
</el-col>
-
+ </el-row>
+ <el-row :gutter="8">
<el-col :span="6">
<el-form-item>
<el-button
@@ -88,17 +66,15 @@
<el-table-column label="搴忓彿" align="center" prop="id" width="100">
</el-table-column>
- <el-table-column label="缁熻鏈堜唤" align="center" prop="name" />
-
- <el-table-column label="涓氬姟缁�" align="center" prop="name">
+ <el-table-column label="缁熻鏈堜唤" align="center" prop="receivemonth" />
+ <el-table-column label="鍖婚櫌鍚嶇О" align="center" prop="hospitalname">
</el-table-column>
- <el-table-column label="涓撹亴浜哄憳" align="center" prop="age" />
-
- <el-table-column
- label="閲戦"
- align="center"
- prop="amount"
- />
+ <el-table-column label="宸叉敹閲戦" align="center" prop="amount">
+ </el-table-column>
+ <el-table-column label="鏈敹閲戦" align="center" prop="nonpayment">
+ </el-table-column>
+ <el-table-column label="搴旀敹閲戦" align="center" prop="organcharge">
+ </el-table-column>
<el-table-column
label="鎿嶄綔"
@@ -113,20 +89,17 @@
size="mini"
type="text"
icon="el-icon-edit"
- @click="handleAdd(scope.row)"
- >鍖诲璇勪及</el-button
+ >璇存槑</el-button
>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <div style="margin: 10px;text-align: right;">
+ <div>
+ 鍏� <span style="color:#1890FF ;">{{ total }}</span> 鏉℃暟鎹�
+ </div>
+ </div>
<!-- 娣诲姞鎴栦慨鏀瑰灞炵‘璁ゅ璇濇 -->
</div>
@@ -169,9 +142,8 @@
selecttime: "",
reportervalue: "",
reportlist: [
- { label: "鏈堝害", value: "1" },
- { label: "瀛ｅ害", value: "2" },
- { label: "骞村害", value: "3" }
+ { label: "鏈敹娆�", value: "0" },
+ { label: "宸叉敹娆�", value: "1" }
],
//鐪佸競鍖�
//榛樿鍊艰缃紝鍙负绌�
@@ -235,10 +207,7 @@
// 鑾峰彇缁勭粐鍚嶇О鏃堕棿鑼冨洿
daterangeReporttime: [],
// 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10
- },
+ queryParams: {},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -266,61 +235,6 @@
watch: {},
//鏂规硶闆嗗悎
methods: {
- getTimeList(e) {
- if (this.selecttime != 0) {
- this.endtime = this.selecttime[1];
- this.starttime = this.selecttime[0];
- // if (this.endtime == this.starttime) {
- let num = Number(this.endtime.slice(5, 7));
- if (num < 9) {
- let mon = Number(this.endtime.slice(6, 7));
- this.endtime =
- this.endtime.slice(0, 5) +
- "0" +
- (mon + 1) +
- "-" +
- "01" +
- " " +
- "00" +
- ":" +
- "00" +
- ":" +
- "00";
- }
- // this.endtime=this.endtime.slice(0,5)骞�
- else if (num >= 10) {
- this.endtime =
- this.endtime.slice(0, 5) +
- (num + 1) +
- "-" +
- "01" +
- " " +
- "00" +
- ":" +
- "00" +
- ":" +
- "00";
- } else {
- this.endtime =
- this.endtime.slice(0, 5) +
- "10" +
- "-" +
- "01" +
- " " +
- "00" +
- ":" +
- "00" +
- ":" +
- "00";
- }
- this.starttime = this.starttime + " " + "00" + ":" + "00" + ":" + "00";
- // }
- } else {
- // this.starttime = "1998-01-01 00:00:00";
- // this.endtime = "2998-01-01 00:00:00";
- }
- },
-
resetArr(Arr) {
var hash = {};
Arr = Arr.reduce(function(arr, current) {
@@ -336,6 +250,10 @@
getList() {
listsfeistatistics(this.queryParams).then(res => {
this.jxidata = res.rows;
+ this.jxidata.forEach(($obj, $index) => {
+ $obj.id = $index + 1;
+ });
+ this.total = res.total;
});
},
@@ -354,26 +272,7 @@
this.reportervalue = "";
- this.form.treatmenthospitalno = "";
-
- this.queryParams = {
- doname: null,
- pageNum: 1,
- pageSize: 10,
- name: null,
- idcardno: null,
- residenceprovince: null,
- residencecity: null,
- residencetown: null,
- // "2"
- recordstate: null,
- treatmenthospitalname: null,
- donorno: null,
- acquisitiontissueno: null,
- reportername: null,
- reporttime: null,
- city: null
- };
+ this.queryParams = {};
this.selecttime = [];
this.getTimeList();
this.searchAddress = {
@@ -386,10 +285,31 @@
this.resetForm("queryForm");
this.handleQuery();
},
+ getTimeList(e) {
+ if (this.selecttime != 0) {
+ this.queryParams.pabegtime = this.selecttime[0];
+ this.queryParams.paendtime = this.selecttime[1];
+ // if (this.queryParams.paendtime == this.queryParams.pabegtime) {
+ // 缁撴潫鏃堕棿鍙�"鎵�閫夌粨鏉熸湀鐨勬鏈� 1 鍙�"锛屼互鍖呭惈鏁翠釜缁撴潫鏈堛��
+ // 鍘熷疄鐜版妸鏈堜唤 +1 鍚庣洿鎺ユ嫾瀛楃涓诧紝12 鏈堜細寰楀埌 13 鏈堬紙2026-13-01锛夛紝
+ // MySQL 鎶� Incorrect datetime value锛屽瓨鍌ㄨ繃绋嬬洿鎺� 500銆�
+ this.queryParams.paendtime = this.$moment(this.queryParams.paendtime)
+ .startOf("month")
+ .add(1, "month")
+ .format("YYYY-MM")
+ .concat("-01 00:00:00");
+ this.queryParams.pabegtime =
+ this.queryParams.pabegtime + " " + "00" + ":" + "00" + ":" + "00";
+ // }
+ } else {
+ // this.queryParams.pabegtime = "1998-01-01 00:00:00";
+ // this.queryParams.paendtime = "2998-01-01 00:00:00";
+ }
+ },
getSummaries(param) {
const { columns, data } = param;
const sums = [];
- var columnnames = ["applymonth", "deptmentName", "username"];
+ var columnnames = ["receivemonth", "hospitalname"];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = "鍚堣";
--
Gitblit v1.9.3