From 45b297a5943cc7b68b03acde46ec317431402066 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 19 十月 2023 19:00:28 +0800
Subject: [PATCH] sjtj
---
src/assets/styles/element-ui.scss | 27 +++++++++
src/views/hosp/about/index.vue | 33 +++++++---
src/views/hosp/Summary/index.vue | 2
src/views/hosp/settlement/index.vue | 64 +++++++++------------
src/api/hosp/water.js | 9 +++
src/views/system/indrefund/index.vue | 2
6 files changed, 87 insertions(+), 50 deletions(-)
diff --git a/src/api/hosp/water.js b/src/api/hosp/water.js
index c632e58..63dbeb1 100644
--- a/src/api/hosp/water.js
+++ b/src/api/hosp/water.js
@@ -25,6 +25,15 @@
})
}
+
+// 鑾峰彇鏈�鍚庝竴娆＄粨璐︽椂闂�
+export function getNewDate() {
+ return request({
+ url: '/hosp/new/water/getNewDate',
+ method: 'get',
+ })
+}
+
// 鏌ヨ浣撴娴佹按璇︾粏
export function getWater(id) {
return request({
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index f654736..172d9c4 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -120,3 +120,30 @@
border-right: 1px solid #dfe6ec;
border-left: 1px solid #dfe6ec;
}
+.el-picker-panel__body-wrapper{
+ width: 260px;
+}
+
+.el-date-range-picker {
+ width: 510px;
+ height: 410px;
+}
+
+.el-date-range-picker.has-sidebar {
+ width: 580px;
+}
+.el-picker-panel *[slot=sidebar], .el-picker-panel__sidebar {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ width: 65px;
+ border-right: 1px solid #e4e4e4;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ padding-top: 6px;
+ background-color: #FFFFFF;
+ overflow: auto;
+}
+.el-picker-panel *[slot=sidebar] + .el-picker-panel__body, .el-picker-panel__sidebar + .el-picker-panel__body {
+ margin-left: 67px;
+}
diff --git a/src/views/hosp/Summary/index.vue b/src/views/hosp/Summary/index.vue
index 5274a62..6535666 100644
--- a/src/views/hosp/Summary/index.vue
+++ b/src/views/hosp/Summary/index.vue
@@ -2,7 +2,7 @@
<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-select v-model="queryParams.tollCollectorId" filterable style="width: 200px" placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
+ <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" />
</el-select>
diff --git a/src/views/hosp/about/index.vue b/src/views/hosp/about/index.vue
index 046b9b0..181961c 100644
--- a/src/views/hosp/about/index.vue
+++ b/src/views/hosp/about/index.vue
@@ -2,7 +2,7 @@
<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-select v-model="queryParams.tollCollectorName" filterable style="width: 200px" placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
+ <el-select v-model="queryParams.tollCollectorName" filterable style="width: 128px" placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
@clear="getCompanyList" @change="idFn">
<el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
</el-select>
@@ -19,11 +19,10 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button icon="el-icon-edit" size="mini" @click="handleDelete" >鎾ら攢</el-button>
+ <el-button icon="el-icon-edit" size="mini" @click="handleDelete">鎾ら攢</el-button>
</el-col>
<el-col :span="1.5">
- <el-button icon="el-icon-edit" size="mini" @click="handledocument"
- >琛ユ墦鍗曟嵁</el-button>
+ <el-button icon="el-icon-edit" size="mini" @click="handledocument">琛ユ墦鍗曟嵁</el-button>
</el-col>
</el-row>
@@ -57,7 +56,7 @@
</template>
<script>
-import { getcolllist, getdatalist, delById } from "@/api/hosp/water";
+import { getcolllist, getdatalist, delById, getNewDate } from "@/api/hosp/water";
import { getInfo } from "@/api/login";
import moment from "moment";
@@ -68,7 +67,7 @@
pickerOptions: {
shortcuts: [
{
- text: "鏈�杩戜竴鍛�",
+ text: "杩戜竴鍛�",
onClick(picker) {
const end = new Date();
const start = new Date();
@@ -77,7 +76,7 @@
},
},
{
- text: "鏈�杩戜竴涓湀",
+ text: "杩戜竴鏈�",
onClick(picker) {
const end = new Date();
const start = new Date();
@@ -86,7 +85,7 @@
},
},
{
- text: "鏈�杩戜笁涓湀",
+ text: "杩戜笁鏈�",
onClick(picker) {
const end = new Date();
const start = new Date();
@@ -121,6 +120,7 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ item: "",
userId: "",
// 寮瑰嚭灞傛爣棰�
title: "",
@@ -157,10 +157,20 @@
this.userId = response.user.userId;
this.queryParams.tollCollectorName = response.user.nickName;
});
+
+ getNewDate().then((response) => {
+ if (response.code === 200) {
+ this.value1 = [
+ moment(response.data).format("YYYY-MM-DD 00:00:00"),
+ moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+ ];
+ }
+ });
+
let data = {
tollCollectorId: this.tollCollectorId,
accountBeginTime: this.value1[0],
- accountEndTime: new Date(new Date().getTime() + 8 * 3600 * 1000)
+ accountEndTime: this.value1[1]
.toJSON()
.substr(0, 19)
.replace("T", " "),
@@ -259,7 +269,7 @@
},
handledocument() {
const viewNum = "809743614817824768";
- let accountId = this.selectList[0].accountId
+ let accountId = this.selectList[0].accountId
const params = { viewNum, accountId };
this.$tab.openPage("缁撹处鍗�", "/report/settlement", params);
},
@@ -311,4 +321,5 @@
.el-table .warning-row {
background: #e5f3ff !important;
-}</style>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/src/views/hosp/settlement/index.vue b/src/views/hosp/settlement/index.vue
index 92eda33..a24f39b 100644
--- a/src/views/hosp/settlement/index.vue
+++ b/src/views/hosp/settlement/index.vue
@@ -2,10 +2,12 @@
<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-input v-model="queryParams.tollCollectorName" placeholder="璇疯緭鍏ユ敹璐瑰憳" clearable @keyup.enter.native="handleQuery"
+ 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="['12:00:00']">
</el-date-picker>
</el-form-item>
</el-form>
@@ -15,10 +17,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 +33,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 +56,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,32 +124,25 @@
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")
+ ];
+ }
+ });
}
});
+
},
/** 缁熻 */
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)
diff --git a/src/views/system/indrefund/index.vue b/src/views/system/indrefund/index.vue
index 35423e5..27cf5b2 100644
--- a/src/views/system/indrefund/index.vue
+++ b/src/views/system/indrefund/index.vue
@@ -41,7 +41,7 @@
<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"
- v-if="queryParams.type == '1'">
+ v-if="queryParams.type == '4'">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handlerefund(scope.row)"
v-if="scope.row.remarks != '宸查��璐�'">閫�璐�</el-button>
--
Gitblit v1.8.0