From e0c4ede7fdcacf281bd6b3303d625d87bd4e728c Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 20 十月 2023 18:08:54 +0800
Subject: [PATCH] hzymxg
---
vue.config.js | 1
src/views/hosp/about/index.vue | 76 +++++++++++-------------
src/views/hosp/Summary/index.vue | 41 ++++++++-----
src/views/system/examcharge/index.vue | 4
src/views/hosp/settlement/index.vue | 21 ++++--
src/api/hosp/water.js | 8 ++
src/views/hosp/Sumrecord/index.vue | 14 ++--
7 files changed, 90 insertions(+), 75 deletions(-)
diff --git a/src/api/hosp/water.js b/src/api/hosp/water.js
index 63dbeb1..f313ba0 100644
--- a/src/api/hosp/water.js
+++ b/src/api/hosp/water.js
@@ -148,4 +148,12 @@
method: 'delete',
params: data
})
+}
+
+// 鑾峰彇姹囨�绘椂闂磋捣濮嬫椂闂�
+export function getbigntime() {
+ return request({
+ url: '/hosp/summary/getLastTime',
+ method: 'get',
+ })
}
\ No newline at end of file
diff --git a/src/views/hosp/Summary/index.vue b/src/views/hosp/Summary/index.vue
index 6535666..09db6ef 100644
--- a/src/views/hosp/Summary/index.vue
+++ b/src/views/hosp/Summary/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
- <el-form-item label="鏀惰垂鍛�" prop="tollCollectorId">
+ <el-form-item label="姹囨�讳汉鍛�" prop="tollCollectorId">
<el-select v-model="queryParams.tollCollectorId" filterable style="width: 130px" placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
@clear="getCompanyList">
<el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
@@ -24,19 +24,18 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" size="mini" :disabled="single" @click="handleUpdate"
- >姹囨��</el-button>
+ <el-button type="primary" size="mini" @click="handleUpdate">姹囨��</el-button>
</el-col>
</el-row>
- <el-table style="width: 80%" :data="list" border max-height="720px" @selection-change="handleSelect">
+ <el-table style="width: 80%" :data="list" border max-height="720px" @selection-change="handleSelect">
<el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column label="浜ゆ鍛�" align="center" prop="tollCollector" :show-overflow-tooltip="true" />
+ <el-table-column label="姹囨�讳汉鍛�" align="center" prop="tollCollector" :show-overflow-tooltip="true" />
<el-table-column label="鏀惰垂閲戦" align="center" prop="amountReceived" :show-overflow-tooltip="true" />
<el-table-column label="閫�璐归噾棰�" align="center" prop="refundAmount" :show-overflow-tooltip="true" />
<el-table-column label="搴斾氦娆�" align="center" prop="payable" :show-overflow-tooltip="true" />
<el-table-column label="浜よ处鏃堕棿" align="center" prop="createTime" :show-overflow-tooltip="true" />
- <el-table-column label="璧锋鏃ユ湡" align="center" prop="accountBeginTime" :show-overflow-tooltip="true" />
- <el-table-column label="缁堟鏃ユ湡" align="center" prop="accountEndTime" :show-overflow-tooltip="true" />
+ <el-table-column label="璧峰鏃堕棿" align="center" prop="accountBeginTime" :show-overflow-tooltip="true" />
+ <el-table-column label="鎴鏃堕棿" align="center" prop="accountEndTime" :show-overflow-tooltip="true" />
</el-table>
<!-- <pagination
v-show="total>0"
@@ -49,8 +48,8 @@
</template>
<script>
-import { getlistWater, getWater, getdatalist, addTjSummary } from "@/api/hosp/water";
-import { getHzList, } from "@/api/hosp/Summary";
+import { getlistWater, getWater, getdatalist, addTjSummary, getNewDate,getbigntime } from "@/api/hosp/water";
+import { getInfo } from "@/api/login";
import moment from "moment";
export default {
name: "Water",
@@ -64,8 +63,6 @@
// 閫変腑鏁扮粍
ids: [],
CompanyList: [],
- // 闈炲崟涓鐢�
- single: true,
// 闈炲涓鐢�
multiple: true,
// 鏄剧ず鎼滅储鏉′欢
@@ -114,6 +111,20 @@
getdatalist().then((response) => {
this.CompanyList = response.data;
this.loading = false;
+ getInfo().then((response) => {
+ this.queryParams.tollCollectorId = response.user.userId;
+ });
+ });
+ getNewDate().then((response) => {
+ if (response.code === 200) {
+ this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+ }
+ });
+ getbigntime().then((response) => {
+ if (response.code === 200) {
+ this.queryParams.accountBeginTime =
+ moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+ }
});
},
/** 鏌ヨ浣撴娴佹按鍒楄〃 */
@@ -165,15 +176,11 @@
},
handleSelect(selection, val) {
- if (selection.length > 1) {
- this.single = false
- } else {
- this.single = true
- }
+ this.ids = []
selection.forEach(element => {
this.ids.push(element.id)
});
-
+ console.log(this.ids);//姝や紶閫掍釜浜虹粨璐﹀崟鍙锋湁閲嶅
},
/** 淇敼鎸夐挳鎿嶄綔 */
diff --git a/src/views/hosp/Sumrecord/index.vue b/src/views/hosp/Sumrecord/index.vue
index e1aad4e..9ed1e52 100644
--- a/src/views/hosp/Sumrecord/index.vue
+++ b/src/views/hosp/Sumrecord/index.vue
@@ -66,14 +66,14 @@
<div style="margin: 10px 20px;">
- <el-table style="width: 86%" :data="collectorList" ref="multipleTable" border max-height="700px">
- <el-table-column label="浜ゆ鍛�" align="center" prop="tollCollector" width="120" />
- <el-table-column label="鏀惰垂閲戦" align="center" prop="amountReceived" width="120" />
- <el-table-column label="閫�璐归噾棰�" align="center" prop="refundAmount" width="120" />
- <el-table-column label="搴斾氦娆�" align="center" prop="payable" width="120"/>
+ <el-table style="width: 94%" :data="collectorList" ref="multipleTable" border max-height="700px">
+ <el-table-column label="浜ゆ鍛�" align="center" prop="tollCollector" width="90" />
+ <el-table-column label="鏀惰垂閲戦" align="center" prop="amountReceived" width="90" />
+ <el-table-column label="閫�璐归噾棰�" align="center" prop="refundAmount" width="90" />
+ <el-table-column label="搴斾氦娆�" align="center" prop="payable" width="90"/>
<el-table-column label="浜よ处鏃堕棿" align="center" prop="createTime" />
- <el-table-column label="璧锋鏃ユ湡" align="center" prop="accountBeginTime" />
- <el-table-column label="缁堟鏃ユ湡" align="center" prop="accountEndTime" />
+ <el-table-column label="璧峰鏃堕棿" align="center" prop="accountBeginTime" />
+ <el-table-column label="鎴鏃堕棿" align="center" prop="accountEndTime" />
</el-table>
</div>
diff --git a/src/views/hosp/about/index.vue b/src/views/hosp/about/index.vue
index 181961c..261476c 100644
--- a/src/views/hosp/about/index.vue
+++ b/src/views/hosp/about/index.vue
@@ -34,8 +34,8 @@
<el-table-column label="閫�璐归噾棰�" align="center" prop="refundAmount" :show-overflow-tooltip="true" />
<el-table-column label="搴斾氦娆�" align="center" prop="payable" :show-overflow-tooltip="true" />
<el-table-column label="浜よ处鏃堕棿" align="center" prop="createTime" :show-overflow-tooltip="true" />
- <el-table-column label="璧锋鏃ユ湡" align="center" prop="accountBeginTime" :show-overflow-tooltip="true" />
- <el-table-column label="缁堟鏃ユ湡" align="center" prop="accountEndTime" :show-overflow-tooltip="true" />
+ <el-table-column label="璧锋鏃堕棿" align="center" prop="accountBeginTime" :show-overflow-tooltip="true" />
+ <el-table-column label="鎴鏃堕棿" align="center" prop="accountEndTime" :show-overflow-tooltip="true" />
</el-table>
<div class="pag">
@@ -167,42 +167,39 @@
}
});
- let data = {
- tollCollectorId: this.tollCollectorId,
- accountBeginTime: this.value1[0],
- accountEndTime: this.value1[1]
- .toJSON()
- .substr(0, 19)
- .replace("T", " "),
- pageNum: this.queryParams.pageNum,
- pageSize: this.queryParams.pageSize,
- };
- getcolllist(data).then((res) => {
- this.tableData = res.data.list;
- if (this.tableData.length === 0) {
- this.$message({
- message: '璇锋悳绱㈣鎾ら攢鏁版嵁鐨勬椂闂存鍝',
- type: 'warning'
- });
- }
- if (res.code === 200) {
- if (this.tableData.length != 0) {
- this.$nextTick(() => {
- this.$refs.multipleTable.toggleRowSelection(
- this.tableData[0],
- true
- );
- });
- } else {
- this.$refs.multipleTable.clearSelection();
- }
- }
+ // let data = {
+ // tollCollectorId: this.tollCollectorId,
+ // accountBeginTime: this.value1[0],
+ // accountEndTime: this.value1[1],
+ // pageNum: this.queryParams.pageNum,
+ // pageSize: this.queryParams.pageSize,
+ // };
+ // getcolllist(data).then((res) => {
+ // this.tableData = res.data.list;
+ // if (this.tableData.length === 0) {
+ // this.$message({
+ // message: '璇锋悳绱㈣鎾ら攢鏁版嵁鐨勬椂闂存鍝',
+ // type: 'warning'
+ // });
+ // }
+ // if (res.code === 200) {
+ // if (this.tableData.length != 0) {
+ // this.$nextTick(() => {
+ // this.$refs.multipleTable.toggleRowSelection(
+ // this.tableData[0],
+ // true
+ // );
+ // });
+ // } else {
+ // this.$refs.multipleTable.clearSelection();
+ // }
+ // }
- // this.tableData.forEach(item => {
- // this.allList = item.tjTollCollectorDetailList
- // })
- this.total = res.data.total;
- });
+ // // this.tableData.forEach(item => {
+ // // this.allList = item.tjTollCollectorDetailList
+ // // })
+ // this.total = res.data.total;
+ // });
},
// 閫変腑涓嬫媺妗咺d
idFn(value) {
@@ -222,10 +219,7 @@
let data = {
tollCollectorId: this.tollCollectorId,
accountBeginTime: this.value1[0],
- accountEndTime: new Date(new Date().getTime() + 8 * 3600 * 1000)
- .toJSON()
- .substr(0, 19)
- .replace("T", " "),
+ accountEndTime:this.value1[1],
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
};
diff --git a/src/views/hosp/settlement/index.vue b/src/views/hosp/settlement/index.vue
index a24f39b..f917347 100644
--- a/src/views/hosp/settlement/index.vue
+++ b/src/views/hosp/settlement/index.vue
@@ -6,8 +6,10 @@
style="width: 120px;" />
</el-form-item>
<el-form-item label="缁撹处鏃堕棿" prop="tollCollectorName">
- <el-date-picker v-model="value1" type="datetimerange" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡"
- :default-time="['12:00:00']">
+ <el-date-picker v-model="value1" type="datetimerange" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ @change="dateChangebirthday1">
</el-date-picker>
</el-form-item>
</el-form>
@@ -136,19 +138,22 @@
});
},
+ // 鏃堕棿
+ dateChangebirthday1(val) {
+ this.value1 = val;
+ console.log(this.value1)
+ },
/** 缁熻 */
handleUpdate() {
this.loading = true;
+
let data = {
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
userId: this.userId.toString(),
- beginTime: moment(this.time).format("YYYY-MM-DD HH:mm:ss"),
- endTime: new Date(new Date().getTime() + 8 * 3600 * 1000)
- .toJSON()
- .substr(0, 19)
- .replace("T", " "),
+ beginTime: this.value1[0],
+ endTime: this.value1[1]
};
getList(data).then((res) => {
this.dataList = res.data.list;
@@ -268,7 +273,7 @@
type: "success",
});
this.$forceUpdate();
- this.handleUpdate();
+ this.getList();
const accountId = res.msg;
const viewNum = "809743614817824768";
const params = { viewNum, accountId };
diff --git a/src/views/system/examcharge/index.vue b/src/views/system/examcharge/index.vue
index 65316f4..16bfeb9 100644
--- a/src/views/system/examcharge/index.vue
+++ b/src/views/system/examcharge/index.vue
@@ -163,8 +163,8 @@
</template>
</el-table-column>
<el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" width="100px" />
- <el-table-column label="鏀堕��鏃堕棿" align="center" prop="updateTime" />
- <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding " width="100px"
+ <el-table-column label="鏀堕��鏃堕棿" align="center" prop="updateTime" width="160px" />
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding " width="80px"
v-if="queryParams.type == '1'">
<template slot-scope="scope">
<!-- <el-button size="mini" type="text" @click="handlerefund(scope.row)"
diff --git a/vue.config.js b/vue.config.js
index 53e4b1c..9718ca7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,6 +35,7 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
+ //target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
target: `http://192.168.0.101:5011`,
// target: `http://192.168.0.99:8080/ltkj-admin`,
changeOrigin: true,
--
Gitblit v1.8.0