From 00212ed8e808fc7b76c04389224e65f27f074fb2 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期五, 26 四月 2024 15:30:04 +0800
Subject: [PATCH] su
---
src/views/hosp/Summary/index.vue | 378 +++++++++++++++--------------------------------------
1 files changed, 106 insertions(+), 272 deletions(-)
diff --git a/src/views/hosp/Summary/index.vue b/src/views/hosp/Summary/index.vue
index 70a8b03..99cc69b 100644
--- a/src/views/hosp/Summary/index.vue
+++ b/src/views/hosp/Summary/index.vue
@@ -1,190 +1,52 @@
<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="accountId">
- <el-input
- v-model="queryParams.accountId"
- placeholder="璇疯緭鍏ョ粨璐﹀崟鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="begTime">
- <el-date-picker
- v-model="begTime"
- type="date"
- placeholder="閫夋嫨璧峰鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鎴鏃堕棿" prop="endTime">
- <el-date-picker
- v-model="endTime"
- type="date"
- placeholder="閫夋嫨鎴鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鏀舵嵁璧峰鍙�" prop="deleted">
- <el-input
- v-model="queryParams.deleted"
- placeholder="璇疯緭鍏ユ敹鎹捣濮嬪彿"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <!-- <el-form-item label="鏀舵嵁缁堟鍙�" prop="deleted">
- <el-input
- v-model="queryParams.deleted"
- placeholder="璇疯緭鍏ユ敹鎹粓姝㈠彿"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item> -->
- <!-- <el-form-item label="宸ヤ綔閲�" prop="deleted">
- <el-input
- v-model="queryParams.deleted"
- placeholder="璇疯緭鍏ュ伐浣滈噺"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item> -->
- <!-- <el-form-item label="鍙戝崱璧峰鍙�" prop="deleted">
- <el-input
- v-model="queryParams.deleted"
- placeholder="璇疯緭鍏ュ彂鍗¤捣濮嬪彿"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item> -->
- <!-- <el-form-item label="鍙戝崱缁堟鍙�" prop="deleted">
- <el-input
- v-model="queryParams.deleted"
- placeholder="璇疯緭鍏ュ彂鍗＄粓姝㈠彿"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item> -->
- <el-form-item label="鎿嶄綔鍛�" prop="deleted">
- <el-input
- v-model="queryParams.deleted"
- placeholder="璇疯緭鍏ユ搷浣滃憳"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <!-- <el-form-item label="缁撹处鏃堕棿" prop="deleted">
- <el-date-picker
- v-model="value1"
- type="date"
- placeholder="閫夋嫨缁撹处鏃堕棿">
- </el-date-picker>
- </el-form-item> -->
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
+ <el-row>
+
+ <el-col :span="10">
+ <el-form-item label="璧峰鏃堕棿" prop="accountBeginTime" style="display: flex;">
+ <el-date-picker v-model="queryParams.accountBeginTime" type="datetime" placeholder="閫夋嫨璧峰鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="鎴鏃堕棿" prop="accountEndTime" style="display: flex;">
+ <el-date-picker v-model="queryParams.accountEndTime" type="datetime" placeholder="閫夋嫨鎴鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="姹囨�诲憳" prop="tollCollectorId" style="display: flex;">
+ <el-select v-model="queryParams.tollCollectorId" filterable placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
+ @clear="getCompanyList">
+ <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> -->
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['hosp:water:edit']"
- >姹囨��</el-button>
+ <el-button type="primary" size="mini" @click="handleUpdate">姹囨��</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['hosp:water:remove']"
- >鏌ヨ</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- size="mini"
- @click="handleExport"
- v-hasPermi="['hosp:water:export']"
- >鎵撳嵃</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- size="mini"
- @click="handleExport"
- v-hasPermi="['hosp:water:export']"
- >鎾ら攢缁撹处</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
-
- <el-table v-loading="loading" :data="list" border >
- <el-table-column type="selection" width="40" align="center" />
- <!-- <el-table-column label="搴忓彿" width="55" align="center" prop="id" /> -->
- <el-table-column label="姹囨�诲崟鍙�" align="center" prop="hzCard" :show-overflow-tooltip="true" />
- <el-table-column label="姹囨�讳汉" align="center" prop="hzName" :show-overflow-tooltip="true" />
- <el-table-column label="姹囨�讳簨浠�" align="center" prop="hzSj" :show-overflow-tooltip="true" />
- <el-table-column label="缁撹处鍗曞彿" align="center" prop="accountId" :show-overflow-tooltip="true" />
- <el-table-column label="璧峰鏃堕棿" align="center" prop="begTime" :show-overflow-tooltip="true" />
- <el-table-column label="缁撴潫鏃堕棿" align="center" prop="endTime" :show-overflow-tooltip="true" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- title="淇敼"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['hosp:water:edit']"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- title="鍒犻櫎"
- @click="handleDelete(scope.row)"
- v-hasPermi="['hosp:water:remove']"
- ></el-button>
- </template>
- </el-table-column>
+ <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="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>
-
- <el-table v-loading="loading" :data="tollCollectorDetails" style="margin-top:80px" border >
- <el-table-column type="selection" width="55" align="center" />
- <!-- <el-table-column label="搴忓彿" width="55" align="center" prop="id" /> -->
- <el-table-column label="鍗＄被鍨�" align="center" prop="cardType" :show-overflow-tooltip="true" />
- <el-table-column label="浜ゆ鏂瑰紡" align="center" prop="type" :show-overflow-tooltip="true" />
- <el-table-column label="绫诲瀷" align="center" prop="type" :show-overflow-tooltip="true" />
- <el-table-column label="鏁伴噺" align="center" prop="count" :show-overflow-tooltip="true" />
- <el-table-column label="浜ゆ槗閲戦" align="center" prop="jyPay" :show-overflow-tooltip="true" />
- <el-table-column label="鍗℃暟閲�" align="center" prop="count" :show-overflow-tooltip="true" />
- <el-table-column label="鍗￠噾棰�" align="center" prop="jyPay" :show-overflow-tooltip="true" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- title="淇敼"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['hosp:water:edit']"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- title="鍒犻櫎"
- @click="handleDelete(scope.row)"
- v-hasPermi="['hosp:water:remove']"
- ></el-button>
- </template>
- </el-table-column>
- </el-table>
-
<!-- <pagination
v-show="total>0"
:total="total"
@@ -192,48 +54,36 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/> -->
-
- <!-- 娣诲姞鎴栦慨鏀逛綋妫�娴佹按瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="搴斾粯" prop="copeWith">
- <el-input v-model="form.copeWith" placeholder="璇疯緭鍏ュ簲浠�" />
- </el-form-item>
- <el-form-item label="瀹炰粯" prop="paidIn">
- <el-input v-model="form.paidIn" placeholder="璇疯緭鍏ュ疄浠�" />
- </el-form-item>
- <el-form-item label="鎶樻墸" prop="discount">
- <el-input v-model="form.discount" placeholder="璇疯緭鍏ユ姌鎵�" />
- </el-form-item>
- <el-form-item label="浠樻鐘舵��" prop="payStasus">
- <el-input v-model="form.payStasus" placeholder="璇疯緭鍏ヤ粯娆剧姸鎬�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
</div>
</template>
<script>
-import { listWater, getWater, delWater, addWater, updateWater } 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",
data() {
+ let checkPhoneNum = (rule, value, callback) => {
+ console.log( value)
+ let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+ if (value == "" && value == undefined && !value) {
+ return callback('');
+ } else if(value != undefined && value != ""){
+ return callback();
+ }else if (!patter.test(value)) {
+ return callback('');
+ }
+ };
return {
- value1:"",
- begTime:"",
- endTime:"",
+ value1: "",
+ begTime: "",
+ endTime: "",
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
ids: [],
- // 闈炲崟涓鐢�
- single: true,
+ CompanyList: [],
// 闈炲涓鐢�
multiple: true,
// 鏄剧ず鎼滅储鏉′欢
@@ -242,7 +92,7 @@
total: 0,
// 浣撴娴佹按琛ㄦ牸鏁版嵁
list: [],
- tollCollectorDetails:[],
+ tollCollectorDetails: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -251,6 +101,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ tollCollectorId: null,
accountBeginTime: null,
accountEndTime: null,
},
@@ -259,31 +110,54 @@
// 琛ㄥ崟鏍￠獙
rules: {
createTime: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, validator: checkPhoneNum, trigger: "blur" }
],
updateTime: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, validator: checkPhoneNum, trigger: "blur" }
],
deleted: [
- { required: true, message: "鍒犻櫎鏍囪涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, validator: checkPhoneNum, trigger: "blur" }
]
}
};
},
created() {
+ this.getCompanyList()
this.getList();
},
methods: {
+ // 涓嬫媺妗嗘樉绀�
+ getCompanyList() {
+ this.loading = true;
+ 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")
+ }
+ });
+ },
/** 鏌ヨ浣撴娴佹按鍒楄〃 */
getList() {
this.loading = true;
- getHzList(this.queryParams).then(response => {
- this.list = response.data.list;
- this.list.forEach(item=>{
- this.tollCollectorDetails = item.tollCollectorDetails;
- })
- // this.tollCollectorDetails = response.data.list.tollCollectorDetails;
- this.total = response.total;
+ if (this.queryParams.accountBeginTime != null) {
+ this.queryParams.accountBeginTime = moment(this.queryParams.accountBeginTime).format("YYYY-MM-DD HH:mm:ss")
+ this.queryParams.accountEndTime = moment(this.queryParams.accountEndTime).format("YYYY-MM-DD HH:mm:ss")
+ }
+
+ getlistWater(this.queryParams).then(response => {
+ this.list = response.data;
this.loading = false;
});
},
@@ -321,64 +195,24 @@
this.resetForm("queryForm");
this.handleQuery();
},
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
+
+ handleSelect(selection, val) {
+ this.ids = []
+ selection.forEach(element => {
+ this.ids.push(element.id)
+ });
+ console.log(this.ids);//姝や紶閫掍釜浜虹粨璐﹀崟鍙锋湁閲嶅
},
- // /** 鏂板鎸夐挳鎿嶄綔 */
- // handleAdd() {
- // this.reset();
- // this.open = true;
- // this.title = "娣诲姞浣撴娴佹按";
- // },
+
/** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getWater(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼浣撴娴佹按";
+ handleUpdate() {
+ addTjSummary(this.ids).then(response => {
+ let accountId = response.msg
+ const viewNum = "872704875763019776";
+ const params = { viewNum, accountId };
+ this.$tab.openPage("姹囨�荤粨璐﹀崟", "/report/settlement", params);
});
},
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateWater(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addWater(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎浣撴娴佹按缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delWater(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('hosp/water/export', {
- ...this.queryParams
- }, `water_${new Date().getTime()}.xlsx`)
- }
}
};
</script>
\ No newline at end of file
--
Gitblit v1.8.0