su
su1124
2023-09-14 4b94f114e561e0d53633259a04b3f4f71e293f1f
su
5个文件已修改
280 ■■■■ 已修改文件
src/views/doctor/checkAll/index.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/examination/index.vue 224 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/user/index.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/visit/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/checkAll/index.vue
@@ -133,7 +133,6 @@
              type="text"
              size="mini"
              @click="
                dialogVisible = true;
                viewReport(scope.row);
              "
              v-if="scope.row.tjStatus == '1'"
@@ -663,10 +662,20 @@
      const flag = true;
      getPdf(tjNumber, flag).then((response) => {
        if (response.size === 0) {
          const loading = this.$loading({
          lock: true,
          text: 'Loading',
          spinner: 'el-icon-loading',
          background: 'rgba(0, 0, 0, 0.7)'
        });
        setTimeout(() => {
          loading.close();
        }, 3000);
          this.$message.error("该用户体检报告暂未完成!");
          this.dialogVisible = false;
        } else {
          this.dialogVisible = true;
          this.url = window.webkitURL.createObjectURL(response); //将后端返回的blob文件读取出url
        }
      });
src/views/doctor/examination/index.vue
@@ -1,142 +1,61 @@
<template>
  <div class="app-container">
    <el-form
      :model="queryParams"
      ref="queryForm"
      size="small"
      :inline="true"
      label-width="68px"
    >
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
      <el-form-item label="体检号" prop="tjNumber">
        <el-input
          v-model="queryParams.tjNumber"
          placeholder="请输入体检号"
          clearable
          @keyup.enter.native="handleQuery"
          style="width: 170px"
        />
        <el-input v-model="queryParams.tjNumber" placeholder="请输入体检号" clearable @keyup.enter.native="handleQuery" style="width: 170px"/>
      </el-form-item>
      <el-form-item label="姓名" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入姓名"
          clearable
          @keyup.enter.native="handleQuery"
          style="width: 110px"
        />
        <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" style="width: 110px"/>
      </el-form-item>
      <el-form-item label="登记时间" prop="createTimeList">
        <el-date-picker v-model="createTimeList" 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>
        <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-radio-group
      v-model="checkStatus"
      @input="radioChange"
      style="margin: 10px 15px"
    >
    <el-radio-group v-model="checkStatus" @input="radioChange" style="margin: 10px 15px">
      <el-radio-button label="0">未审核</el-radio-button>
      <el-radio-button label="1">已审核</el-radio-button>
    </el-radio-group>
    <div style="width: 100%; margin-left: 10px; display: flex">
      <div style="width: 40%; margin-right: 20px">
        <el-table
          id="ta"
          v-loading="loading"
          ref="tb"
          :data="exaList"
          border
          height="520px"
          @selection-change="handleSelectionChange"
          :row-class-name="tableRowClassName"
        >
        <el-table id="ta" v-loading="loading" ref="tb" :data="exaList" border height="520px" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
          <el-table-column type="selection" width="40" align="center" />
          <el-table-column
            label="体检号"
            align="center"
            prop="tjNumber"
            width="160px"
          />
          <el-table-column
            label="姓名"
            align="center"
            prop="cusName"
            width="80px"
          />
          <el-table-column
            label="性别"
            align="center"
            prop="cusSex"
            width="60px"
          >
          <el-table-column label="体检号" align="center" prop="tjNumber" width="160px"/>
          <el-table-column label="姓名" align="center" prop="cusName" width="80px"/>
          <el-table-column label="性别" align="center" prop="cusSex" width="60px">
            <template slot-scope="scope">
              <!-- {{scope.row.customer.cusSex}} -->
              {{ scope.row.cusSex === 0 ? "男" : "女" }}
              <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> -->
            </template>
          </el-table-column>
          <el-table-column
            label="手机号"
            align="center"
            prop="cusPhone"
            width="120px"
          />
          <el-table-column
            v-if="checkStatus == '1'"
            label="审核状态"
            align="center"
            prop="confirmStatus"
            width="110px"
          >
          <el-table-column label="手机号" align="center" prop="cusPhone" width="120px"/>
          <el-table-column label="登记时间" align="center" prop="tjTime" width="120px"/>
          <el-table-column v-if="checkStatus == '1'" label="审核状态" align="center" prop="confirmStatus" width="110px">
            <template slot-scope="scope">
              <span
                :style="{
                  color:
                    scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
                }"
                v-if="scope.row.confirmStatus == '301'"
                >已通过</span
              >
              <span
                :style="{
                  color:
                    scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
                }"
                v-if="scope.row.confirmStatus == '299'"
                >已驳回</span
              >
              <span :style="{ color: scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',}" v-if="scope.row.confirmStatus == '301'">已通过</span>
              <span :style="{ color: scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',}" v-if="scope.row.confirmStatus == '299'">已驳回</span>
            </template>
          </el-table-column>
          <el-table-column label="操作" align="center">
          <el-table-column label="操作" align="center" >
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="text"
                v-hasPermi="['reservation:reservation:edit']"
                v-show="
                  scope.row.confirmStatus == '299' ||
                  scope.row.confirmStatus == 288
                "
                @click="tongguo(scope.row)"
                >通过</el-button
              >
                v-show=" scope.row.confirmStatus == '299' || scope.row.confirmStatus == 288"
                @click="tongguo(scope.row)">通过</el-button
>
              <el-button
                size="mini"
                type="text"
                v-hasPermi="['reservation:reservation:edit']"
                v-show="
                  scope.row.confirmStatus == '301' ||
                  scope.row.confirmStatus == 288
                "
                v-show=" scope.row.confirmStatus == '301' || scope.row.confirmStatus == 288"
                @click="bohui(scope.row)"
                >撤销</el-button
              >
@@ -170,6 +89,7 @@
            align="center"
            prop="type"
            :show-overflow-tooltip="true"
            width="60"
          >
            <template slot-scope="scope">
              <span v-if="scope.row.type == '0'">未检</span>
@@ -178,17 +98,13 @@
              <span v-if="scope.row.type == '3'">延期</span>
            </template>
          </el-table-column>
          <el-table-column
            label="检查医生"
            align="center"
            prop="doctorName"
            width="120"
          />
          <el-table-column
            label="收费方式"
            align="center"
            prop="sffs"
            :show-overflow-tooltip="true"
            width="80"
          />
          <el-table-column
            label="是否收费"
@@ -196,24 +112,30 @@
            prop="isPay"
            :show-overflow-tooltip="true"
          />
          <el-table-column
          <!-- <el-table-column
            label="签到时间"
            align="center"
            prop="qdcreateTime"
            width="160"
          /> -->
          <el-table-column
            label="检查医生"
            align="center"
            prop="doctorName"
            width="100"
          />
          <el-table-column
            label="保存时间"
            label="检查时间"
            align="center"
            prop="bcupdateTime"
            width="160"
          />
          <el-table-column
          <!-- <el-table-column
            label="保存医生"
            align="center"
            prop="bcdoctorName"
            width="120"
          />
          /> -->
          <el-table-column
            label="最后修改时间"
            align="center"
@@ -223,7 +145,7 @@
        </el-table>
      </div>
    </div>
    <div style="margin-right: 58%">
    <div style="margin-right: 67%">
      <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page"
                :page-sizes="pageSize" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
            </el-pagination> -->
@@ -244,6 +166,7 @@
  dicts: ["dict_tj_status"],
  data() {
    return {
      createTimeList: "",
      total: 0,
      loading: true,
      // 查询参数
@@ -269,14 +192,83 @@
      selectList: [],
      tg: true,
      bh: true,
      pickerOptions: {
        shortcuts: [
          {
            text: "最近一周",
            onClick(picker) {
              const end = new Date();
              const start = new Date();
              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
              picker.$emit("pick", [start, end]);
            },
          },
          {
            text: "最近一个月",
            onClick(picker) {
              const end = new Date();
              const start = new Date();
              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
              picker.$emit("pick", [start, end]);
            },
          },
          {
            text: "最近三个月",
            onClick(picker) {
              const end = new Date();
              const start = new Date();
              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
              picker.$emit("pick", [start, end]);
            },
          },
        ],
      },
    };
  },
  created() {
    this.getList();
    // this.getNowTime();
  },
  methods: {
    // / 处理默认选中当前日期
    getNowTime() {
      var curDate = new Date().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;
    },
    getList() {
      this.queryParams.checkStatus = "0";
      this.queryParams.beginTime = this.createTimeList[0];
      this.queryParams.endTime = this.createTimeList[1];
      getCsList(this.queryParams).then((res) => {
        if (res.data) {
          this.exaList = res.data.customers;
src/views/system/user/index.vue
@@ -78,7 +78,7 @@
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
        </el-row>
        <el-table v-loading="loading" :data="userList" border @selection-change="handleSelectionChange"
        <el-table  :data="userList" border @selection-change="handleSelectionChange" v-loading="loading"
          highlight-current-row>
          <el-table-column type="selection" width="50" align="center" fixed="left" />
          <el-table-column label="序号" align="center" key="newID" prop="newID" width="50px" fixed="left" />
@@ -657,9 +657,9 @@
      :visible.sync="dialogVisible1"
      width="30%"
      :before-close="handleClose">
      <el-form>
      <el-form :rules="rules1">
        <span>请输入“{{row.userName}}”的新密码</span>
        <el-form-item>
        <el-form-item prop="password">
          <el-input v-model="password" :type="type" auto-complete="off" placeholder="密码" ref="barcodeMsg">
            <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
            <i slot="suffix" class="icon-style" :class="elIcon" autocomplete="auto" @click="flag = !flag" /></el-input>
@@ -858,6 +858,17 @@
          },
        ],
      },
      rules1: {
        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" },
          {
            min: 5,
            max: 20,
            message: "用户密码长度必须介于 5 和 20 之间",
            trigger: "blur",
          },
        ],
      },
    };
  },
  watch: {
@@ -877,12 +888,10 @@
  created() {
    this.getList();
    this.getDeptTree();
    this.getlistHosp();
    this.getPostList();
    this.getRoleList();
    this.getConfigKey("sys.user.initPassword").then((response) => {
      this.initPassword = response.msg;
    });
    // this.getRoleList();
    // this.getConfigKey("sys.user.initPassword").then((response) => {
    //   this.initPassword = response.msg;
    // });
  },
  methods: {
    handleChange(val) { },
@@ -898,12 +907,6 @@
              1;
          });
          this.userList = response.rows;
          // for(let key in this.userList){
          //   for(let i = 0; i < this.userList[key].length; i++){
          //     this.userList[key][i]["form"] = key;
          //     this.userInfoList.push(this.userList[key][i])
          //   }
          // }
          this.total = response.total;
          this.loading = false;
        }
@@ -925,11 +928,9 @@
    },
    /** 查询院区信息列表 */
    getlistHosp() {
      this.loading = true;
      listHosp(this.queryParams).then((response) => {
        this.hospList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
@@ -1043,6 +1044,8 @@
      this.reset();
      this.open = true;
      this.title = "用户信息维护";
      this.getPostList();
      this.getlistHosp();
      // getUser().then((response) => {
      //   this.postOptions = response.posts;
      //   this.roleOptions = response.roles;
@@ -1073,6 +1076,8 @@
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.getPostList();
      this.getlistHosp();
      this.reset();
      this.form = row;
      // this.form.userInfo.id = null;
src/views/system/visit/index.vue
@@ -49,7 +49,7 @@
    <template>
      <el-table border style="margin: 14px; width: 99%" v-loading="loading" :data="orderList"
        @selection-change="handleSelectionChange" ref="multipleTable">
        <el-table-column type="selection" width="40px" align="center" height="10px" fixed="left" />
        <!-- <el-table-column type="selection" width="40px" align="center" height="10px" fixed="left" /> -->
        <el-table-column label="序号" align="center" prop="newID" width="50px" fixed="left" height="10px" />
        <el-table-column label="姓名" align="center" prop="tjCustomerName" height="10px" width="90px" fixed="left"
          :show-overflow-tooltip="true" />
vue.config.js
@@ -35,7 +35,7 @@
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        target: `http://192.168.0.100:5011`,
        target: `http://192.168.0.101:5011`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''