From ba9dbeee7c139c67d770afe0053f06f1f235e565 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期二, 17 十月 2023 10:56:35 +0800
Subject: [PATCH] qxtj
---
src/views/tool/build/index.vue | 8
src/api/system/user.js | 10
public/index.html | 2
src/views/system/dept/index.vue | 11
src/api/system/examcharge.js | 9
src/assets/styles/element-ui.scss | 4
src/views/hosp/about/index.vue | 70 ++-
src/views/hosp/hosp/index.vue | 6
src/views/hosp/Summary/index.vue | 326 ++++----------------
src/views/system/examcharge/index.vue | 61 ++-
src/views/hosp/settlement/index.vue | 53 --
src/api/hosp/water.js | 36 ++
src/views/system/user/index.vue | 24 +
src/views/login.vue | 18
src/layout/components/Sidebar/Logo.vue | 1
src/views/system/invoice/index.vue | 1
src/views/hosp/Sumrecord/index.vue | 269 ++++++++++++++++
17 files changed, 529 insertions(+), 380 deletions(-)
diff --git a/public/index.html b/public/index.html
index 925455c..4eb7b43 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
- <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+ <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
<title><%= webpackConfig.name %></title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
diff --git a/src/api/hosp/water.js b/src/api/hosp/water.js
index d9e9c88..c632e58 100644
--- a/src/api/hosp/water.js
+++ b/src/api/hosp/water.js
@@ -103,4 +103,40 @@
method: 'delete',
params: data
})
+}
+
+
+// 鏌ヨ鏀惰垂鍛樻棩缁撴湭姹囨�诲崟鎹俊鎭�
+export function getlistWater(query) {
+ return request({
+ url: '/hosp/summary/list',
+ method: 'get',
+ params: query
+ })
+}
+
+export function addTjSummary(data) {
+ return request({
+ url: '/hosp/summary/addTjSummary',
+ method: 'post',
+ data:data
+ })
+}
+
+// 鏌ヨ姹囨�诲崟鎹俊鎭帴鍙�
+export function getTjSummaryList(query) {
+ return request({
+ url:'/hosp/summary/getTjSummaryList',
+ method: 'get',
+ params: query
+ })
+}
+
+// 姹囨�诲憳鎾ら攢 姹囨�昏处鍗� 鎺ュ彛
+export function removeTjSummaryById(data) {
+ return request({
+ url: '/hosp/summary/removeTjSummaryById',
+ method: 'delete',
+ params: data
+ })
}
\ No newline at end of file
diff --git a/src/api/system/examcharge.js b/src/api/system/examcharge.js
index 44c2c6f..66639b1 100644
--- a/src/api/system/examcharge.js
+++ b/src/api/system/examcharge.js
@@ -34,4 +34,13 @@
method: 'post',
data
})
+}
+
+
+// 鑾峰彇浣撴璐圭敤
+export function getPrintSetUp() {
+ return request({
+ url: '/hosp/summary/getPrintSetUp',
+ method: 'get',
+ })
}
\ No newline at end of file
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 41d0b06..bd8060e 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -144,3 +144,13 @@
method: 'get'
})
}
+
+
+// 鏌ヨ鐢ㄦ埛鍒楄〃
+export function getDeptListByDictHospId(query) {
+ return request({
+ url: '/hosp/hosp/getDeptListByDictHospId',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 1d76c7c..f654736 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -116,3 +116,7 @@
display: table-cell !important;
}
+ .el-table__cell {
+ border-right: 1px solid #dfe6ec;
+ border-left: 1px solid #dfe6ec;
+}
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index acef816..23d514d 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -4,6 +4,7 @@
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+ <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
diff --git a/src/views/hosp/Summary/index.vue b/src/views/hosp/Summary/index.vue
index 70a8b03..cd7b064 100644
--- a/src/views/hosp/Summary/index.vue
+++ b/src/views/hosp/Summary/index.vue
@@ -1,83 +1,21 @@
<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 label="鏀惰垂鍛�" prop="tollCollectorId">
+ <el-select v-model="queryParams.tollCollectorId" filterable style="width: 200px" 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-form-item label="璧峰鏃堕棿" prop="begTime">
- <el-date-picker
- v-model="begTime"
- type="date"
- placeholder="閫夋嫨璧峰鏃堕棿">
- </el-date-picker>
+ <el-form-item label="璧峰鏃堕棿" prop="accountBeginTime">
+ <el-date-picker v-model="queryParams.accountBeginTime" type="datetime" 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 label="鎴鏃堕棿" prop="accountEndTime">
+ <el-date-picker v-model="queryParams.accountEndTime" type="datetime" 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>
@@ -86,105 +24,20 @@
<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" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['hosp:water:edit']">姹囨��</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,46 +45,25 @@
: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 } from "@/api/hosp/water";
+import { getHzList, } from "@/api/hosp/Summary";
+import moment from "moment";
export default {
name: "Water",
data() {
return {
- value1:"",
- begTime:"",
- endTime:"",
+ value1: "",
+ begTime: "",
+ endTime: "",
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
ids: [],
+ CompanyList: [],
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -242,7 +74,7 @@
total: 0,
// 浣撴娴佹按琛ㄦ牸鏁版嵁
list: [],
- tollCollectorDetails:[],
+ tollCollectorDetails: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -251,6 +83,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ tollCollectorId: null,
accountBeginTime: null,
accountEndTime: null,
},
@@ -271,19 +104,28 @@
};
},
created() {
+ this.getCompanyList()
this.getList();
},
methods: {
+ // 涓嬫媺妗嗘樉绀�
+ getCompanyList() {
+ this.loading = true;
+ getdatalist().then((response) => {
+ this.CompanyList = response.data;
+ this.loading = false;
+ });
+ },
/** 鏌ヨ浣撴娴佹按鍒楄〃 */
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 +163,28 @@
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) {
+ if (selection.length > 1) {
+ this.single = false
+ } else {
+ this.single = true
+ }
+ selection.forEach(element => {
+ this.ids.push(element.id)
+ });
+
},
- // /** 鏂板鎸夐挳鎿嶄綔 */
- // 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
diff --git a/src/views/hosp/Sumrecord/index.vue b/src/views/hosp/Sumrecord/index.vue
new file mode 100644
index 0000000..e42649c
--- /dev/null
+++ b/src/views/hosp/Sumrecord/index.vue
@@ -0,0 +1,269 @@
+<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-select v-model="queryParams.tollCollectorId" filterable style="width: 200px" 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-form-item label="璧峰鏃堕棿" prop="accountBeginTime">
+ <el-date-picker v-model="queryParams.accountBeginTime" type="datetime" placeholder="閫夋嫨璧峰鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鎴鏃堕棿" prop="accountEndTime">
+ <el-date-picker v-model="queryParams.accountEndTime" type="datetime" 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-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button icon="el-icon-edit" size="mini" @click="handleDelete"
+ v-hasPermi="['hosp:water:edit']" :disabled="single">鎾ら攢</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button icon="el-icon-edit" size="mini" @click="handledocument"
+ v-hasPermi="['hosp:water:edit']" :disabled="single">琛ユ墦鍗曟嵁</el-button>
+ </el-col>
+ </el-row>
+
+ <el-table v-loading="loading" :data="tableData" @selection-change="handleSelect" ref="multipleTable" 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="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" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-s-order" title="璇︽儏" @click="handleUpdate(scope.row)"
+ v-hasPermi="['hosp:water:edit']"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+
+ <div class="pag">
+ <div class="pag1">
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize" @pagination="getList" />
+ </div>
+ </div>
+
+ <el-drawer :title="title" :visible.sync="drawer" size="60%">
+ <div style="margin: 10px 20px;display: flex;">
+ <div>姹囨�讳汉:{{ formIn.hzName }}</div>
+ <div style="margin: 0px 20px;display: flex;">姹囨�婚噾棰�:{{ formIn.amountReceived }}鍏�</div>
+ <div>姹囨�绘椂闂�:{{ formIn.updateTime }}</div>
+ </div>
+
+
+ <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-column label="浜よ处鏃堕棿" align="center" prop="createTime" />
+ <el-table-column label="璧锋鏃ユ湡" align="center" prop="accountBeginTime" />
+ <el-table-column label="缁堟鏃ユ湡" align="center" prop="accountEndTime" />
+ </el-table>
+
+ </div>
+
+ </el-drawer>
+
+ </div>
+</template>
+
+<script>
+import { getTjSummaryList, getdatalist, removeTjSummaryById } from "@/api/hosp/water";
+import { getInfo } from "@/api/login";
+import moment from "moment";
+
+export default {
+ name: "Water",
+ data() {
+ return {
+ pickerOptions: {
+ shortcuts: [
+ {
+ text: "鏈�杩戜竴鍛�",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜竴涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜笁涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ ],
+ },
+ // 閬僵灞�
+ drawer: false,
+ loading: true,
+ tableData: [],
+ selectList: [],
+ allList: [],
+ disabled: true,
+ value1: [],
+ CompanyList: [],
+ collectorList: [],
+ time: "",
+ id: "",
+ title: "",
+ tollCollectorId: "",
+ // 闈炲崟涓鐢�
+ single: true,
+ formIn: {},
+ closeList: 0,
+ tollCollectorId: "",
+ machiningTimeList: 0,
+ debugTimeList: 0,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ userId: "",
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ accountId:"",
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ tollCollectorId: null,
+ accountBeginTime: null,
+ accountEndTime: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ };
+ },
+ created() {
+ this.getList();
+ this.getCompanyList();
+
+ },
+ methods: {
+ // 涓嬫媺妗嗘樉绀�
+ getCompanyList() {
+ this.loading = true;
+ getdatalist().then((response) => {
+ this.CompanyList = response.data;
+ this.loading = false;
+ });
+ },
+ /** 鏌ヨ浣撴娴佹按鍒楄〃 */
+ getList() {
+ 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")
+ }
+ getTjSummaryList(this.queryParams).then((res) => {
+ this.tableData = res.data;
+
+ });
+ },
+
+
+ // 鎼滅储
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ handleUpdate(row) {
+ this.formIn = row
+ this.collectorList = row.collectorList
+ this.drawer = true
+ this.title = "姹囨�诲崟鎹槑缁�"
+ },
+
+ handledocument() {
+ let accountId = this.accountId
+ const viewNum = "872704875763019776";
+ const params = { viewNum, accountId };
+ this.$tab.openPage("姹囨�荤粨璐﹀崟", "/report/settlement", params);
+ },
+
+ // 琛ㄦ牸鍗曢��
+ handleSelect(selection, val) {
+ this.single = selection.length!==1
+ selection.forEach(element => {
+ this.accountId = element.hzCard
+ this.id = element.id
+ this.tollCollectorId = element.hzUserId
+ });
+ },
+
+ handleDelete() {
+ let data = {
+ id: this.id,
+ tollCollectorId: this.tollCollectorId,
+ };
+ removeTjSummaryById(data).then((res) => {
+ this.$message({
+ showClose: true,
+ message: "璇ヨ处鍗曞凡鎴愬姛鎾ら攢",
+ type: "success",
+ });
+ this.getList();
+ });
+ },
+ },
+};
+</script>
+
+<style>
+.el-table__header-wrapper .el-checkbox {
+ display: none;
+}
+
+.pag {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+}
+
+.pag1 {
+ width: 30%;
+}
+
+.el-table__body tr.current-row>td {
+ background-color: #f19944 !important;
+ /* color: #f19944; */
+ /* 璁剧疆鏂囧瓧棰滆壊锛屽彲浠ラ�夋嫨涓嶈缃� */
+}
+
+.el-table .warning-row {
+ background: #e5f3ff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/hosp/about/index.vue b/src/views/hosp/about/index.vue
index 372a3ec..8319401 100644
--- a/src/views/hosp/about/index.vue
+++ b/src/views/hosp/about/index.vue
@@ -2,16 +2,18 @@
<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 @clear="getCompanyList" @change="idFn">
- <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId"/>
+ <el-select v-model="queryParams.tollCollectorName" filterable style="width: 200px" placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
+ @clear="getCompanyList" @change="idFn">
+ <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
</el-select>
</el-form-item>
<el-form-item label="浜よ处鏃堕棿" prop="tollCollectorName">
- <el-date-picker v-model="value1" type="datetimerange" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡" :default-time="['12:00:00']">
+ <el-date-picker v-model="value1" type="datetimerange" :picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡" :default-time="['12:00:00']">
</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 type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
</el-form-item>
</el-form>
@@ -19,27 +21,28 @@
<el-col :span="1.5">
<el-button icon="el-icon-edit" size="mini" @click="handleDelete" v-hasPermi="['hosp:water:edit']">鎾ら攢</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button icon="el-icon-edit" size="mini" @click="handledocument"
+ v-hasPermi="['hosp:water:edit']">琛ユ墦鍗曟嵁</el-button>
+ </el-col>
</el-row>
- <el-table :row-class-name="tableRowClassName" style="width: 80%" :data="tableData" @selection-change="handleSelect" ref="multipleTable" border>
+ <el-table :row-class-name="tableRowClassName" style="width: 80%" :data="tableData" @selection-change="handleSelect"
+ ref="multipleTable" border>
<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-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-s-order" title="璇︽儏" @click="handleUpdate(scope.row)" v-hasPermi="['hosp:water:edit']"></el-button>
- </template>
- </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>
<div class="pag">
<div class="pag1">
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
</div>
</div>
@@ -145,7 +148,7 @@
created() {
this.getList();
this.getCompanyList();
-
+
},
methods: {
/** 鏌ヨ浣撴娴佹按鍒楄〃 */
@@ -166,11 +169,11 @@
};
getcolllist(data).then((res) => {
this.tableData = res.data.list;
- if(this.tableData.length === 0){
+ if (this.tableData.length === 0) {
this.$message({
- message: '璇锋悳绱㈣鎾ら攢鏁版嵁鐨勬椂闂存鍝',
- type: 'warning'
- });
+ message: '璇锋悳绱㈣鎾ら攢鏁版嵁鐨勬椂闂存鍝',
+ type: 'warning'
+ });
}
if (res.code === 200) {
if (this.tableData.length != 0) {
@@ -238,7 +241,7 @@
this.total = res.data.total;
});
},
- handleUpdate() {},
+ handleUpdate() { },
// 琛ㄦ牸鍗曢��
handleSelect(selection, val) {
@@ -253,6 +256,12 @@
let del_row = selection.shift();
this.$refs.multipleTable.toggleRowSelection(del_row, false);
}
+ },
+ handledocument() {
+ const viewNum = "809743614817824768";
+ let accountId = this.selectList[0].accountId
+ const params = { viewNum, accountId };
+ this.$tab.openPage("缁撹处鍗�", "/report/settlement", params);
},
tableRowClassName({ row, rowIndex }) {
for (let i = 0; i < this.selectList.length; i++) {
@@ -278,11 +287,12 @@
},
};
</script>
-
+
<style>
.el-table__header-wrapper .el-checkbox {
display: none;
}
+
.pag {
width: 100%;
display: flex;
@@ -292,11 +302,13 @@
.pag1 {
width: 30%;
}
-.el-table__body tr.current-row > td {
+
+.el-table__body tr.current-row>td {
background-color: #f19944 !important;
- /* color: #f19944; */ /* 璁剧疆鏂囧瓧棰滆壊锛屽彲浠ラ�夋嫨涓嶈缃� */
+ /* color: #f19944; */
+ /* 璁剧疆鏂囧瓧棰滆壊锛屽彲浠ラ�夋嫨涓嶈缃� */
}
+
.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/hosp/index.vue b/src/views/hosp/hosp/index.vue
index 2f33b08..9f51616 100644
--- a/src/views/hosp/hosp/index.vue
+++ b/src/views/hosp/hosp/index.vue
@@ -361,9 +361,9 @@
hospid: [
{ required: true, message: "鍖荤枟鏈烘瀯ID涓嶈兘涓虹┖", trigger: "blur" },
],
- hospName: [
- { required: true, message: "鍖荤枟鏈烘瀯鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
- ],
+ // hospName: [
+ // { required: true, message: "鍖荤枟鏈烘瀯鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ // ],
code: [
{ required: true, message: "闄㈠尯缂栫爜涓嶈兘涓虹┖", trigger: "blur" },
],
diff --git a/src/views/hosp/settlement/index.vue b/src/views/hosp/settlement/index.vue
index cd816af..342fdd4 100644
--- a/src/views/hosp/settlement/index.vue
+++ b/src/views/hosp/settlement/index.vue
@@ -23,16 +23,16 @@
</el-row>
<el-table :data="dataList" border style="width: 75%">
- <el-table-column label="濮撳悕" align="center" prop="cusName" width="140px" :show-overflow-tooltip="true"/>
- <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="149px" :show-overflow-tooltip="true"/>
- <el-table-column label="搴旀敹閲戦" align="center" prop="copeWith" width="90px" :show-overflow-tooltip="true"/>
- <el-table-column label="鎶樻墸" align="center" prop="discount" width="90px" :show-overflow-tooltip="true"/>
- <el-table-column label="瀹炴敹閲戦" align="center" prop="paidIn" width="90px" :show-overflow-tooltip="true"/>
- <el-table-column label="浠樻鐘舵��" align="center" prop="payStasus" width="100px" :show-overflow-tooltip="true"/>
- <el-table-column label="浠樻鏂瑰紡" align="center" prop="payType" width="100px" :show-overflow-tooltip="true"/>
- <el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" width="140px" :show-overflow-tooltip="true"/>
- <el-table-column label="鏀惰垂鏃堕棿" align="center" prop="updateTime" width="180px" :show-overflow-tooltip="true"/>
- <el-table-column label="閫�璐规椂闂�" align="center" prop="refundTime" width="180px" :show-overflow-tooltip="true"/>
+ <el-table-column label="濮撳悕" align="center" prop="cusName" width="91px" />
+ <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="186px" />
+ <el-table-column label="搴旀敹閲戦" align="center" prop="copeWith" width="90px" />
+ <el-table-column label="鎶樻墸" align="center" prop="discount" width="90px" />
+ <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="refundTime" width="200px" />
</el-table>
<div class="pag">
@@ -145,39 +145,6 @@
];
}
});
-
- // listWater(this.queryParams).then(response => {
- // this.waterList = response.rows;
- // for (let i = 0; i < response.rows.length; i++) {
- // response.rows[i].nweID = i + 1;
- // }
- // this.total = response.total;
- // this.loading = false;
- // });
- // getDaily().then(res => {
- // this.tableData = res.data.list
- // this.tableData.forEach(item => {
- // if (item.payStasus == "0") {
- // item.payStasus = "鏈粯娆�"
- // } else if (item.payStasus == "1") {
- // item.payStasus = "宸蹭粯娆�"
- // } else {
- // item.payStasus = "閫�璐�"
- // }
- // if (item.payType == "0") {
- // item.payType = "鐜伴噾"
- // } else if (item.payType == "1") {
- // item.payType = "鍒峰崱"
- // } else if (item.payType == "2") {
- // item.payType = "鏀粯瀹�"
- // } else if (item.payType == "3") {
- // item.payType = "寰俊"
- // } else {
- // item.payType = "浜戦棯浠�"
- // }
- // })
- // this.loading = false;
- // })
},
/** 缁熻 */
diff --git a/src/views/login.vue b/src/views/login.vue
index 0e7e3c4..1699487 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,6 +1,10 @@
<template>
<div class="login">
- <h1>鏅鸿兘鍋ュ悍浣撴绠＄悊绯荤粺</h1>
+ <!-- <div style="padding-top: 130px;"> -->
+ <h2>鍏村钩鍏村寲绀惧尯鏈嶅姟绔�</h2>
+ <h1>鏅鸿兘鍋ュ悍浣撴绠＄悊绯荤粺</h1>
+ <!-- </div> -->
+
<el-form :inline="true" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<div class="img">
@@ -61,7 +65,7 @@
</template>
<script>
-import { getCodeImg ,getconfigKey} from "@/api/login";
+import { getCodeImg, getconfigKey } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
@@ -97,7 +101,7 @@
openeye: require('../assets/images/by.png'),
flag: false,
loading: false,
- configKey:"captcha_switch",
+ configKey: "captcha_switch",
// // 楠岃瘉鐮佸紑鍏�
captchaEnabled: true,
// 娉ㄥ唽寮�鍏�
@@ -134,18 +138,18 @@
this.getCookie();
},
methods: {
- getstate(){
+ getstate() {
getconfigKey().then(res => {
- if(res.msg == "Y"){
+ if (res.msg == "Y") {
this.captchaEnabled = true
this.getCode();
- }else if(res.msg == "N"){
+ } else if (res.msg == "N") {
this.captchaEnabled = false
}
})
},
-
+
hide() {
this.loginForm.username = "10001";
this.loginForm.password = "admin123";
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 327d5e5..9718538 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -40,7 +40,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table width="60%" v-if="refreshTable" v-loading="loading" :data="deptList" border row-key="deptId"
- :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" max-height="720px">
<!-- <el-table-column fixed="left" width="55px" label="搴忓彿" align="center" prop="nweID" /> -->
<el-table-column label="绉戝鍚嶇О" align="center" prop="deptName" width="120px" fixed="left"
:show-overflow-tooltip="true" />
@@ -90,8 +90,8 @@
<el-form-item label="鏄剧ず椤哄簭" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ樉绀洪『搴�" />
</el-form-item>
- <el-form-item label="鎵�鍦ㄥ垎闄�" prop="hospName">
- <el-select v-model="form.hospName" placeholder="璇烽�夋嫨鎵�鍦ㄥ垎闄�" clearable filterable style="width: 200px">
+ <el-form-item label="鎵�灞炲尰闄�" prop="hospName">
+ <el-select v-model="form.hospName" placeholder="璇烽�夋嫨鎵�灞炲尰闄�" clearable filterable style="width: 200px">
<el-option v-for="dict in hospList" :key="dict.hospAreaName" :label="dict.hospAreaName"
:value="dict.hospAreaName" />
</el-select>
@@ -474,6 +474,11 @@
this.getList();
});
} else {
+ this.hospList.forEach(element => {
+ if(this.form.hospName == element.hospAreaName){
+ this.form.hospId = element.hospAreaId
+ }
+ });
addDept(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
diff --git a/src/views/system/examcharge/index.vue b/src/views/system/examcharge/index.vue
index d6aa373..587de32 100644
--- a/src/views/system/examcharge/index.vue
+++ b/src/views/system/examcharge/index.vue
@@ -82,7 +82,7 @@
<div class="app-container">
<el-row :gutter="20">
<!--閮ㄩ棬鏁版嵁-->
- <el-col :span="4" :xs="24">
+ <el-col :span="5" :xs="24">
<el-form :inline="true" ref="form" :model="form" class="demo-form-inline" label-width="78px" :rules="rules">
<el-form-item label="濮撳悕" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" />
@@ -148,14 +148,14 @@
</div>
- <el-table v-loading="loading" :data="tableList" @selection-change="handleSelect" border max-height="740px"
+ <el-table v-loading="loading" :data="tableList" @selection-change="handleSelect" border max-height="720px"
:row-style="changRed" style="margin-left: 30px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="濮撳悕" align="center" prop="customer.cusName" width="90px" />
- <el-table-column label="鎵嬫満鍙�" align="center" prop="customer.cusPhone" width="120px"
+ <el-table-column label="鎵嬫満鍙�" align="center" prop="customer.cusPhone" width="110px"
:show-overflow-tooltip="true"></el-table-column>
- <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="210px" />
- <el-table-column label="浣撴椤圭洰" align="center" prop="proname" />
+ <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="180px" />
+ <el-table-column label="浣撴椤圭洰" align="center" prop="proname" width="90px"/>
<el-table-column label="搴旀敹閲戦" align="center" prop="copeWith" width="90px" />
<el-table-column label="瀹炴敹閲戦" align="center" prop="paidIn" width="90px" />
<el-table-column label="浠樻绫诲瀷" align="center" prop="payType" width="90px">
@@ -163,7 +163,7 @@
<dict-tag :options="dict.type.dict_pay_type" :value="scope.row.payType" />
</template>
</el-table-column>
- <el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" width="110px" />
+ <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="120px"
v-if="queryParams.type == '1'">
@@ -219,7 +219,7 @@
</template>
<script>
-import { getTjPrice, addOrderAndDetail, tjRefund, getFlowingWaterList } from "@/api/system/examcharge";
+import { getTjPrice, addOrderAndDetail, tjRefund, getFlowingWaterList, getPrintSetUp } from "@/api/system/examcharge";
import { getInfo } from "@/api/login";
import printJS from "print-js";
export default {
@@ -228,7 +228,7 @@
data() {
return {
-
+ tjNumbers:"",
// 閬僵灞�
loading: false,
disabled: "",
@@ -442,25 +442,36 @@
this.formIn = this.form
addOrderAndDetail(this.form).then(res => {
if (res.code == 200) {
+ this.tjNumbers = res.msg
this.$modal.msgSuccess("鏀惰垂鎴愬姛");
+ getPrintSetUp().then(res => {
+ if (res.msg == "0") {
+ this.$nextTick(() => {
+ const style =
+ "@media print { @page{margin:0 10mm,size:4mm 6mm;}};"; //鎵撳嵃鏃跺幓鎺夌湁椤电湁灏�
+ printJS({
+ printable: "printBill", // 鏍囩鍏冪礌id
+ noPrint: ".noPrint",
+ type: 'html',
+ header: "",
+ targetStyles: ["*"],
+ maxWidth: "800",
+ scanStyles: true, //鎵撳嵃蹇呴』鍔犱笂锛屼笉鐒堕〉闈笂鐨刢ss鏍峰紡鏃犳晥
+ style,
+ });
+ });
- this.$nextTick(() => {
- const style =
- "@media print { @page{margin:0 10mm,size:4mm 6mm;}};"; //鎵撳嵃鏃跺幓鎺夌湁椤电湁灏�
- printJS({
- printable: "printBill", // 鏍囩鍏冪礌id
- noPrint: ".noPrint",
- type: 'html',
- header: "",
- targetStyles: ["*"],
- maxWidth: "800",
- scanStyles: true, //鎵撳嵃蹇呴』鍔犱笂锛屼笉鐒堕〉闈笂鐨刢ss鏍峰紡鏃犳晥
- style,
- });
- });
- this.resetQuery()
- this.handleUpdate()
- this.getList()
+ } else {
+ const tjnumber = this.tjNumbers;
+ const viewNum = "809623418249637888";
+ const params = { viewNum, tjnumber };
+ this.$tab.openPage("涓汉鍙戠エ", "/report/charge", params);
+ }
+ this.resetQuery()
+ this.handleUpdate()
+ this.getList()
+ })
+
}
})
} else {
diff --git a/src/views/system/invoice/index.vue b/src/views/system/invoice/index.vue
index c337bf7..650f7f9 100644
--- a/src/views/system/invoice/index.vue
+++ b/src/views/system/invoice/index.vue
@@ -530,6 +530,7 @@
};
},
created() {
+ this.queryParams.name=this.$route.query.paramName
this.getNowTime();
this.getList();
},
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 89875c4..1c496fd 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -233,16 +233,20 @@
<!-- <el-input v-model="form.nationDesc" placeholder="璇疯緭鍏ユ皯鏃忔弿杩�"/> -->
</el-form-item>
- <el-form-item label="鎵�鍦ㄩ櫌鍖�" prop="hospName">
- <el-select v-model="form.hospName" placeholder="璇烽�夋嫨鎵�鍦ㄩ櫌鍖�" clearable style="width: 200px" filterable>
+ <el-form-item label="鎵�鍦ㄥ尰闄�" prop="hospId">
+ <el-select v-model="form.hospId" placeholder="璇烽�夋嫨鎵�鍦ㄥ尰闄�" clearable style="width: 200px" filterable @change="sendhospName">
<el-option v-for="dict in hospList" :key="dict.hospAreaName" :label="dict.hospAreaName"
:value="dict.hospAreaId" />
</el-select>
<!-- <el-input v-model="form.hospName" placeholder="璇疯緭鍏ョ粍缁囦腑鏂囧悕绉�" /> -->
</el-form-item>
<el-form-item label="褰掑睘绉戝" prop="deptId">
- <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="璇烽�夋嫨褰掑睘绉戝"
- style="width: 200px" />
+ <!-- <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="璇烽�夋嫨褰掑睘绉戝"
+ style="width: 200px" /> -->
+ <el-select v-model="form.deptId" placeholder="璇烽�夋嫨褰掑睘绉戝" clearable style="width: 200px" filterable >
+ <el-option v-for="dict in DepartmentList" :key="dict.deptName" :label="dict.deptName"
+ :value="dict.deptId" />
+ </el-select>
</el-form-item>
<el-form-item label="鍏ヨ亴鏃ユ湡" prop="entryDate">
@@ -684,7 +688,7 @@
resetUserPwd,
changeUserStatus,
deptTreeSelect,
- getUserInfo,
+ getDeptListByDictHospId,
} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import { listHosp } from "@/api/hosp/hosp";
@@ -746,6 +750,7 @@
dialogVisible: false,
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
sysUserList: [],
+ DepartmentList:[],
// 宀椾綅琛ㄦ牸鏁版嵁
postList: [],
// 瑙掕壊琛ㄦ牸鏁版嵁
@@ -1053,6 +1058,15 @@
// });
},
+ sendhospName(){
+ let data = {
+ id:this.form.hospId
+ }
+ getDeptListByDictHospId(data).then(res => {
+ this.DepartmentList = res.data
+ })
+ },
+
handleUp(row) {
this.title = "鐢ㄦ埛淇℃伅缁存姢";
this.open = true;
diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue
index d679422..c04fd75 100644
--- a/src/views/tool/build/index.vue
+++ b/src/views/tool/build/index.vue
@@ -1,11 +1,11 @@
<template>
<div class="container">
<div class="left-board">
- <div class="logo-wrapper">
+ <!-- <div class="logo-wrapper">
<div class="logo">
<img :src="logo" alt="logo"> Form Generator
</div>
- </div>
+ </div> -->
<el-scrollbar class="left-scrollbar">
<div class="components-list">
<div class="components-title">
@@ -147,7 +147,7 @@
import { makeUpJs } from '@/utils/generator/js'
import { makeUpCss } from '@/utils/generator/css'
import drawingDefault from '@/utils/generator/drawingDefault'
-import logo from '@/assets/logo/logo.png'
+// import logo from '@/assets/logo/logo.png'
import CodeTypeDialog from './CodeTypeDialog'
import DraggableItem from './DraggableItem'
@@ -164,7 +164,7 @@
},
data() {
return {
- logo,
+ // logo,
idGlobal: 100,
formConf,
inputComponents,
--
Gitblit v1.8.0