su

su1124

2024-03-08 b989da3c3a99fef9068c20ac55467d7ce25523af

su

 src/api/hosp/order.js

@@ -218,4 +218,12 @@
    method: 'post',
    data: data
  })
}

//获取服务器当时间段
export function getNewDateList() {
  return request({
    url: '/hosp/new/water/getNewDateList',
    method: 'get',
  })
}

 src/views/doctor/bgsh/index.vue

@@ -79,6 +79,8 @@
import { getcheckList, heXiaoByIds } from "@/api/doctor/checkAll";
import { getCompany, queryCompany } from "@/api/team/tuanti";
import ViewPdf from "@/components/ViewPdf";
import { getNewDateList } from "@/api/hosp/order";
import moment from "moment";

export default {
  components: {
@@ -150,8 +152,9 @@
  },

  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getdate();
  },

  mounted() {
@@ -160,6 +163,15 @@
    });
  },
  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"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date().getTime();

 src/views/doctor/checkAll/index.vue

@@ -585,6 +585,8 @@
import {
  getTjYxjcList
} from "@/api/system/package";
import { getNewDateList } from "@/api/hosp/order";
import moment from "moment";
export default {
  components: {
    ViewPdf,
@@ -725,8 +727,9 @@
  },

  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getdate();
  },

  mounted() {
@@ -735,6 +738,15 @@
    });
  },
  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"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date().getTime();

 src/views/doctor/examination/index.vue

@@ -285,6 +285,9 @@
  cSWebGetPro,
  dataSynchronization,
} from "@/api/doctor/examination";
import { getNewDateList } from "@/api/hosp/order";
import moment from "moment";

export default {
  dicts: ["dict_tj_status"],
  data() {
@@ -351,6 +354,7 @@
  },
  created() {
    this.getList();
    this.getdate();
    // this.getNowTime();
  },
  mounted() {
@@ -359,6 +363,15 @@
    });
  },
  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"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date().getTime();

 src/views/hosp/Summary/index.vue

@@ -61,6 +61,7 @@
import { getlistWater, getWater, getdatalist, addTjSummary, getNewDate, getbigntime } from "@/api/hosp/water";
import { getInfo } from "@/api/login";
import moment from "moment";
import {getNewDateList} from "@/api/hosp/order";
export default {
  name: "Water",
  data() {
@@ -136,15 +137,26 @@
          this.queryParams.tollCollectorId = response.user.userId;
        });
      });
      getNewDate().then((response) => {
      // getNewDate().then((response) => {
      //   if (response.code === 200) {
      //     this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD HH:mm:ss")
      //   }
      // });
      getNewDateList().then((response) => {
        if (response.code === 200) {
          this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD HH:mm:ss")
          this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD 23:59:00")
        }
      });
      getbigntime().then((response) => {
      // getbigntime().then((response) => {
      //   if (response.code === 200) {
      //     this.queryParams.accountBeginTime =
      //       moment(response.data).format("YYYY-MM-DD HH:mm:ss")
      //   }
      // });
      getNewDateList().then((response) => {
        if (response.code === 200) {
          this.queryParams.accountBeginTime =
            moment(response.data).format("YYYY-MM-DD HH:mm:ss")
            moment(response.data).format("YYYY-MM-DD 00:00:00")
        }
      });
    },

 src/views/hosp/about/index.vue

@@ -1,63 +1,154 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="110px"
    >
      <el-row>
        <el-col :span="6">
          <el-form-item label="交款员" prop="tollCollectorName" style="display: flex;">
            <el-select v-model="queryParams.tollCollectorName" filterable placeholder="请选择交款员" clearable
              @clear="getCompanyList" @change="idFn">
              <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
          <el-form-item
            label="交款员"
            prop="tollCollectorName"
            style="display: flex"
          >
            <el-select
              v-model="queryParams.tollCollectorName"
              filterable
              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-col>
        <el-col :span="14">
          <el-form-item label="交账时间" prop="tollCollectorName" style="display: flex;">
            <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-form-item
            label="交账时间"
            prop="tollCollectorName"
            style="display: flex"
          >
            <el-date-picker
              v-model="value1"
              type="datetimerange"
              :picker-options="pickerOptions"
              :default-time="['00:00:00', '23:59:00']"
              format="yyyy-MM-dd HH:mm"
              value-format="yyyy-MM-dd HH:mm"
              start-placeholder="起止日期"
              end-placeholder="终止日期"
            >
            </el-date-picker>
          </el-form-item>
        </el-col>
        <el-col :span="3">
          <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-col>
      </el-row>



    </el-form>

    <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>

    <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"
        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>

    <el-table :data="allList" style="margin-top: 60px; width: 80%" show-summary border>
    <el-table
      :data="allList"
      style="margin-top: 60px; width: 80%"
      show-summary
      border
    >
      <el-table-column label="付款方式" align="center" prop="payType" />
      <el-table-column label="收费金额" align="center" prop="amountReceived">
      </el-table-column>
@@ -68,7 +159,13 @@
</template>
  
<script>
import { getcolllist, getdatalist, delById, getNewDate } from "@/api/hosp/water";
import { getNewDateList } from "@/api/hosp/order";
import {
  getcolllist,
  getdatalist,
  delById,
  getNewDate,
} from "@/api/hosp/water";
import { getInfo } from "@/api/login";
import moment from "moment";

@@ -160,7 +257,6 @@
  created() {
    this.getList();
    this.getCompanyList();

  },
  methods: {
    /** 查询体检流水列表 */
@@ -170,11 +266,19 @@
        this.queryParams.tollCollectorName = response.user.nickName;
      });

      getNewDate().then((response) => {
      // 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"),
      //     ];
      //   }
      // });
      getNewDateList().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")
            moment(response.data).format("YYYY-MM-DD 23:59:00"),
          ];
        }
      });
@@ -237,7 +341,7 @@
      };
      getcolllist(data).then((res) => {
        this.tableData = res.data.list;
        this.allList = []
        this.allList = [];
        if (this.tableData.length != 0) {
          this.$nextTick(() => {
            this.$refs.multipleTable.toggleRowSelection(
@@ -258,7 +362,7 @@
        this.total = res.data.total;
      });
    },
    handleUpdate() { },
    handleUpdate() {},

    // 表格单选
    handleSelect(selection, val) {
@@ -276,7 +380,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);
    },
@@ -299,7 +403,7 @@
          type: "success",
        });
        this.getList();
        this.handleQuery()
        this.handleQuery();
      });
    },
  },
@@ -311,8 +415,9 @@
  display: none;
}

.el-date-editor--datetimerange.el-input, .el-date-editor--datetimerange.el-input__inner {
    width: 100%;
.el-date-editor--datetimerange.el-input,
.el-date-editor--datetimerange.el-input__inner {
  width: 100%;
}

.pag {
@@ -325,7 +430,7 @@
  width: 30%;
}

.el-table__body tr.current-row>td {
.el-table__body tr.current-row > td {
  background-color: #f19944 !important;
  /* color: #f19944; */
  /* 设置文字颜色，可以选择不设置 */

 src/views/hosp/order/index.vue

@@ -1,18 +1,48 @@
<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="name">
        <el-input ref="inputName" v-model="queryParams.name" placeholder="请输入姓名" style="width: 120px" clearable
          @keyup.enter.native="handleQuery" />
        <el-input
          ref="inputName"
          v-model="queryParams.name"
          placeholder="请输入姓名"
          style="width: 120px"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="体检号" prop="tjNum">
        <el-input ref="inputName" v-model="queryParams.tjNum" placeholder="请输入体检号" style="width: 170px" clearable
          @keyup.enter.native="handleQuery" @blur="hb" />
        <el-input
          ref="inputName"
          v-model="queryParams.tjNum"
          placeholder="请输入体检号"
          style="width: 170px"
          clearable
          @keyup.enter.native="handleQuery"
          @blur="hb"
        />
      </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="结束日期" :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="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="createTime">
@@ -26,69 +56,183 @@
        </el-date-picker>
      </el-form-item> -->
      <el-form-item label="报告时间" prop="reportTimeList">
        <el-date-picker clearable v-model="reportTimeList" @change="dateChangebirthday2" type="daterange"
          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
          value-format="yyyy-MM-dd" placeholder="请选择出报告时间" style="width: 240px">
        <el-date-picker
          clearable
          v-model="reportTimeList"
          @change="dateChangebirthday2"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          :picker-options="pickerOptions"
          value-format="yyyy-MM-dd"
          placeholder="请选择出报告时间"
          style="width: 240px"
        >
        </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-download" size="mini" @click="handleExport"
          v-hasPermi="['hosp:order:export']">导出</el-button>
        <el-button
          type="primary"
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['hosp:order:export']"
          >导出</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" size="mini" @click="handleProject1" :disabled="single"
          v-hasPermi="['hosp:order:export']">补录项目</el-button>
        <el-button
          type="primary"
          size="mini"
          @click="handleProject1"
          :disabled="single"
          v-hasPermi="['hosp:order:export']"
          >补录项目</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" size="mini" @click="handleReport1" :disabled="single"
          v-hasPermi="['hosp:order:export']">打印导诊单</el-button>
        <el-button
          type="primary"
          size="mini"
          @click="handleReport1"
          :disabled="single"
          v-hasPermi="['hosp:order:export']"
          >打印导诊单</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" size="mini" @click="handleUpdate1" :disabled="single"
          v-hasPermi="['hosp:order:export']">订单明细</el-button>
        <el-button
          type="primary"
          size="mini"
          @click="handleUpdate1"
          :disabled="single"
          v-hasPermi="['hosp:order:export']"
          >订单明细</el-button
        >
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
      ></right-toolbar>
    </el-row>

    <template>
      <el-table border v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="40px" align="center" fixed="left" />
      <el-table
        border
        v-loading="loading"
        :data="orderList"
        @selection-change="handleSelectionChange"
      >
        <el-table-column
          type="selection"
          width="40px"
          align="center"
          fixed="left"
        />
        <!-- <el-table-column label="主键id" align="center" prop="orderId" /> -->
        <!-- <el-table-column label="用户id" align="center" prop="userId" /> -->
        <el-table-column label="序号" align="center" prop="newID" width="50px" fixed="left" />
        <el-table-column label="姓名" align="center" prop="tjCustomerName" fixed="left" width="100px"
          :show-overflow-tooltip="true" />
        <el-table-column label="性别" align="center" prop="tjCustomerSex" width="50px" :show-overflow-tooltip="true">
        <el-table-column
          label="序号"
          align="center"
          prop="newID"
          width="50px"
          fixed="left"
        />
        <el-table-column
          label="姓名"
          align="center"
          prop="tjCustomerName"
          fixed="left"
          width="100px"
          :show-overflow-tooltip="true"
        />
        <el-table-column
          label="性别"
          align="center"
          prop="tjCustomerSex"
          width="50px"
          :show-overflow-tooltip="true"
        >
          <template slot-scope="scope">
            <span v-if="scope.row.tjCustomerSex == '0'">男</span>
            <span v-if="scope.row.tjCustomerSex == '1'">女</span>
            <span v-if="scope.row.tjCustomerSex == '2'">未知</span>
          </template>
        </el-table-column>
        <el-table-column label="年龄" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" />
        <el-table-column label="电话" align="center" prop="tjCustomerPhone" :show-overflow-tooltip="true" width="110px" />
        <el-table-column label="体检类型" align="center" prop="tjType" width="80px" :show-overflow-tooltip="true">
        <el-table-column
          label="年龄"
          align="center"
          prop="tjCustomerAge"
          width="55px"
          :show-overflow-tooltip="true"
        />
        <el-table-column
          label="电话"
          align="center"
          prop="tjCustomerPhone"
          :show-overflow-tooltip="true"
          width="110px"
        />
        <el-table-column
          label="体检类型"
          align="center"
          prop="tjType"
          width="80px"
          :show-overflow-tooltip="true"
        >
          <template slot-scope="scope">
            <span v-if="scope.row.tjType == '2'">个人</span>
            <span v-if="scope.row.tjType == '1'">团队</span>
          </template>
        </el-table-column>
        <el-table-column label="体检号" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px" />
        <el-table-column
          label="体检号"
          align="center"
          prop="tjNumber"
          :show-overflow-tooltip="true"
          width="160px"
        />
        <!-- <el-table-column label="流水号" align="center" prop="tjSerialNumber" /> -->
        <el-table-column label="所选套餐" align="center" prop="pacName" :show-overflow-tooltip="true" />
        <el-table-column label="登记时间" align="center" prop="createTime" width="155px" :show-overflow-tooltip="true">
        <el-table-column
          label="所选套餐"
          align="center"
          prop="pacName"
          :show-overflow-tooltip="true"
        />
        <el-table-column
          label="登记时间"
          align="center"
          prop="createTime"
          width="155px"
          :show-overflow-tooltip="true"
        >
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.createTime) }}</span>
          </template>
        </el-table-column>
        <el-table-column label="完成时间" align="center" prop="finishTime" width="155px" :show-overflow-tooltip="true">
        <el-table-column
          label="完成时间"
          align="center"
          prop="finishTime"
          width="155px"
          :show-overflow-tooltip="true"
        >
          <!-- <template slot-scope="scope">
            <span>{{ parseTime(scope.row.finishTime) }}</span>
          </template> -->
@@ -98,16 +242,33 @@
          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column> -->
        <el-table-column label="报告时间" align="center" prop="reportTime" width="155px" height="10px"
          :show-overflow-tooltip="true">
        <el-table-column
          label="报告时间"
          align="center"
          prop="reportTime"
          width="155px"
          height="10px"
          :show-overflow-tooltip="true"
        >
          <!-- <template slot-scope="scope">
            <span>{{ parseTime(scope.row.reportTime) }}</span>
          </template> -->
        </el-table-column>
        <!-- <el-table-column label="创建人" align="center" prop="createBy" /> -->
        <!-- <el-table-column label="更新人" align="center" prop="updateBy" /> -->
        <el-table-column label="单位工号" align="center" prop="firmWorkId" width="100px" :show-overflow-tooltip="true" />
        <el-table-column label="单位名称" align="center" prop="dictCompName" :show-overflow-tooltip="true" />
        <el-table-column
          label="单位工号"
          align="center"
          prop="firmWorkId"
          width="100px"
          :show-overflow-tooltip="true"
        />
        <el-table-column
          label="单位名称"
          align="center"
          prop="dictCompName"
          :show-overflow-tooltip="true"
        />
        <!-- <el-table-column label="部门名" align="center" prop="firmDeptName" /> -->

        <!-- <el-table-column label="客户照片" align="center" prop="photo" /> -->
@@ -118,13 +279,31 @@
            }}</span>
          </template>
        </el-table-column> -->
        <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" height="10px"
          width="114px">
        <el-table-column
          fixed="right"
          label="操作"
          align="center"
          class-name="small-padding fixed-width"
          height="10px"
          width="114px"
        >
          <template slot-scope="scope">
            <el-button size="mini" type="text" icon="el-icon-document" @click="handleUpdate(scope.row)"
              v-hasPermi="['hosp:order:edit']" title="订单流水"></el-button>
            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleProject(scope.row)"
              v-hasPermi="['hosp:order:edit']" title="补录项目"></el-button>
            <el-button
              size="mini"
              type="text"
              icon="el-icon-document"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['hosp:order:edit']"
              title="订单流水"
            ></el-button>
            <el-button
              size="mini"
              type="text"
              icon="el-icon-edit"
              @click="handleProject(scope.row)"
              v-hasPermi="['hosp:order:edit']"
              title="补录项目"
            ></el-button>
            <!-- <el-button type="text" size="mini" class="btn" icon="el-icon-download" title="下载导诊单" @click="
              daoZhenDan,
              LoadFileImg(scope.row);
@@ -151,8 +330,14 @@
              @click="viewReport(scope.row)"
            ></el-button> -->

            <el-button type="text" size="mini" class="btn" icon="el-icon-download" title="导诊单"
              @click="handleReport(scope.row)"></el-button>
            <el-button
              type="text"
              size="mini"
              class="btn"
              icon="el-icon-download"
              title="导诊单"
              @click="handleReport(scope.row)"
            ></el-button>

            <!-- <button @click="downLoadFileImg(scope.row)">查看报告</button> -->
          </template>
@@ -162,9 +347,16 @@

    <div class="pag">
      <div class="pag1">
        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
          :current-page="queryParams.pageNum" :page-sizes="[10, 20, 30, 40]" :page-size="queryParams.pageSize"
          layout="total, sizes, prev, pager, next, jumper" :total="total">
        <el-pagination
          background
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"
          :current-page="queryParams.pageNum"
          :page-sizes="[10, 20, 30, 40]"
          :page-size="queryParams.pageSize"
          layout="total, sizes, prev, pager, next, jumper"
          :total="total"
        >
        </el-pagination>
        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
          @pagination="getList" /> -->
@@ -186,29 +378,65 @@
        </span>
     </el-dialog> -->

    <el-dialog title="PDF 预览" :visible.sync="dialogVisible" :close-on-click-modal="false">
    <el-dialog
      title="PDF 预览"
      :visible.sync="dialogVisible"
      :close-on-click-modal="false"
    >
      <div class="main">
        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
        <iframe
          id="printIframe"
          :src="url"
          frameborder="0"
          style="width: 100%; height: 100%"
        ></iframe>
      </div>
    </el-dialog>

    <el-dialog title="导诊单" :visible.sync="daoZhenDan" :close-on-click-modal="false">
    <el-dialog
      title="导诊单"
      :visible.sync="daoZhenDan"
      :close-on-click-modal="false"
    >
      <div class="main">
        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
        <iframe
          id="printIframe"
          :src="url"
          frameborder="0"
          style="width: 100%; height: 100%"
        ></iframe>
      </div>
    </el-dialog>

    <!-- 添加补录项目 -->
    <el-dialog :title="title" :visible.sync="Projectopen" width="1200px" style="height: 860px" append-to-body>
    <el-dialog
      :title="title"
      :visible.sync="Projectopen"
      width="1200px"
      style="height: 860px"
      append-to-body
    >
      <el-row type="flex" class="row-bg" justify="space-around">
        <el-col :span="6">
          <div style="text-align: center; margin-bottom: 10px;margin-top:10px">项目列表</div>
          <div
            style="text-align: center; margin-bottom: 10px; margin-top: 10px"
          >
            项目列表
          </div>
          <el-input placeholder="输入关键字进行过滤" v-model="filterText">
          </el-input>
          <div class="tab3">
            <div class="outside1">
              <el-tree v-loading="loading" :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
                @check-change="handleCurrentChecked" :filter-node-method="filterNode" ref="tree">
              <el-tree
                v-loading="loading"
                :data="Treedata"
                show-checkbox
                node-key="proId"
                :props="defaultProps"
                @check-change="handleCurrentChecked"
                :filter-node-method="filterNode"
                ref="tree"
              >
              </el-tree>
            </div>
          </div>
@@ -230,43 +458,81 @@
              <div class="outside">
                <el-form :inline="true" class="outside1">
                  <el-form-item label="原价">
                    <el-input placeholder="原价" :value="TotalPrice1" disabled style="width: 90px"></el-input>
                    <el-input
                      placeholder="原价"
                      :value="TotalPrice1"
                      disabled
                      style="width: 90px"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="折扣设定">
                    <el-input style="width: 90px" type="number" v-model="discount" :value="discount"></el-input>
                    <el-input
                      style="width: 90px"
                      type="number"
                      v-model="discount"
                      :value="discount"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="应付金额">
                    <el-input placeholder="应付金额" :value="TotalPrice1 * (discount / 10)" style="width: 90px"></el-input>
                    <el-input
                      placeholder="应付金额"
                      :value="TotalPrice1 * (discount / 10)"
                      style="width: 90px"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="付款类型" prop="payType">
                    <el-select style="width: 120px" v-model="payType" placeholder="请选择付款类型">
                      <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
                        :value="dict.value"></el-option>
                    <el-select
                      style="width: 120px"
                      v-model="payType"
                      placeholder="请选择付款类型"
                    >
                      <el-option
                        v-for="dict in dict.type.dict_pay_type"
                        :key="dict.value"
                        :label="dict.label"
                        :value="dict.value"
                      ></el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item>
                    <el-button type="primary" @click="submitPrice" :disabled="confirm"
                      style="margin-top: 34px">收费</el-button>
                    <el-button
                      type="primary"
                      @click="submitPrice"
                      :disabled="confirm"
                      style="margin-top: 34px"
                      >收费</el-button
                    >
                  </el-form-item>
                </el-form>
              </div>
              <div style="text-align: center; margin-bottom: 10px">
                已选项目列表
              </div>
              <div style="
              <div
                style="
                  padding: 0px 6px;
                  border: 1px solid #e6ebf5;
                  max-height: 420px;
                  overflow: auto;
                ">
                "
              >
                <el-collapse v-model="activeName" accordion>
                  <div v-for="(item, index) in DataList" :key="index">
                    <el-collapse-item>
                      <template slot="title">
                        {{ item.proName + "(" + "原价" + item.proPrice + ")" }}
                      </template>
                      <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
                        <el-table-column prop="proName" label="项目" width="180">
                      <el-table
                        :data="item.tjProjectList"
                        border
                        style="width: 100%"
                        height="250"
                      >
                        <el-table-column
                          prop="proName"
                          label="项目"
                          width="180"
                        >
                        </el-table-column>
                        <el-table-column prop="proPrice" label="原价">
                        </el-table-column>
@@ -278,7 +544,11 @@
                  <div>
                    <el-collapse-item title="请选择项目">
                      <el-table :data="DataList" border style="width: 100%">
                        <el-table-column prop="proName" label="项目" width="180">
                        <el-table-column
                          prop="proName"
                          label="项目"
                          width="180"
                        >
                        </el-table-column>
                        <el-table-column prop="ordPrice" label="原价">
                        </el-table-column>
@@ -294,17 +564,35 @@
    </el-dialog>

    <!-- 添加补录项目 -->
    <el-dialog :title="title" :visible.sync="Projectopen1" width="1200px" style="height: 860px" append-to-body>
    <el-dialog
      :title="title"
      :visible.sync="Projectopen1"
      width="1200px"
      style="height: 860px"
      append-to-body
    >
      <el-row type="flex" class="row-bg" justify="space-around">
        <el-col :span="8">
          <div style="text-align: center; margin-bottom: 10px;margin-top:10px">项目列表</div>
          <div
            style="text-align: center; margin-bottom: 10px; margin-top: 10px"
          >
            项目列表
          </div>
          <el-input placeholder="输入关键字进行过滤" v-model="filterText">
          </el-input>
          <div class="tab3">
            <div class="outside1">

              <el-tree class="filter-tree" v-loading="loading" :data="Treedata" show-checkbox node-key="proId"
                :props="defaultProps" @check-change="handleCurrentChecked" :filter-node-method="filterNode" ref="tree">
              <el-tree
                class="filter-tree"
                v-loading="loading"
                :data="Treedata"
                show-checkbox
                node-key="proId"
                :props="defaultProps"
                @check-change="handleCurrentChecked"
                :filter-node-method="filterNode"
                ref="tree"
              >
              </el-tree>
            </div>
          </div>
@@ -326,42 +614,76 @@
            <div class="outside">
              <el-form :inline="true" class="outside1">
                <el-form-item label="原价">
                  <el-input placeholder="原价" :value="TotalPrice1" disabled style="width: 90px"></el-input>
                  <el-input
                    placeholder="原价"
                    :value="TotalPrice1"
                    disabled
                    style="width: 90px"
                  ></el-input>
                </el-form-item>
                <el-form-item label="折扣设定">
                  <el-input style="width: 90px" type="number" v-model="discount" :value="discount"></el-input>
                  <el-input
                    style="width: 90px"
                    type="number"
                    v-model="discount"
                    :value="discount"
                  ></el-input>
                </el-form-item>
                <el-form-item label="应付金额">
                  <el-input placeholder="应付金额" :value="TotalPrice1 * (discount / 10)" style="width: 90px"></el-input>
                  <el-input
                    placeholder="应付金额"
                    :value="TotalPrice1 * (discount / 10)"
                    style="width: 90px"
                  ></el-input>
                </el-form-item>
                <el-form-item label="付款类型" prop="payType">
                  <el-select style="width: 120px" v-model="payType" placeholder="请选择付款类型">
                    <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
                      :value="dict.value"></el-option>
                  <el-select
                    style="width: 120px"
                    v-model="payType"
                    placeholder="请选择付款类型"
                  >
                    <el-option
                      v-for="dict in dict.type.dict_pay_type"
                      :key="dict.value"
                      :label="dict.label"
                      :value="dict.value"
                    ></el-option>
                  </el-select>
                </el-form-item>
                <el-form-item>
                  <el-button type="primary" @click="submitPrice1" :disabled="confirm"
                    style="margin-top: 34px">收费</el-button>
                  <el-button
                    type="primary"
                    @click="submitPrice1"
                    :disabled="confirm"
                    style="margin-top: 34px"
                    >收费</el-button
                  >
                </el-form-item>
              </el-form>
            </div>
            <div style="text-align: center; margin-bottom: 10px">
              已选项目列表
            </div>
            <div style="
            <div
              style="
                padding: 0px 6px;
                border: 1px solid #e6ebf5;
                max-height: 420px;
                overflow: auto;
              ">
              "
            >
              <el-collapse v-model="activeName" accordion>
                <div v-for="(item, index) in DataList" :key="index">
                  <el-collapse-item>
                    <template slot="title">
                      {{ item.proName + "(" + "原价" + item.proPrice + ")" }}
                    </template>
                    <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
                    <el-table
                      :data="item.tjProjectList"
                      border
                      style="width: 100%"
                      height="250"
                    >
                      <el-table-column prop="proName" label="项目" width="180">
                      </el-table-column>
                      <el-table-column prop="proPrice" label="原价">
@@ -439,7 +761,9 @@
  gettoPdf,
  getPdf,
  getOrderList,
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
import { getwater } from "@/api/hosp/customer";
import ViewPdf from "@/components/ViewPdf";
import { projectGetList, getaddtTransition } from "@/api/system/tijian";
@@ -451,7 +775,7 @@
  name: "Order",
  data() {
    return {
      filterText: '',
      filterText: "",
      orderIds: "",
      tjnumbers: "",
      cusIds: "",
@@ -563,11 +887,12 @@
  watch: {
    filterText(val) {
      this.$refs.tree.filter(val);
    }
    },
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  mounted() {
    this.$nextTick(() => {
@@ -575,41 +900,50 @@
    });
  },
  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")
          ];;
        console.log(this.createTimeList,111);
      });
    },
    filterNode(value, data) {
      if (!value) return true;
      return data.proName.indexOf(value) !== -1;
    },
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date(new Date().setHours(0, 0, 0, 0)).getTime();
      var dayNum = 7 * 24 * 3600 * 1000;
      var threeDays = curDate - dayNum;
      var sDay = this.getLocalTime(threeDays);
      var end = this.getLocalTime(curDate);
      this.createTimeList = [sDay, end];
    },
    add0(m) {
      return m < 10 ? "0" + m : m;
    },
    getLocalTime(nS) {
      var time = new Date(nS);
      var y = time.getFullYear();
      var m = time.getMonth() + 1;
      var d = time.getDate();
      var h = time.getHours();
      var mm = time.getMinutes();
      return (
        y +
        "-" +
        this.add0(m) +
        "-" +
        this.add0(d) +
        " " +
        this.add0(h) +
        ":" +
        this.add0(mm)
      );
    },
    // getNowTime() {
    //   var curDate = new Date(new Date().setHours(0, 0, 0, 0)).getTime();
    //   var dayNum = 7 * 24 * 3600 * 1000;
    //   var threeDays = curDate - dayNum;
    //   var sDay = this.getLocalTime(threeDays);
    //   var end = this.getLocalTime(curDate);
    //   this.createTimeList = [sDay, end];
    // },
    // add0(m) {
    //   return m < 10 ? "0" + m : m;
    // },
    // getLocalTime(nS) {
    //   var time = new Date(nS);
    //   var y = time.getFullYear();
    //   var m = time.getMonth() + 1;
    //   var d = time.getDate();
    //   var h = time.getHours();
    //   var mm = time.getMinutes();
    //   return (
    //     y +
    //     "-" +
    //     this.add0(m) +
    //     "-" +
    //     this.add0(d) +
    //     " " +
    //     this.add0(h) +
    //     ":" +
    //     this.add0(mm)
    //   );
    // },
    dateChangebirthday1(val) {
      this.startTime = val;
    },
@@ -621,6 +955,9 @@
      if (this.startTime) {
        this.queryParams.djbeginTime = this.startTime[0];
        this.queryParams.djendTime = this.startTime[1];
      }else{
         this.queryParams.djbeginTime = this.createTimeList[0];
        this.queryParams.djendTime = this.createTimeList[1];
      }
      if (this.startTime1) {
        this.queryParams.bgbeginTime = this.startTime1[0];
@@ -895,10 +1232,9 @@
        this.list1 = false;
        this.DataList.forEach((item) => {
          this.TotalPrice1 = item.proPrice + this.TotalPrice1;
          item.tjProjectList.forEach(item1 => {
          item.tjProjectList.forEach((item1) => {
            this.proIds.push(item1.proId);
          })

          });
        });
      }
    },

 src/views/hosp/settlement/index.vue

@@ -1,59 +1,159 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="100px"
    >
      <el-row>
        <el-col :span="6">
      <el-form-item label="收费员" prop="tollCollectorName" style="display: flex;">
        <el-input v-model="queryParams.tollCollectorName" placeholder="请输入收费员" clearable @keyup.enter.native="handleQuery"
          />
      </el-form-item>
      </el-col>
      <el-col :span="15">
      <el-form-item label="结账时间" prop="tollCollectorName" style="display: flex;">
        <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-col>
    </el-row>
          <el-form-item
            label="收费员"
            prop="tollCollectorName"
            style="display: flex"
          >
            <el-input
              v-model="queryParams.tollCollectorName"
              placeholder="请输入收费员"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="15">
          <el-form-item
            label="结账时间"
            prop="tollCollectorName"
            style="display: flex"
          >
            <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-col>
      </el-row>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleUpdate">统计</el-button>
        <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>

    <el-table :data="dataList" border style="width: 75%">
      <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-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">
      <div class="pag1">
        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
          @pagination="handleUpdate" />
        <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>
@@ -66,6 +166,7 @@
<script>
import { getLastTime, getList, collector, getNewDate } from "@/api/hosp/water";
import { getInfo } from "@/api/login";
import { getNewDateList } from "@/api/hosp/order";
import moment from "moment";

export default {
@@ -120,8 +221,18 @@
  },
  created() {
    this.getList();
    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"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    /** 查询体检流水列表 */
    getList() {
      this.loading = true;
@@ -129,37 +240,36 @@
        this.userId = response.user.userId;
        this.queryParams.tollCollectorName = response.user.nickName;
      });
      getLastTime().then((response) => {
        if (response.code === 200) {
          this.time = response.data;
          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")
              ];
            }
          });
        }
      });

      // getLastTime().then((response) => {
      //   if (response.code === 200) {
      //     this.time = response.data;
      //     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")
      //         ];
      //       }
      //     });
      //   }
      // });
    },
    // 时间
    dateChangebirthday1(val) {
      this.value1 = val;
      console.log(this.value1)
      console.log(this.value1);
    },

    /** 统计 */
    handleUpdate() {
      this.loading = true;
    

      let data = {
        pageNum: this.queryParams.pageNum,
        pageSize: this.queryParams.pageSize,
        userId: this.userId.toString(),
        beginTime: this.value1[0],
        endTime: this.value1[1]
        endTime: this.value1[1],
      };
      getList(data).then((res) => {
        this.dataList = res.data.list;

 src/views/sampling/sampling/index.vue

@@ -10,7 +10,7 @@
    >
      <el-form-item label="体检号" prop="tjNum">
        <el-input
        ref="inputName"
          ref="inputName"
          v-model="queryParams.tjNum"
          placeholder="请输入体检号"
          clearable
@@ -32,8 +32,9 @@
        <el-date-picker
          v-model="createTimeList"
          @change="dateChangebirthday1"
          style="width: 240px"
          value-format="yyyy-MM-dd"
          :default-time="['00:00:00', '23:00:00']"
          format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
@@ -78,24 +79,23 @@
        >
      </el-form-item>
    </el-form>
    <el-row :gutter="10" class="mb8" >
    <el-row :gutter="10" class="mb8">
      <el-col :span="10">
        <el-radio-group
      v-model="tjStatus"
      @input="radioChange"
      style="margin: 10px 15px"
    >
      <el-radio-button label="1">未采样</el-radio-button>
      <el-radio-button label="0">已采样</el-radio-button>
    </el-radio-group>
      </el-col >
            <el-col :span="12" v-if="tableList.length > 1 && tjStatus==0">
                <el-button type="primary" plain 
                    v-hasPermi="['hosp:detail:add']">合并样本</el-button>
            </el-col>

        </el-row>
   
          v-model="tjStatus"
          @input="radioChange"
          style="margin: 10px 15px"
        >
          <el-radio-button label="1">未采样</el-radio-button>
          <el-radio-button label="0">已采样</el-radio-button>
        </el-radio-group>
      </el-col>
      <el-col :span="12" v-if="tableList.length > 1 && tjStatus == 0">
        <el-button type="primary" plain v-hasPermi="['hosp:detail:add']"
          >合并样本</el-button
        >
      </el-col>
    </el-row>

    <div style="width: 100%; margin-left: 10px; display: flex">
      <div style="width: 40%; margin-right: 20px">
@@ -131,7 +131,7 @@
            <!-- <template slot-scope="scope">
              {{ scope.row.customer.cusSex === 0 ? "男" : "女" }}
            </template> -->
              <template slot-scope="scope">
            <template slot-scope="scope">
              <span v-if="scope.row.cusSex == '0'">男</span>
              <span v-if="scope.row.cusSex == '1'">女</span>
              <span v-if="scope.row.cusSex == '2'">未知</span>
@@ -156,7 +156,6 @@
        </el-table>
      </div>
      <div style="width: 50%">
       
        <el-table
          v-loading="loading"
          :data="tableList"
@@ -175,7 +174,12 @@
                    <span>{{ parseTime(scope.row.tjTime, '{y}-{m}-{d}') }}</span>
                </template>
            </el-table-column> -->
          <el-table-column label="标本类型" align="center" prop="specimenType" width="120">
          <el-table-column
            label="标本类型"
            align="center"
            prop="specimenType"
            width="120"
          >
            <template slot-scope="scope">
              <dict-tag
                :options="dict.type.sys_dict_specimen"
@@ -184,15 +188,31 @@
            </template>
          </el-table-column>
          <el-table-column label="项目名称" align="center" prop="proName" />
          <el-table-column label="性别" align="center" prop="proSex" width="90" />
          <el-table-column label="空腹" align="center" prop="proCheckMethod" width="90" />
          <el-table-column
            label="性别"
            align="center"
            prop="proSex"
            width="90"
          />
          <el-table-column
            label="空腹"
            align="center"
            prop="proCheckMethod"
            width="90"
          />
          <el-table-column
            label="采样编号"
            align="center"
            prop="samplingNumber"
            :show-overflow-tooltip="true" width="120"
            :show-overflow-tooltip="true"
            width="120"
          />
          <el-table-column label="采样状态" align="center" prop="isSignFor" width="90">
          <el-table-column
            label="采样状态"
            align="center"
            prop="isSignFor"
            width="90"
          >
            <template slot-scope="scope">
              <dict-tag
                :options="dict.type.sampling_type"
@@ -265,6 +285,8 @@
  updateSampling,
  confirmSampling,
} from "@/api/sampling/sampling";
import { getNewDateList } from "@/api/hosp/order";
import moment from "moment";

export default {
  dicts: [
@@ -357,8 +379,9 @@
    };
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  mounted() {
    this.$nextTick(() => {
@@ -366,6 +389,15 @@
    });
  },
  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"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    handleSizeChange(val) {
      this.size = val;
      this.page = 1;
@@ -405,7 +437,7 @@
      this.queryParams.endTime = this.createTimeList[1];
      getList(this.queryParams).then((response) => {
        if (response.data) {
           if (response.data.list == null) {
          if (response.data.list == null) {
            this.samplingList = [];
            this.tableList = [];
            this.loading = false;
@@ -455,9 +487,9 @@
      };
      this.resetForm("form");
    },
    hb(){
    hb() {
      console.log(this.queryParams.tjNum);
       if (this.queryParams.tjNum != null) {
      if (this.queryParams.tjNum != null) {
        this.handleQuery();
      }
    },
@@ -531,7 +563,6 @@
      this.loading = true;
      this.queryParams.isSignFor = value;
      getList(this.queryParams).then((response) => {

        if (response.data) {
          if (response.data.list == null) {
            this.samplingList = [];
@@ -550,10 +581,10 @@
          }
          this.total = response.data.total;
          this.loading = false;
        }else{
           this.samplingList= [];
           this.tableList = [];
           this.loading = false;
        } else {
          this.samplingList = [];
          this.tableList = [];
          this.loading = false;
        }
      });
    },

 src/views/system/Checkout/index.vue

@@ -33,8 +33,9 @@
          clearable
          v-model="createTimeList"
          @change="dateChangebirthday1"
          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="开始日期"
@@ -390,7 +391,9 @@
  goOut,
  getPdf,
  goabandon,
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
import { getwater } from "@/api/hosp/customer";
import ViewPdf from "@/components/ViewPdf";
import { projectGetList, getaddtTransition } from "@/api/system/tijian";
@@ -519,8 +522,9 @@
    };
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  mounted() {
    this.$nextTick(() => {
@@ -528,6 +532,15 @@
    });
  },
  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"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date().getTime();
@@ -552,8 +565,14 @@
    },
    /** 查询体检记录列表 */
    getList() {
      this.queryParams.djbeginTime = this.startTime[0];
      this.queryParams.djendTime = this.startTime[1];
      if (this.startTime) {
        this.queryParams.djbeginTime = this.startTime[0];
        this.queryParams.djendTime = this.startTime[1];
      } else {
        this.queryParams.djbeginTime = this.createTimeList[0];
        this.queryParams.djendTime = this.createTimeList[1];
      }

      this.loading = true;
      getQianLiList(this.queryParams).then((response) => {
        this.orderList = response.data.list;
@@ -637,15 +656,15 @@
      };
      this.resetForm("form");
    },
    hb(){
       if (this.queryParams.tjNum != undefined) {
    hb() {
      if (this.queryParams.tjNum != undefined) {
        this.handleQuery();
      }
    },
    /** 搜索按钮操作 */
    handleQuery() {
        this.queryParams.pageNum = 1;
        this.getList();
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {

 src/views/system/bill/index.vue

@@ -468,7 +468,9 @@
  hasReport,
  hasPrintCode,
  getOrderList,
  getNewDateList
} from "@/api/hosp/order";
import moment from "moment";
import ViewPdf from "@/components/ViewPdf";
import { projectGetList, getOrder } from "@/api/system/tijian";
import { SubmitCompany, getCompany, queryCompany } from "@/api/team/tuanti";
@@ -632,9 +634,10 @@
    };
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.Company();
    this.getdate();
  },
  mounted() {
    this.$nextTick(() => {
@@ -642,6 +645,15 @@
    });
  },
  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"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date().getTime();

 src/views/system/invoice/index.vue

@@ -17,7 +17,9 @@
        <el-col :span="10">
          <el-form-item label="登记时间" prop="createTimeList" style="display: flex;" label-width="116px">
            <el-date-picker clearable style="width:100%" v-model="createTimeList" @change="dateChangebirthday1"
              value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期"
               :default-time="['00:00:00', '23:00:00']"
              format="yyyy-MM-dd HH:mm:ss"
              value-format="yyyy-MM-dd HH:mm:ss" type="daterange" range-separator="-" start-placeholder="开始日期"
              end-placeholder="结束日期" :picker-options="pickerOptions"></el-date-picker>
          </el-form-item>
        </el-col>
@@ -199,6 +201,10 @@
</template>
  
<script>
import {
  getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
import { getPrintOrderList, addOrder } from "@/api/system/invoice";
import { getwater } from "@/api/hosp/customer";
import ViewPdf from "@/components/ViewPdf";
@@ -329,8 +335,9 @@
  },
  created() {
    this.queryParams.name = this.$route.query.paramName
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  mounted() {
    this.$nextTick(() => {
@@ -338,6 +345,15 @@
    });
  },
  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")
          ];
        console.log(this.createTimeList,111);
      });
    },
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date().getTime();
@@ -362,8 +378,14 @@
    },
    /** 查询体检记录列表 */
    getList() {
      this.queryParams.djbeginTime = this.startTime[0];
      if (this.startTime) {
        this.queryParams.djbeginTime = this.startTime[0];
      this.queryParams.djendTime = this.startTime[1];
      }else{
         this.queryParams.djbeginTime = this.createTimeList[0];
        this.queryParams.djendTime = this.createTimeList[1];
      }
      
      this.queryParams.type = 0;
      this.loading = true;
      getPrintOrderList(this.queryParams).then((response) => {