su
su1124
2024-03-08 7672bba9fc11315da4c42cba74504b7fd417df0c
su
31个文件已修改
1179 ■■■■ 已修改文件
src/views/count/chart/index.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/count/disease/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/bgsh/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/checkAll/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/examination/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/extension/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/fuzhen/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/order/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/settlement/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/teamAppLog/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mall/aftersale/index.vue 185 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mall/cart/index.vue 175 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mall/checklog/index.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mall/footprint/index.vue 105 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mall/history/index.vue 106 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mall/timeConfig/index.vue 207 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sampling/sampling/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/standard/renshunum/index.vue 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/standard/tijiancom/index.vue 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/Checkout/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/bill/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/biol/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/circle/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/invoice/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/positive/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/role/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/visit/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/team/disease/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/team/reporting/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/team/reportresults/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/team/teams/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/count/chart/index.vue
@@ -41,6 +41,14 @@
require("echarts/lib/component/tooltip");
require("echarts/lib/component/legend");
require("echarts/lib/chart/pie");
import {
  getNumber,
  hasReport,
  getPdf,
  getOrderList,
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
export default {
  name: "chart",
@@ -85,8 +93,18 @@
    };
  },
created() {
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.value1 = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    getList() {
      this.queryParams.startDate = this.startTime[0];
      this.queryParams.endDate = this.startTime[1];
src/views/count/disease/index.vue
@@ -65,6 +65,10 @@
<script>
import { illness } from "@/api/count/disease";
import {
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
export default {
  name: "disease",
@@ -139,7 +143,18 @@
    };
  },
  created() {
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.value1 = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    // 根据疾病名称查询相关人员信息
    // 时间
src/views/doctor/bgsh/index.vue
@@ -169,7 +169,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
src/views/doctor/checkAll/index.vue
@@ -744,7 +744,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
src/views/doctor/examination/index.vue
@@ -369,7 +369,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
src/views/hosp/extension/index.vue
@@ -425,7 +425,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    dialogVisibles() {
src/views/hosp/fuzhen/index.vue
@@ -238,8 +238,9 @@
  getNumber,
  hasReport,
  getPdf,
  getsendEmail, getsendMessage
  getsendEmail, getsendMessage, getNewDateList
} from "@/api/hosp/order";
import moment from "moment";
import {
  listSendTemplate,
} from "@/api/hosp/sendTemplate";
@@ -381,10 +382,11 @@
    };
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getListEmer();
    this.getDictListEmer();
    this.getdate();
  },
  mounted() {
    this.$nextTick(() => {
@@ -392,6 +394,14 @@
    });
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    dialogVisibles() {
      this.$message.error("请连接拨号器!");
    },
src/views/hosp/order/index.vue
@@ -754,11 +754,8 @@
<script>
import {
  listOrder,
  getNumber,
  hasReportEnd,
  hasReport,
  gettoPdf,
  getPdf,
  getOrderList,
  getNewDateList,
@@ -906,7 +903,6 @@
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
        console.log(this.createTimeList,111);
      });
    },
    filterNode(value, data) {
src/views/hosp/settlement/index.vue
@@ -147,7 +147,6 @@
    // 时间
    dateChangebirthday1(val) {
      this.value1 = val;
      console.log(this.value1)
    },
    /** 统计 */
src/views/hosp/teamAppLog/index.vue
@@ -49,8 +49,9 @@
      <el-form-item label="预约时间">
        <el-date-picker
          v-model="daterangeTjTime"
          style="width: 240px"
          value-format="yyyy-MM-dd"
          :default-time="['00:00:00', '23:59:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
@@ -362,6 +363,10 @@
<script>
import {
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
import {
  listTeamAppLog,
  getTeamAppLog,
  goutongList,
@@ -463,10 +468,19 @@
  },
  created() {
    this.getList();
    this.getdate();
    // this.username = this.form.contactUserId;
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.daterangeTjTime = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    /** 查询小程序团队预约记录列表 */
    getList() {
      this.loading = true;
src/views/mall/aftersale/index.vue
@@ -1,25 +1,65 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="68px"
    >
      <el-form-item label="售后编号" prop="aftersaleSn">
        <el-input v-model="queryParams.aftersaleSn" placeholder="请输入售后编号" clearable @keyup.enter.native="handleQuery" style="width: 180px"/>
        <el-input
          v-model="queryParams.aftersaleSn"
          placeholder="请输入售后编号"
          clearable
          @keyup.enter.native="handleQuery"
          style="width: 180px"
        />
      </el-form-item>
      <el-form-item label="订单编号" prop="orderId">
        <el-input v-model="queryParams.orderId" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" style="width: 160px"/>
        <el-input
          v-model="queryParams.orderId"
          placeholder="请输入订单编号"
          clearable
          @keyup.enter.native="handleQuery"
          style="width: 160px"
        />
      </el-form-item>
      <el-form-item label="用户姓名" prop="cusName">
        <el-input v-model="queryParams.cusName" placeholder="请输入用户姓名" clearable @keyup.enter.native="handleQuery" style="width: 148px"/>
        <el-input
          v-model="queryParams.cusName"
          placeholder="请输入用户姓名"
          clearable
          @keyup.enter.native="handleQuery"
          style="width: 148px"
        />
      </el-form-item>
      <!-- <el-form-item label="退款原因" prop="reason">
        <el-input v-model="queryParams.reason" placeholder="请输入退款原因" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>-->
      <el-form-item label="联系电话" prop="mobile">
        <el-input v-model="queryParams.mobile" placeholder="请输入联系电话" clearable @keyup.enter.native="handleQuery"  style="width: 148px"/>
        <el-input
          v-model="queryParams.mobile"
          placeholder="请输入联系电话"
          clearable
          @keyup.enter.native="handleQuery"
          style="width: 148px"
        />
      </el-form-item> 
      <el-form-item label="售后时间" prop="createTimeList">
        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
          style="width: 260px" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd"
          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
        <el-date-picker
          v-model="createTimeList"
          type="datetimerange"
          align="right"
          :picker-options="pickerOptions"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          :default-time="['00:00:00', '23:59:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          @change="dateChangebirthday1"
        >
        </el-date-picker>
      </el-form-item>
      <!-- <el-form-item label="操作时间" prop="handleTime">
@@ -28,8 +68,16 @@
        </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-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-form>
@@ -86,7 +134,12 @@
      ></right-toolbar>
    </el-row> -->
    <el-table border v-loading="loading" :data="aftersaleList" @selection-change="handleSelectionChange">
    <el-table
      border
      v-loading="loading"
      :data="aftersaleList"
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" align="center" />
      <!-- <el-table-column label="ID" align="center" prop="id" /> -->
      <el-table-column label="售后编号" align="center" prop="aftersaleSn" />
@@ -104,19 +157,44 @@
      <!-- <el-table-column label="退款说明" align="center" prop="comment" /> -->
      <el-table-column label="售后状态" align="center" prop="status">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.app_aftersale_status" :value="scope.row.status" />
          <dict-tag
            :options="dict.type.app_aftersale_status"
            :value="scope.row.status"
          />
        </template>
      </el-table-column>
      <el-table-column label="售后时间" align="center" prop="handleTime" width="180">
      <el-table-column
        label="售后时间"
        align="center"
        prop="handleTime"
        width="180"
      >
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.handleTime, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>
      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column
        fixed="right"
        label="操作"
        align="center"
        class-name="small-padding fixed-width"
      >
        <template slot-scope="scope">
          <el-button size="small" type="success"  @click="handleUpdate(scope.row)" v-hasPermi="['mall:aftersale:edit']" v-if="scope.row.status==1">通过
          <el-button
            size="small"
            type="success"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['mall:aftersale:edit']"
            v-if="scope.row.status == 1"
            >通过
          </el-button>
          <el-button size="small" type="danger"  @click="handleDelete(scope.row)" v-hasPermi="['mall:aftersale:remove']" v-if="scope.row.status==1">拒绝
          <el-button
            size="small"
            type="danger"
            @click="handleDelete(scope.row)"
            v-hasPermi="['mall:aftersale:remove']"
            v-if="scope.row.status == 1"
            >拒绝
          </el-button>
        </template>
      </el-table-column>
@@ -135,8 +213,19 @@
    </div>
    <!-- 添加或修改售后对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="1300px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
    <el-dialog
      :title="title"
      :visible.sync="open"
      width="1300px"
      append-to-body
    >
      <el-form
        ref="form"
        :model="form"
        :rules="rules"
        label-width="80px"
        :inline="true"
      >
        <el-form-item label="售后编号" prop="aftersaleSn">
          <el-input v-model="form.aftersaleSn" placeholder="请输入售后编号" />
        </el-form-item>
@@ -167,8 +256,13 @@
          />
        </el-form-item> -->
        <el-form-item label="操作时间" prop="handleTime">
          <el-date-picker clearable v-model="form.handleTime" type="date" value-format="yyyy-MM-dd"
            placeholder="请选择管理员操作时间">
          <el-date-picker
            clearable
            v-model="form.handleTime"
            type="date"
            value-format="yyyy-MM-dd"
            placeholder="请选择管理员操作时间"
          >
          </el-date-picker>
        </el-form-item>
      </el-form>
@@ -190,10 +284,18 @@
  addAftersale,
  updateAftersale,
} from "@/api/mall/aftersale";
import {
  getNumber,
  hasReport,
  getPdf,
  getOrderList,
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
export default {
  name: "Aftersale",
  dicts: ['app_aftersale_status', ],
  dicts: ["app_aftersale_status"],
  data() {
    return {
@@ -269,10 +371,19 @@
    };
  },
  created() {
    this.getNowTime()
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
      // / 处理默认选中当前日期
      getNowTime() {
      var curDate = new Date().getTime();
@@ -292,17 +403,11 @@
      var d = time.getDate();
      // var h = time.getHours();
      // var mm = time.getMinutes();
      return (
        y +
        "-" +
        this.add0(m) +
        "-" +
        this.add0(d)
      );
      return y + "-" + this.add0(m) + "-" + this.add0(d);
    },
    dateChangebirthday1(val) {
      if(val == null){
        this.createTimeList = []
        this.createTimeList = [];
      }else{
        this.createTimeList = val;
      }
@@ -311,8 +416,8 @@
    getList() {
      this.loading = true;
      if (this.createTimeList) {
        this.queryParams.startTime = this.createTimeList[0]
        this.queryParams.endTime = this.createTimeList[1]
        this.queryParams.startTime = this.createTimeList[0];
        this.queryParams.endTime = this.createTimeList[1];
      }
      listAftersale(this.queryParams).then((response) => {
        this.aftersaleList = response.rows;
@@ -379,24 +484,24 @@
        orderPrice: row.amount,
        refundAmount: row.amount,
        refundType: 1,
      }
      agreeToRefund(data).then(res => {
      };
      agreeToRefund(data).then((res) => {
        if (res.code == 200) {
          this.$modal.msgSuccess("退款成功");
          this.getList()
          this.getList();
        }
      })
      });
    },
    handleDelete(row) {
      let data = {
        id: row.id,
      }
      saleRefund(data).then(res => {
      };
      saleRefund(data).then((res) => {
        if (res.code == 200) {
          this.$modal.msgSuccess("已拒绝");
          this.getList()
          this.getList();
        }
      })
      });
    },
  },
};
src/views/mall/cart/index.vue
@@ -1,6 +1,13 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="68px"
    >
      <!-- <el-form-item label="用户ID" prop="userId">
        <el-input
          v-model="queryParams.userId"
@@ -26,15 +33,35 @@
        />
      </el-form-item> -->
      <el-form-item label="套餐名称" prop="goodsName">
        <el-input v-model="queryParams.goodsName" placeholder="请输入套餐名称" clearable @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.goodsName"
          placeholder="请输入套餐名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="联系电话" prop="phone">
        <el-input v-model="queryParams.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.phone"
          placeholder="请输入联系电话"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="操作时间" prop="createTimeList">
        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
          style="width: 300px" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd"
          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
        <el-date-picker
          v-model="createTimeList"
          type="datetimerange"
          align="right"
          :picker-options="pickerOptions"
          style="width: 300px"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          :default-time="['00:00:00', '23:59:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          @change="dateChangebirthday1"
        >
        </el-date-picker>
      </el-form-item>
      <!-- <el-form-item label="价格" prop="price">
@@ -78,8 +105,16 @@
        />
      </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-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-form>
@@ -136,17 +171,52 @@
      ></right-toolbar>
    </el-row> -->
    <el-table border v-loading="loading" :data="cartList" @selection-change="handleSelectionChange">
    <el-table
      border
      v-loading="loading"
      :data="cartList"
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="50" align="center" />
      <el-table-column label="序号" align="center" prop="newID" width="50" />
      <el-table-column label="用户编码" align="center" prop="userId" :show-overflow-tooltip="true" />
      <el-table-column label="联系电话" align="center" prop="phone" :show-overflow-tooltip="true" />
      <el-table-column
        label="用户编码"
        align="center"
        prop="userId"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="联系电话"
        align="center"
        prop="phone"
        :show-overflow-tooltip="true"
      />
      <!-- <el-table-column label="商品编码" align="center" prop="goodsId" :show-overflow-tooltip="true" /> -->
      <!-- <el-table-column label="商品编号" align="center" prop="goodsSn" :show-overflow-tooltip="true" /> -->
      <el-table-column label="套餐名称" align="center" prop="goodsName" :show-overflow-tooltip="true" />
      <el-table-column label="套餐项目" align="center" prop="pacProName" :show-overflow-tooltip="true" />
      <el-table-column label="价格" align="center" prop="price" :show-overflow-tooltip="true" />
      <el-table-column label="数量" align="center" prop="number" :show-overflow-tooltip="true" />
      <el-table-column
        label="套餐名称"
        align="center"
        prop="goodsName"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="套餐项目"
        align="center"
        prop="pacProName"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="价格"
        align="center"
        prop="price"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="数量"
        align="center"
        prop="number"
        :show-overflow-tooltip="true"
      />
      <!-- <el-table-column
        label="商品规格值"
        align="center"
@@ -157,7 +227,12 @@
        align="center"
        prop="checked" :show-overflow-tooltip="true"
      /> -->
      <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
      <el-table-column
        label="操作时间"
        align="center"
        prop="createTime"
        :show-overflow-tooltip="true"
      />
      <!-- <el-table-column label="${comment}" align="center" prop="deptId" /> -->
      <!-- <el-table-column
        label="操作"
@@ -187,8 +262,13 @@
    <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>
@@ -208,7 +288,10 @@
          <el-input v-model="form.goodsName" placeholder="请输入商品名称" />
        </el-form-item>
        <el-form-item label="商品货品表的货品ID" prop="productId">
          <el-input v-model="form.productId" placeholder="请输入商品货品表的货品ID" />
          <el-input
            v-model="form.productId"
            placeholder="请输入商品货品表的货品ID"
          />
        </el-form-item>
        <el-form-item label="商品货品的价格" prop="price">
          <el-input v-model="form.price" placeholder="请输入商品货品的价格" />
@@ -216,14 +299,27 @@
        <el-form-item label="商品货品的数量" prop="number">
          <el-input v-model="form.number" placeholder="请输入商品货品的数量" />
        </el-form-item>
        <el-form-item label="商品规格值列表,采用JSON数组格式" prop="specifications">
          <el-input v-model="form.specifications" type="textarea" placeholder="请输入内容" />
        <el-form-item
          label="商品规格值列表,采用JSON数组格式"
          prop="specifications"
        >
          <el-input
            v-model="form.specifications"
            type="textarea"
            placeholder="请输入内容"
          />
        </el-form-item>
        <el-form-item label="购物车中商品是否选择状态" prop="checked">
          <el-input v-model="form.checked" placeholder="请输入购物车中商品是否选择状态" />
          <el-input
            v-model="form.checked"
            placeholder="请输入购物车中商品是否选择状态"
          />
        </el-form-item>
        <el-form-item label="商品图片或者商品货品图片" prop="picUrl">
          <el-input v-model="form.picUrl" placeholder="请输入商品图片或者商品货品图片" />
          <el-input
            v-model="form.picUrl"
            placeholder="请输入商品图片或者商品货品图片"
          />
        </el-form-item>
        <el-form-item label="${comment}" prop="deptId">
          <el-input v-model="form.deptId" placeholder="请输入${comment}" />
@@ -245,6 +341,14 @@
  addCart,
  updateCart,
} from "@/api/mall/cart";
import {
  getNumber,
  hasReport,
  getPdf,
  getOrderList,
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
export default {
  name: "Cart",
@@ -316,10 +420,19 @@
    };
  },
  created() {
    this.getNowTime()
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
      // / 处理默认选中当前日期
      getNowTime() {
      var curDate = new Date().getTime();
@@ -339,18 +452,12 @@
      var d = time.getDate();
      // var h = time.getHours();
      // var mm = time.getMinutes();
      return (
        y +
        "-" +
        this.add0(m) +
        "-" +
        this.add0(d)
      );
      return y + "-" + this.add0(m) + "-" + this.add0(d);
    },
    dateChangebirthday1(val) {
      if(val == null){
        this.createTimeList = []
        this.createTimeList = [];
      }else{
        this.createTimeList = val;
      }
@@ -359,8 +466,8 @@
    getList() {
      this.loading = true;
      if (this.createTimeList) {
        this.queryParams.startTime = this.createTimeList[0]
        this.queryParams.endTime = this.createTimeList[1]
        this.queryParams.startTime = this.createTimeList[0];
        this.queryParams.endTime = this.createTimeList[1];
      }
      listCart(this.queryParams).then((response) => {
        response.rows.forEach((item, index) => {
src/views/mall/checklog/index.vue
@@ -34,8 +34,10 @@
      </el-form-item>
      <el-form-item label="核销时间" prop="createTimeList">
        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
          style="width: 300px" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd"
          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
          style="width: 300px" start-placeholder="开始日期" end-placeholder="结束日期"
          :default-time="['00:00:00', '23:59:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
        </el-date-picker>
      </el-form-item>
      <el-form-item>
@@ -211,7 +213,14 @@
  addChecklog,
  updateChecklog,
} from "@/api/mall/checklog";
import {
  getNumber,
  hasReport,
  getPdf,
  getOrderList,
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
export default {
  name: "Checklog",
  data() {
@@ -323,10 +332,19 @@
    };
  },
  created() {
    this.getNowTime()
    // this.getNowTime()
    this.getList();
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    getNowTime() {
      const end = new Date();
      const start = new Date(new Date().setHours(0, 0, 0, 0));
src/views/mall/footprint/index.vue
@@ -1,6 +1,13 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="68px"
    >
      <!-- <el-form-item label="用户ID" prop="userId">
        <el-input
          v-model="queryParams.userId"
@@ -10,17 +17,40 @@
        />
      </el-form-item> -->
      <el-form-item label="套餐名称" prop="goodsName">
        <el-input v-model="queryParams.goodsName" placeholder="请输入浏览商品编码" clearable @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.goodsName"
          placeholder="请输入浏览商品编码"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="浏览时间" prop="createTimeList">
        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
          style="width: 300px" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd"
          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
        <el-date-picker
          v-model="createTimeList"
          type="datetimerange"
          align="right"
          :picker-options="pickerOptions"
          style="width: 300px"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          :default-time="['00:00:00', '23:59:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          @change="dateChangebirthday1"
        >
        </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-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-form>
@@ -77,7 +107,12 @@
      ></right-toolbar>
    </el-row> -->
    <el-table border v-loading="loading" :data="footprintList" @selection-change="handleSelectionChange">
    <el-table
      border
      v-loading="loading"
      :data="footprintList"
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="50" align="center" />
      <el-table-column label="序号" width="55" align="center" prop="id" />
      <el-table-column label="用户编码" align="center" prop="userId" />
@@ -113,8 +148,13 @@
    <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>
@@ -122,7 +162,10 @@
    <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="userId">
          <el-input v-model="form.userId" placeholder="请输入用户表的用户编码" />
          <el-input
            v-model="form.userId"
            placeholder="请输入用户表的用户编码"
          />
        </el-form-item>
        <el-form-item label="套餐名称" prop="goodsId">
          <el-input v-model="form.goodsId" placeholder="请输入套餐名称" />
@@ -144,19 +187,26 @@
  addFootprint,
  updateFootprint,
} from "@/api/mall/footprint";
import {
  getNumber,
  hasReport,
  getPdf,
  getOrderList,
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
export default {
  name: "Footprint",
  data() {
    let checkPhoneNum = (rule, value, callback) => {
         console.log( value)
      console.log(value);
      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
      if (value == "" && value == undefined && !value) {
        return callback('');
        return callback("");
      }  else if(value != undefined && value != ""){
        return callback();
      }else if (!patter.test(value)) {
        return callback('');
        return callback("");
      }
    };
    return {
@@ -256,10 +306,19 @@
    };
  },
  created() {
    this.getNowTime()
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date().getTime();
@@ -279,17 +338,11 @@
      var d = time.getDate();
      // var h = time.getHours();
      // var mm = time.getMinutes();
      return (
        y +
        "-" +
        this.add0(m) +
        "-" +
        this.add0(d)
      );
      return y + "-" + this.add0(m) + "-" + this.add0(d);
    },
    dateChangebirthday1(val) {
      if(val == null){
        this.createTimeList = []
        this.createTimeList = [];
      }else{
        this.createTimeList = val;
      }
@@ -298,8 +351,8 @@
    getList() {
      this.loading = true;
      if (this.createTimeList) {
        this.queryParams.startTime = this.createTimeList[0]
        this.queryParams.endTime = this.createTimeList[1]
        this.queryParams.startTime = this.createTimeList[0];
        this.queryParams.endTime = this.createTimeList[1];
      }
      listFootprint(this.queryParams).then((response) => {
        this.footprintList = response.rows;
src/views/mall/history/index.vue
@@ -1,21 +1,56 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="68px"
    >
      <el-form-item label="用户编码" prop="userId">
        <el-input v-model="queryParams.userId" placeholder="请输入用户表的用户编码" clearable @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.userId"
          placeholder="请输入用户表的用户编码"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="关键字" prop="keyword">
        <el-input v-model="queryParams.keyword" placeholder="请输入搜索关键字" clearable @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.keyword"
          placeholder="请输入搜索关键字"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="搜索时间" prop="createTimeList">
        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
          style="width: 300px" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd"
          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
        <el-date-picker
          v-model="createTimeList"
          type="datetimerange"
          align="right"
          :picker-options="pickerOptions"
          style="width: 300px"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
         :default-time="['00:00:00', '23:59:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          @change="dateChangebirthday1"
        >
        </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-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-form>
@@ -72,7 +107,12 @@
      ></right-toolbar>
    </el-row> -->
    <el-table border v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
    <el-table
      border
      v-loading="loading"
      :data="historyList"
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="50" align="center" />
      <el-table-column label="序号" width="55" align="center" prop="id" />
      <el-table-column label="用户编码" align="center" prop="userId" />
@@ -108,8 +148,13 @@
    <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>
@@ -139,19 +184,27 @@
  addHistory,
  updateHistory,
} from "@/api/mall/history";
import {
  getNumber,
  hasReport,
  getPdf,
  getOrderList,
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
export default {
  name: "History",
  data() {
    let checkPhoneNum = (rule, value, callback) => {
         console.log( value)
      console.log(value);
      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
      if (value == "" && value == undefined && !value) {
        return callback('');
        return callback("");
      }  else if(value != undefined && value != ""){
        return callback();
      }else if (!patter.test(value)) {
        return callback('');
        return callback("");
      }
    };
    return {
@@ -256,10 +309,19 @@
    };
  },
  created() {
    this.getNowTime()
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date().getTime();
@@ -279,17 +341,11 @@
      var d = time.getDate();
      // var h = time.getHours();
      // var mm = time.getMinutes();
      return (
        y +
        "-" +
        this.add0(m) +
        "-" +
        this.add0(d)
      );
      return y + "-" + this.add0(m) + "-" + this.add0(d);
    },
    dateChangebirthday1(val) {
      if(val == null){
        this.createTimeList = []
        this.createTimeList = [];
      }else{
        this.createTimeList = val;
      }
@@ -298,8 +354,8 @@
    getList() {
      this.loading = true;
      if (this.createTimeList) {
        this.queryParams.startTime = this.createTimeList[0]
        this.queryParams.endTime = this.createTimeList[1]
        this.queryParams.startTime = this.createTimeList[0];
        this.queryParams.endTime = this.createTimeList[1];
      }
      listHistory(this.queryParams).then((response) => {
        this.historyList = response.rows;
src/views/mall/timeConfig/index.vue
@@ -1,32 +1,74 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="68px"
    >
      <el-form-item label="预约日期" prop="createTimeList">
        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
          style="width: 300px" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd"
          value-format="yyyy-MM-dd" @change="dateChangebirthday1">
        <el-date-picker
          v-model="createTimeList"
          type="datetimerange"
          align="right"
          :picker-options="pickerOptions"
          style="width: 300px"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          :default-time="['00:00:00', '23:59:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          @change="dateChangebirthday1"
        >
        </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-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-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
          v-hasPermi="['mall:timeConfig:add']">新增
        <el-button
          type="primary"
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['mall:timeConfig:add']"
          >新增
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
          v-hasPermi="['mall:timeConfig:edit']">修改
        <el-button
          type="primary"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['mall:timeConfig:edit']"
          >修改
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
          v-hasPermi="['mall:timeConfig:remove']">删除
        <el-button
          type="primary"
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['mall:timeConfig:remove']"
          >删除
        </el-button>
      </el-col>
      <!-- <el-col :span="1.5">
@@ -39,10 +81,18 @@
          >导出
        </el-button>
      </el-col> -->
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
      ></right-toolbar>
    </el-row>
    <el-table border v-loading="loading" :data="timeConfigList" @selection-change="handleSelectionChange">
    <el-table
      border
      v-loading="loading"
      :data="timeConfigList"
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="50" align="center" />
      <el-table-column label="序号" width="55" align="center" prop="newID" />
      <el-table-column label="日期" align="center" prop="time" width="180">
@@ -53,13 +103,30 @@
      <el-table-column label="总数" align="center" prop="allNum" width="100" />
      <el-table-column label="余数" align="center" prop="nowNum" width="100" />
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column width="80" label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column
        width="80"
        label="操作"
        align="center"
        class-name="small-padding fixed-width"
      >
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['mall:timeConfig:edit']" title="修改">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['mall:timeConfig:edit']"
            title="修改"
          >
          </el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            v-hasPermi="['mall:timeConfig:remove']" title="删除">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['mall:timeConfig:remove']"
            title="删除"
          >
          </el-button>
        </template>
      </el-table-column>
@@ -67,14 +134,25 @@
    <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>
    <!-- 添加或修改预约时间对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="570px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="50px" :inline="true">
      <el-form
        ref="form"
        :model="form"
        :rules="rules"
        label-width="50px"
        :inline="true"
      >
        <!-- <el-form-item>
          <el-radio-group v-model="radio" @change="danxuan">
            <el-radio v-model="radio" label="3">单天</el-radio>
@@ -84,29 +162,56 @@
        <div style="display: flex" v-show="yc">
          <el-form-item label="日期" prop="startTime">
            <el-date-picker disabled clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd"
              placeholder="请选择开始日期">
            <el-date-picker
              disabled
              clearable
              v-model="form.startTime"
              type="date"
              value-format="yyyy-MM-dd"
              placeholder="请选择开始日期"
            >
            </el-date-picker>
          </el-form-item>
          <span style="margin-top: 10px; margin-right: 8px">~</span>
          <el-form-item prop="endTime">
            <el-date-picker clearable v-model="form.endTime" type="date"
              value-format="yyyy-MM-dd" placeholder="请选择结束日期">
            <el-date-picker
              clearable
              v-model="form.endTime"
              type="date"
              value-format="yyyy-MM-dd"
              placeholder="请选择结束日期"
            >
            </el-date-picker>
          </el-form-item>
        </div>
        <el-form-item label="总数" prop="allNum">
          <el-input v-model="form.allNum" placeholder="请输入总数" style="width: 465px" /> </el-form-item><br />
          <el-input
            v-model="form.allNum"
            placeholder="请输入总数"
            style="width: 465px"
          /> </el-form-item
        ><br />
        <el-form-item label="余数" prop="nowNum">
          <el-input v-model="form.nowNum" placeholder="请输入余数" style="width: 465px" @input="numchange"/>
          <el-input
            v-model="form.nowNum"
            placeholder="请输入余数"
            style="width: 465px"
            @input="numchange"
          />
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" style="width: 465px" />
          <el-input
            v-model="form.remark"
            placeholder="请输入备注"
            style="width: 465px"
          />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm" :disabled="disabled">确 定</el-button>
        <el-button type="primary" @click="submitForm" :disabled="disabled"
          >确 定</el-button
        >
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
@@ -123,19 +228,26 @@
  isExist,
  returnLastTime,
} from "@/api/mall/timeConfig";
import {
  getNumber,
  hasReport,
  getPdf,
  getOrderList,
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
export default {
  name: "TimeConfig",
  data() {
    let checkPhoneNum = (rule, value, callback) => {
         console.log( value)
      console.log(value);
      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
      if (value == "" && value == undefined && !value) {
        return callback('');
        return callback("");
      }  else if(value != undefined && value != ""){
        return callback();
      }else if (!patter.test(value)) {
        return callback('');
        return callback("");
      }
    };
    return {
@@ -250,10 +362,19 @@
    };
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
       // / 处理默认选中当前日期
       getNowTime() {
      var curDate = new Date().getTime();
@@ -273,17 +394,11 @@
      var d = time.getDate();
      // var h = time.getHours();
      // var mm = time.getMinutes();
      return (
        y +
        "-" +
        this.add0(m) +
        "-" +
        this.add0(d)
      );
      return y + "-" + this.add0(m) + "-" + this.add0(d);
    },
    dateChangebirthday1(val) {
      if(val == null){
        this.createTimeList = []
        this.createTimeList = [];
      }else{
        this.createTimeList = val;
      }
@@ -292,8 +407,8 @@
    getList() {
      this.loading = true;
      if (this.createTimeList) {
        this.queryParams.startTime = this.createTimeList[0]
        this.queryParams.endTime = this.createTimeList[1]
        this.queryParams.startTime = this.createTimeList[0];
        this.queryParams.endTime = this.createTimeList[1];
      }
      listTimeConfig(this.queryParams).then((response) => {
        response.rows.forEach((item, index) => {
@@ -349,7 +464,7 @@
    /** 重置按钮操作 */
    resetQuery() {
      this.resetForm("queryForm");
      this.createTimeList = []
      this.createTimeList = [];
      this.handleQuery();
    },
    // 多选框选中数据
src/views/sampling/sampling/index.vue
@@ -395,7 +395,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    handleSizeChange(val) {
src/views/standard/renshunum/index.vue
@@ -1,11 +1,26 @@
<template>
    <div>
        <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin: 10px 10px">
    <el-form
      :model="queryParams"
      ref="tableList"
      :inline="true"
      label-width="76px"
      style="margin: 10px 10px"
    >
            <el-form-item label="体检时间" prop="date">
                <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
                    style="width: 310px" start-placeholder="开始日期" end-placeholder="结束日期"
                    :default-time="['00:00:00', '23:00:00']" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
                    @change="dateChangebirthday1">
        <el-date-picker
          v-model="startTime"
          type="datetimerange"
          align="right"
          :picker-options="pickerOptions"
          style="width: 310px"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          :default-time="['00:00:00', '23:00:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          @change="dateChangebirthday1"
        >
                </el-date-picker>
            </el-form-item>
            <el-form-item>
@@ -27,37 +42,43 @@
require("echarts/lib/component/tooltip");
require("echarts/lib/component/legend");
require("echarts/lib/chart/pie");
import { getNewDateList } from "@/api/hosp/order";
import moment from "moment";
export default {
    name: "chart",
    data() {
        return {
            pickerOptions: {
                shortcuts: [{
                    text: '最近一周',
        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: '最近一个月',
              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: '最近三个月',
              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]);
                    }
                }]
              picker.$emit("pick", [start, end]);
            },
          },
        ],
            },
            value1: "",
            DateList: [],
@@ -71,43 +92,64 @@
        };
    },
    created() {
        this.getNowTime();
    // this.getNowTime();
        this.getList();
    this.getdate();
    },
    methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.startTime = [
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
      });
    },
        getList() {
            this.queryParams.beginTime = this.startTime[0];
            this.queryParams.endTime = this.startTime[1];
            getTiaoNumsByDate(this.queryParams).then(res => {
      getTiaoNumsByDate(this.queryParams).then((res) => {
                let myChart = this.$echarts.init(document.getElementById("main"));
                //你进入页面先把图表渲染了  然后才获取的数据把
                myChart.setOption({
                    color: ['#5470c6'],
          color: ["#5470c6"],
                    legend: {},
                    tooltip: {},
                    xAxis: {
                        type: 'category',
                        data: ['体检人数', '男生数量', '女生数量', '收入', '个检人数', '单位体检人数']
            type: "category",
            data: [
              "体检人数",
              "男生数量",
              "女生数量",
              "收入",
              "个检人数",
              "单位体检人数",
            ],
                    },
                    yAxis: {
                        type: 'value'
            type: "value",
                    },
                    series: [
                        {
                            data: [res.data.tijianNum, res.data.boysNum, res.data.girlsNum, {
              data: [
                res.data.tijianNum,
                res.data.boysNum,
                res.data.girlsNum,
                {
                                value: res.data.moneysNum,
                                itemStyle: {
                                    color: '#a90000'
                                }
                            }, res.data.personNum, res.data.tuanDuiNum],
                            type: 'bar'
                        }
                    ]
                    color: "#a90000",
                  },
                },
                res.data.personNum,
                res.data.tuanDuiNum,
              ],
              type: "bar",
            },
          ],
                });
            })
      });
        },
        // 时间
        dateChangebirthday1(val) {
src/views/standard/tijiancom/index.vue
@@ -1,10 +1,25 @@
<template>
    <div>
        <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin: 10px 10px">
    <el-form
      :model="queryParams"
      ref="tableList"
      :inline="true"
      label-width="76px"
      style="margin: 10px 10px"
    >
            <el-form-item label="统计区间" prop="date">
                <el-date-picker v-model="value1" type="datetimerange" align="right" start-placeholder="开始日期"
                    :picker-options="pickerOptions" end-placeholder="结束日期" :default-time="['00:00:00', '23:00:00']"
                    format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
        <el-date-picker
          v-model="value1"
          type="datetimerange"
          align="right"
          start-placeholder="开始日期"
          :picker-options="pickerOptions"
          end-placeholder="结束日期"
          :default-time="['00:00:00', '23:00:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          @change="dateChangebirthday1"
        >
                </el-date-picker>
            </el-form-item>
            <el-form-item>
@@ -26,37 +41,43 @@
require("echarts/lib/component/tooltip");
require("echarts/lib/component/legend");
require("echarts/lib/chart/pie");
import { getNewDateList } from "@/api/hosp/order";
import moment from "moment";
export default {
    name: "chart",
    data() {
        return {
            pickerOptions: {
                shortcuts: [{
                    text: '最近一周',
        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: '最近一个月',
              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: '最近三个月',
              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]);
                    }
                }]
              picker.$emit("pick", [start, end]);
            },
          },
        ],
            },
            value1: "",
            DateList: [],
@@ -70,51 +91,70 @@
        };
    },
  created() {
    this.getdate();
  },
    methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.value1 = [
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
      });
    },
        getList() {
            this.queryParams.startDate = this.startTime[0];
            this.queryParams.endDate = this.startTime[1];
            let myChart = this.$echarts.init(document.getElementById("main"));
            //你进入页面先把图表渲染了  然后才获取的数据把
            myChart.setOption({
                tooltip: {},
                xAxis: {
                    type: 'category',
                    data: ['一般检查','外科','内科', '化验科', '检验科', '心电图室','妇科','B超室','新生儿科', '儿童科']
          type: "category",
          data: [
            "一般检查",
            "外科",
            "内科",
            "化验科",
            "检验科",
            "心电图室",
            "妇科",
            "B超室",
            "新生儿科",
            "儿童科",
          ],
                },
                yAxis: {
                    type: 'value'
          type: "value",
                },
                legend: {
                    data: ['剩余体检人数', '已完成体检人数']
          data: ["剩余体检人数", "已完成体检人数"],
                },
                series: [{
                    name: '剩余体检人数',
                    color: ['#2f4554'],
        series: [
          {
            name: "剩余体检人数",
            color: ["#2f4554"],
                    data: [100, 150, 120, 90, 50, 130, 110,80,90,100],
                    type: 'bar',
            type: "bar",
                    label: {
                        // show: true,
                        position: 'right'
                    }
              position: "right",
            },
                },
                {
                    name: '已完成体检人数',
                    color: ['#c23531'],
            name: "已完成体检人数",
            color: ["#c23531"],
                    data: [120, 130, 110, 70, 60, 110, 140,80,90,80],
                    type: 'bar',
            type: "bar",
                    label: {
                        // show: true,
                        position: 'right'
                    }
                }]
              position: "right",
            },
          },
        ],
            });
        },
        // 时间
        dateChangebirthday1(val) {
src/views/system/Checkout/index.vue
@@ -538,7 +538,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
src/views/system/bill/index.vue
@@ -651,7 +651,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
src/views/system/biol/index.vue
@@ -481,7 +481,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
src/views/system/circle/index.vue
@@ -234,7 +234,8 @@
var inpArr = document.getElementsByTagName("input"),
  result = "";
import print from "print-js";
import { getsendEmail, getsendMessage } from "@/api/hosp/order";
import { getsendEmail, getsendMessage, getNewDateList } from "@/api/hosp/order";
import moment from "moment";
import {
  listSendTemplate,
} from "@/api/hosp/sendTemplate";
@@ -391,11 +392,12 @@
    };
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.Company();
    this.getListEmer();
    this.getDictListEmer();
    this.getdate();
  },
  mounted() {
    this.$nextTick(() => {
@@ -403,6 +405,14 @@
    });
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    dialogVisibles() {
      this.$message.error("请连接拨号器!");
    },
src/views/system/invoice/index.vue
@@ -351,7 +351,6 @@
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];
        console.log(this.createTimeList,111);
      });
    },
    // / 处理默认选中当前日期
src/views/system/positive/index.vue
@@ -5,7 +5,9 @@
            <el-input v-model="queryParams.tjNumber" placeholder="请输入体检号" clearable @keyup.enter.native="handleQuery" />
          </el-form-item> -->
      <el-form-item label="登记时间" prop="createTimeList">
        <el-date-picker clearable v-model="queryParams.createTimeList" style="width: 240px" value-format="yyyy-MM-dd"
        <el-date-picker clearable v-model="queryParams.createTimeList"  :default-time="['00:00:00', '23:59:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
          :picker-options="pickerOptions"></el-date-picker>
      </el-form-item>
@@ -170,11 +172,12 @@
</template>
 
<script>
import { listOrder, getPdf, getTjNumber, sendEmail, getsendEmail, getsendMessage } from "@/api/hosp/order";
import { listOrder, getPdf, getTjNumber, sendEmail, getsendEmail, getsendMessage, getNewDateList } from "@/api/hosp/order";
import { listSendTemplate, } from "@/api/hosp/sendTemplate";
import ViewPdf from "@/components/ViewPdf";
import { listEmer } from "@/api/system/emer";
import { getCompany, queryCompany } from "@/api/team/tuanti";
import moment from "moment";
export default {
  components: {
    ViewPdf,
@@ -323,11 +326,20 @@
    };
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getListEmer();
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.queryParams.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    dialogVisibles() {
      this.$message.error("请连接拨号器!");
    },
src/views/system/role/index.vue
@@ -43,8 +43,9 @@
      <el-form-item label="创建时间">
        <el-date-picker
          v-model="dateRange"
          style="width: 220px"
          value-format="yyyy-MM-dd"
           :default-time="['00:00:00', '23:59:00']"
          format="yyyy-MM-dd HH:mm"
          value-format="yyyy-MM-dd HH:mm"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
@@ -376,6 +377,10 @@
<script>
import {
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
import {
  listRole,
  getRole,
  delRole,
@@ -490,8 +495,17 @@
  },
  created() {
    this.getList();
    this.getdate();
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.dateRange = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    /** 查询角色列表 */
    getList() {
      this.loading = true;
src/views/system/visit/index.vue
@@ -258,9 +258,10 @@
  getPdf,
  getOrderList,
  printCode,
  getNewDateList
} from "@/api/hosp/order";
import { getsendEmail, getsendMessage } from "@/api/hosp/order";
import moment from "moment";
import { addSurveyRecord } from "@/api/hosp/surveyRecord";
import { getDictEmerList, listEmer } from "@/api/system/emer";
import ViewPdf from "@/components/ViewPdf";
@@ -427,10 +428,11 @@
    },
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.Company();
    this.getListEmer();
    this.getdate();
  },
  mounted() {
    this.$nextTick(() => {
@@ -438,6 +440,14 @@
    });
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
      });
    },
    dialogVisibles() {
      this.$message.error("请连接拨号器!");
    },
src/views/team/disease/index.vue
@@ -343,7 +343,6 @@
            moment(res.data).format("YYYY-MM-DD 00:00:00"),
            moment(res.data).format("YYYY-MM-DD 23:59:00")
          ];;
        console.log(this.createTimeList,111);
      });
    },
    // / 处理默认选中当前日期
src/views/team/reporting/index.vue
@@ -320,7 +320,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    /** 查询体检单位信息维护列表 */
src/views/team/reportresults/index.vue
@@ -420,7 +420,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    filterNode(value, data) {
src/views/team/teams/index.vue
@@ -492,7 +492,6 @@
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    getList() {