From ad54cf427ee94e01e8c72a01f738615eb2b6569d Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 04 七月 2025 17:58:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/hosp/settlement/index.vue | 90 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/views/hosp/settlement/index.vue b/src/views/hosp/settlement/index.vue
index 92eda33..98f6372 100644
--- a/src/views/hosp/settlement/index.vue
+++ b/src/views/hosp/settlement/index.vue
@@ -1,13 +1,23 @@
<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="tollCollectorName">
- <el-input v-model="queryParams.tollCollectorName" placeholder="璇疯緭鍏ユ敹璐瑰憳" clearable @keyup.enter.native="handleQuery"/>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鏀惰垂鍛�" prop="tollCollectorName" style="display: flex;">
+ <el-input v-model="queryParams.tollCollectorName" placeholder="璇疯緭鍏ユ敹璐瑰憳" clearable @keyup.enter.native="handleQuery"
+ />
</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-col>
+ <el-col :span="15">
+ <el-form-item label="缁撹处鏃堕棿" prop="tollCollectorName" style="display: flex;">
+ <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-col>
+ </el-row>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -15,10 +25,11 @@
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleUpdate">缁熻</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-check" size="mini" @click="handlesettle" :disabled="discode === 200 ? true : false" >缁撹处</el-button>
+ <el-button type="primary" icon="el-icon-check" size="mini" @click="handlesettle"
+ :disabled="discode === 200 ? true : false">缁撹处</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" size="mini" @click="handleabout">鏃ョ粨鏌ヨ</el-button>
+ <el-button type="primary" size="mini" @click="handleabout">鏃ョ粨鏌ヨ</el-button>
</el-col>
</el-row>
@@ -30,25 +41,19 @@
<el-table-column label="瀹炴敹閲戦" align="center" prop="paidIn" width="90px" />
<el-table-column label="浠樻鐘舵��" align="center" prop="payStasus" width="100px" />
<el-table-column label="浠樻鏂瑰紡" align="center" prop="payType" width="100px" />
- <el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" width="140px"/>
- <el-table-column label="鏀惰垂鏃堕棿" align="center" prop="updateTime" width="180px"/>
+ <el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" width="140px" />
+ <el-table-column label="鏀惰垂鏃堕棿" align="center" prop="updateTime" width="180px" />
<el-table-column label="閫�璐规椂闂�" align="center" prop="refundTime" width="200px" />
</el-table>
<div class="pag">
- <div class="pag1">
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize" @pagination="handleUpdate" />
- </div>
- </div>
+ <div class="pag1">
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="handleUpdate" />
+ </div>
+ </div>
- <el-table
- border
- :data="allList"
- style="margin-top: 30px; width: 75%"
- :summary-method="getSummaries"
- show-summary
- >
+ <el-table border :data="allList" style="margin-top: 30px; width: 75%" :summary-method="getSummaries" show-summary>
<el-table-column label="浠樻鏂瑰紡" align="center" prop="paytpe" />
<el-table-column label="鏀惰垂閲戦" align="center" prop="vo.shoukuan">
</el-table-column>
@@ -59,7 +64,7 @@
</template>
<script>
-import { getLastTime, getList, collector } from "@/api/hosp/water";
+import { getLastTime, getList, collector, getNewDate } from "@/api/hosp/water";
import { getInfo } from "@/api/login";
import moment from "moment";
@@ -127,38 +132,33 @@
getLastTime().then((response) => {
if (response.code === 200) {
this.time = response.data;
- this.value1 = [
- moment(this.time).format("YYYY-MM-DD HH:mm:ss"),
- new Date(new Date().getTime() + 8 * 3600 * 1000)
- .toJSON()
- .substr(0, 19)
- .replace("T", " "),
- ];
- } else {
- this.time = response.msg;
- this.value1 = [
- this.time,
- new Date(new Date().getTime() + 8 * 3600 * 1000)
- .toJSON()
- .substr(0, 19)
- .replace("T", " "),
- ];
+ getNewDate().then((response) => {
+ if (response.code === 200) {
+ this.value1 = [
+ moment(this.time).format("YYYY-MM-DD HH:mm:ss"),
+ moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+ ];
+ }
+ });
}
});
+
+ },
+ // 鏃堕棿
+ dateChangebirthday1(val) {
+ this.value1 = val;
},
/** 缁熻 */
handleUpdate() {
this.loading = true;
+
let data = {
- pageNum:this.queryParams.pageNum,
- pageSize:this.queryParams.pageSize,
+ 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;
@@ -278,7 +278,7 @@
type: "success",
});
this.$forceUpdate();
- this.handleUpdate();
+ this.getList();
const accountId = res.msg;
const viewNum = "809743614817824768";
const params = { viewNum, accountId };
--
Gitblit v1.8.0