| src/api/hosp/water.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/assets/styles/element-ui.scss | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/hosp/Summary/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/hosp/about/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/hosp/settlement/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/system/indrefund/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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({ 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; } 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> 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> } </style> 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) 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>
