hzymxg

qinxianzhangyao

2023-10-20 e0c4ede7fdcacf281bd6b3303d625d87bd4e728c

hzymxg

 src/api/hosp/water.js

@@ -148,4 +148,12 @@
    method: 'delete',
    params: data
  })
}

// 获取汇总时间起始时间
export function getbigntime() {
  return request({
    url: '/hosp/summary/getLastTime',
    method: 'get',
  })
}

 src/views/hosp/Summary/index.vue

@@ -1,7 +1,7 @@
<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-form-item label="汇总人员" prop="tollCollectorId">
        <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" />
@@ -24,19 +24,18 @@

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" size="mini" :disabled="single" @click="handleUpdate"
          >汇总</el-button>
        <el-button type="primary" size="mini" @click="handleUpdate">汇总</el-button>
      </el-col>
    </el-row>
    <el-table style="width: 80%" :data="list"  border max-height="720px" @selection-change="handleSelect">
    <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="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" prop="accountBeginTime" :show-overflow-tooltip="true" />
      <el-table-column label="截止时间" align="center" prop="accountEndTime" :show-overflow-tooltip="true" />
    </el-table>
    <!-- <pagination
      v-show="total>0"
@@ -49,8 +48,8 @@
</template>

<script>
import { getlistWater, getWater, getdatalist, addTjSummary } 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",
@@ -64,8 +63,6 @@
      // 选中数组
      ids: [],
      CompanyList: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
@@ -114,6 +111,20 @@
      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")
        }
      });
    },
    /** 查询体检流水列表 */
@@ -165,15 +176,11 @@
    },

    handleSelect(selection, val) {
      if (selection.length > 1) {
        this.single = false
      } else {
        this.single = true
      }
      this.ids = []
      selection.forEach(element => {
        this.ids.push(element.id)
      });

      console.log(this.ids);//此传递个人结账单号有重复
    },

    /** 修改按钮操作 */

 src/views/hosp/Sumrecord/index.vue

@@ -66,14 +66,14 @@


            <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  style="width: 94%" :data="collectorList" ref="multipleTable" border max-height="700px">
                    <el-table-column label="交款员" align="center" prop="tollCollector"  width="90" />
                    <el-table-column label="收费金额" align="center" prop="amountReceived"  width="90" />
                    <el-table-column label="退费金额" align="center" prop="refundAmount"  width="90" />
                    <el-table-column label="应交款" align="center" prop="payable"  width="90"/>
                    <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-column label="起始时间" align="center" prop="accountBeginTime" />
                    <el-table-column label="截止时间" align="center" prop="accountEndTime"  />
                </el-table>
               
            </div>

 src/views/hosp/about/index.vue

@@ -34,8 +34,8 @@
      <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" prop="accountBeginTime" :show-overflow-tooltip="true" />
      <el-table-column label="截止时间" align="center" prop="accountEndTime" :show-overflow-tooltip="true" />
    </el-table>

    <div class="pag">
@@ -167,42 +167,39 @@
        }
      });

      let data = {
        tollCollectorId: this.tollCollectorId,
        accountBeginTime: this.value1[0],
        accountEndTime: this.value1[1]
          .toJSON()
          .substr(0, 19)
          .replace("T", " "),
        pageNum: this.queryParams.pageNum,
        pageSize: this.queryParams.pageSize,
      };
      getcolllist(data).then((res) => {
        this.tableData = res.data.list;
        if (this.tableData.length === 0) {
          this.$message({
            message: '请搜索要撤销数据的时间段哦~',
            type: 'warning'
          });
        }
        if (res.code === 200) {
          if (this.tableData.length != 0) {
            this.$nextTick(() => {
              this.$refs.multipleTable.toggleRowSelection(
                this.tableData[0],
                true
              );
            });
          } else {
            this.$refs.multipleTable.clearSelection();
          }
        }
      // let data = {
      //   tollCollectorId: this.tollCollectorId,
      //   accountBeginTime: this.value1[0],
      //   accountEndTime: this.value1[1],
      //   pageNum: this.queryParams.pageNum,
      //   pageSize: this.queryParams.pageSize,
      // };
      // getcolllist(data).then((res) => {
      //   this.tableData = res.data.list;
      //   if (this.tableData.length === 0) {
      //     this.$message({
      //       message: '请搜索要撤销数据的时间段哦~',
      //       type: 'warning'
      //     });
      //   }
      //   if (res.code === 200) {
      //     if (this.tableData.length != 0) {
      //       this.$nextTick(() => {
      //         this.$refs.multipleTable.toggleRowSelection(
      //           this.tableData[0],
      //           true
      //         );
      //       });
      //     } else {
      //       this.$refs.multipleTable.clearSelection();
      //     }
      //   }

        // this.tableData.forEach(item => {
        //   this.allList = item.tjTollCollectorDetailList
        // })
        this.total = res.data.total;
      });
      //   // this.tableData.forEach(item => {
      //   //   this.allList = item.tjTollCollectorDetailList
      //   // })
      //   this.total = res.data.total;
      // });
    },
    // 选中下拉框Id
    idFn(value) {
@@ -222,10 +219,7 @@
      let data = {
        tollCollectorId: this.tollCollectorId,
        accountBeginTime: this.value1[0],
        accountEndTime: new Date(new Date().getTime() + 8 * 3600 * 1000)
          .toJSON()
          .substr(0, 19)
          .replace("T", " "),
        accountEndTime:this.value1[1],
        pageNum: this.queryParams.pageNum,
        pageSize: this.queryParams.pageSize,
      };

 src/views/hosp/settlement/index.vue

@@ -6,8 +6,10 @@
          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="['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-form>
@@ -136,19 +138,22 @@
      });

    },
    // 时间
    dateChangebirthday1(val) {
      this.value1 = val;
      console.log(this.value1)
    },

    /** 统计 */
    handleUpdate() {
      this.loading = true;
    
      let data = {
        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;
@@ -268,7 +273,7 @@
              type: "success",
            });
            this.$forceUpdate();
            this.handleUpdate();
            this.getList();
            const accountId = res.msg;
            const viewNum = "809743614817824768";
            const params = { viewNum, accountId };

 src/views/system/examcharge/index.vue

@@ -163,8 +163,8 @@
                        </template>
                    </el-table-column>
                    <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"
                    <el-table-column label="收退时间" align="center" prop="updateTime"  width="160px" />
                    <el-table-column fixed="right" label="操作" align="center" class-name="small-padding " width="80px"
                        v-if="queryParams.type == '1'">
                        <template slot-scope="scope">
                            <!-- <el-button size="mini" type="text" @click="handlerefund(scope.row)"

 vue.config.js

@@ -35,6 +35,7 @@
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        //target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
        target: `http://192.168.0.101:5011`,
        // target: `http://192.168.0.99:8080/ltkj-admin`,
        changeOrigin: true,