su
su1124
2023-09-13 ba6e43f9c2b2c4724b961e584de89546b4b21f32
su
7个文件已修改
676 ■■■■ 已修改文件
src/api/system/user.js 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/public/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/history/index.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sampling/sampling/index.vue 187 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/bill/index.vue 376 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/user/index.vue 75 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/system/user.js
@@ -47,12 +47,12 @@
}
// 用户密码重置
export function resetUserPwd(userId, password) {
  password = encrypt(password);
  const data = {
    userId,
    password
  }
export function resetUserPwd(data) {
  // password = encrypt(password);
  // const data = {
  //   userId,
  //   password
  // }
  return request({
    url: '/system/user/resetPwd',
    method: 'put',
src/components/public/index.vue
@@ -1,7 +1,8 @@
<template>
    <div>
        <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
            <h3 v-if="fList.proResult ">检测结果 :{{ fList.proResult }}</h3>
            <h3 v-if="fList.proResult ">检测项目 :{{ fList.project.proName }}</h3>
            <h3 v-if="fList.proResult ">检测结果 :{{ fList.proResult }}{{fList.project.proMetering}}</h3>
            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
                <el-form-item label="病种名称" prop="bingzhong">
                    <el-input v-model="queryParams.bingzhong" placeholder="请输入简称" clearable
@@ -74,6 +75,7 @@
        'row'(val, newVla) {
            // console.log(val,newVla)
            this.fList = val
            console.log(this.fList);
            // if (this.fList) {
            //     this.getList()
            // }
@@ -93,7 +95,7 @@
                // if (this.fList.proResult == "") {
                let data = {
                    proId: fList.proId,
                    ruleStr: fList.proResult,
                    // ruleStr: fList.proResult,
                }
                getlist(data).then(res => {
                    this.dataList = res.rows
src/views/hosp/history/index.vue
@@ -559,6 +559,24 @@
      let userId = selection.map((item) => item.userId);
      getInfoById(userId).then((response) => {
        this.form = response.data;
        if(this.form.xiyan == null){
          this.form.xiyan ="1"
        }
        if(this.form.xiyanpinlv == null){
          this.form.xiyanpinlv ="0"
        }
        if(this.form.xiyanyear == null){
          this.form.xiyanyear ="0"
        }
        if(this.form.yinjiu == null){
          this.form.yinjiu ="1"
        }
        if(this.form.yinjiupinlv == null){
          this.form.yinjiupinlv ="0"
        }
        if(this.form.yinjiuyear == null){
          this.form.yinjiuyear ="0"
        }
        this.form.tjAskHistorysList = response.data.tjAskHistorysList;
        // this.isdisabled= true
      });
src/views/sampling/sampling/index.vue
@@ -1,18 +1,43 @@
<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="tjNum">
        <el-input v-model="queryParams.tjNum" placeholder="请输入体检号" clearable @keyup.enter.native="handleQuery"
          style="width: 170px" />
        <el-input
          v-model="queryParams.tjNum"
          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="applicationTime">
        <el-date-picker clearable v-model="createTimeList" @change="dateChangebirthday1" style="width: 240px"
          value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
          :picker-options="pickerOptions"></el-date-picker>
        <el-date-picker
          v-model="createTimeList"
          @change="dateChangebirthday1"
          style="width: 240px"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          :picker-options="pickerOptions"
        ></el-date-picker>
      </el-form-item>
      <!-- <el-form-item label="是否采样" prop="isSignFor">
                    <el-select style="width:100px" v-model="queryParams.isSignFor" placeholder="是否采样">
@@ -32,33 +57,84 @@
                <el-input v-model="queryParams.proName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" style="width: 140px;"/>
            </el-form-item> -->
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
        <el-button type="primary" icon="el-icon-thumb" size="mini" @click="Confirmreceipt">确认采样</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
          type="primary"
          icon="el-icon-thumb"
          size="mini"
          @click="Confirmreceipt"
          >确认采样</el-button
        >
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
          >重置</el-button
        >
      </el-form-item>
    </el-form>
    <el-radio-group v-model="tjStatus" @input="radioChange" style="margin: 10px 15px">
    <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>
    <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="samplingList" @selection-change="handleSelectionChange"
          border height="520px" :row-class-name="tableRowClassName">
        <el-table
          id="ta"
          v-loading="loading"
          ref="tb"
          :data="samplingList"
          @selection-change="handleSelectionChange"
          border
          height="520px"
          :row-class-name="tableRowClassName"
        >
          <el-table-column type="selection" width="40" align="center" />
          <el-table-column label="体检号" align="center" prop="customer.tjNumber" width="160px" />
          <el-table-column label="姓名" align="center" prop="customer.cusName" width="80px" />
          <el-table-column label="性别" align="center" prop="customer.cusSex" width="60px">
          <el-table-column
            label="体检号"
            align="center"
            prop="customer.tjNumber"
            width="160px"
          />
          <el-table-column
            label="姓名"
            align="center"
            prop="customer.cusName"
            width="80px"
          />
          <el-table-column
            label="性别"
            align="center"
            prop="customer.cusSex"
            width="60px"
          >
            <template slot-scope="scope">
              <!-- {{scope.row.customer.cusSex}} -->
              {{ scope.row.customer.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="customer.cusPhone" width="120px" />
          <el-table-column label="申请时间" align="center" prop="customer.applicationTime" width="210">
          <el-table-column
            label="手机号"
            align="center"
            prop="customer.cusPhone"
            width="120px"
          />
          <el-table-column
            label="申请时间"
            align="center"
            prop="customer.applicationTime"
            width="210"
          >
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.customer.applicationTime) }}</span>
            </template>
@@ -66,8 +142,16 @@
        </el-table>
      </div>
      <div style="width: 50%">
        <el-table v-loading="loading" :data="tableList" :span-method="objectSpanMethod" @selection-change="handleChange"
          border height="520px" ref="tab1" :row-class-name="tableRowClassName">
        <el-table
          v-loading="loading"
          :data="tableList"
          :span-method="objectSpanMethod"
          @selection-change="handleChange"
          border
          height="520px"
          ref="tab1"
          :row-class-name="tableRowClassName"
        >
          <el-table-column type="selection" width="40" align="center" />
          <!--  :selectable="selectEnable" -->
          <!-- <el-table-column label="是否签收" align="center" prop="isSignFor" /> -->
@@ -76,18 +160,29 @@
                    <span>{{ parseTime(scope.row.tjTime, '{y}-{m}-{d}') }}</span>
                </template>
            </el-table-column> -->
          <el-table-column label="标本类型" align="center" prop="specimenType">
          <el-table-column label="标本类型" align="center" prop="specimenType" width="120">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_dict_specimen" :value="scope.row.specimenType" />
              <dict-tag
                :options="dict.type.sys_dict_specimen"
                :value="scope.row.specimenType"
              />
            </template>
          </el-table-column>
          <el-table-column label="项目名称" align="center" prop="proName" />
          <el-table-column label="性别" align="center" prop="proSex" />
          <el-table-column label="空腹" align="center" prop="isEat" />
          <el-table-column label="采样编号" align="center" prop="samplingNumber" />
          <el-table-column label="采样状态" align="center" prop="isSignFor">
          <el-table-column label="性别" align="center" prop="proSex" width="90" />
          <el-table-column label="空腹" align="center" prop="isEat" width="90" />
          <el-table-column
            label="采样编号"
            align="center"
            prop="samplingNumber"
            :show-overflow-tooltip="true" width="120"
          />
          <el-table-column label="采样状态" align="center" prop="isSignFor" width="90">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sampling_type" :value="scope.row.isSignFor" />
              <dict-tag
                :options="dict.type.sampling_type"
                :value="scope.row.isSignFor"
              />
            </template>
          </el-table-column>
          <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -113,8 +208,13 @@
      <!-- <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> -->
      <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>
    <!-- 添加或修改体检采样管理对话框 -->
@@ -285,7 +385,13 @@
      this.queryParams.endTime = this.createTimeList[1];
      getList(this.queryParams).then((response) => {
        if (response.data) {
           if (response.data.list == null) {
            this.samplingList = [];
            this.tableList = [];
            this.loading = false;
          } else {
          this.samplingList = response.data.list;
            this.loading = false;
          if (this.samplingList.length != 0) {
            this.$nextTick(() => {
              this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
@@ -293,15 +399,14 @@
          } else {
            this.$refs.tb.clearSelection();
          }
          }
          this.total = response.data.total;
          this.loading = false;
        } else {
          this.samplingList = []
          this.tableList = []
          this.samplingList = [];
          this.tableList = [];
          this.loading = false;
        }
      });
    },
@@ -400,7 +505,15 @@
      this.loading = true;
      this.queryParams.isSignFor = value;
      getList(this.queryParams).then((response) => {
        if (response.data) {
          if (response.data.list == null) {
            this.samplingList = [];
            this.tableList = [];
            this.loading = false;
          } else {
        this.samplingList = response.data.list;
            this.loading = false;
        if (this.samplingList.length != 0) {
          this.$nextTick(() => {
            this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
@@ -408,8 +521,14 @@
        } else {
          this.$refs.tb.clearSelection();
        }
          }
        this.total = response.data.total;
        this.loading = false;
        }else{
           this.samplingList= [];
           this.tableList = [];
           this.loading = false;
        }
      });
    },
src/views/system/bill/index.vue
@@ -1,24 +1,64 @@
<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:100px"
          @keyup.enter.native="handleQuery" />
        <el-input
          ref="inputName"
          v-model="queryParams.name"
          placeholder="请输入姓名"
          style="width: 100px"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="体检号" prop="tjNum">
        <el-input style="width:170px" v-model="queryParams.tjNum" placeholder="请输入体检号" clearable
          @keyup.enter.native="handleQuery" />
        <el-input
          style="width: 170px"
          v-model="queryParams.tjNum"
          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: 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-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 label="单位名称" prop="firmId">
        <el-select :remote-method="getRemoteData" v-model="queryParams.firmId" value-key="drugManufacturerId" remote
          filterable placeholder="请选择单位名称" clearable @change="searchSelect">
          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName"
            :value="dict.drugManufacturerId" />
        <el-select
          :remote-method="getRemoteData"
          v-model="queryParams.firmId"
          value-key="drugManufacturerId"
          remote
          filterable
          placeholder="请选择单位名称"
          clearable
          @change="searchSelect"
        >
          <el-option
            v-for="dict in CompanyList"
            :key="dict.drugManufacturerId"
            :label="dict.cnName"
            :value="dict.drugManufacturerId"
          />
        </el-select>
      </el-form-item>
      <!-- <el-form-item label="报告时间" prop="reportTimeList">
@@ -29,23 +69,51 @@
          </el-form-item> -->
      <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-button type="primary" @click="handleReport" :disabled="single" size="mini"
        v-hasPermi="['hosp:order:export']">导检单</el-button>
      <el-button type="primary" size="mini" @click="Collection" :disabled="single">采血单</el-button>
    <el-row :gutter="10" class="mb8" style="margin-left:10px">
      <el-col :span="1.5">
        <el-button
        type="primary"
        @click="handleReport"
        :disabled="single"
        size="mini"
        v-hasPermi="['hosp:order:export']"
        >补打导检单</el-button
      >
      </el-col>
      <el-col :span="1.5">
        <el-button
        type="primary"
        size="mini"
        @click="Collection"
        :disabled="single"
        >条码生成</el-button
      >
      </el-col>
      <!-- <el-button type="primary" size="mini" :disabled="multiple" @click="viewReport">体检报告</el-button>
      <el-button type="primary" size="mini" :disabled="multiple" @click="printHandle">打印小票</el-button> -->
      <!-- <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-col> -->
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
      ></right-toolbar>
    </el-row>
    <!-- <div style="display:none">
      <div id="print" style="width:300px;height:54px;border: 1px solid red;">
@@ -57,39 +125,113 @@
      测试
    </div> -->
    <template>
      <el-table border style="margin: 14px; width: 99%" v-loading="loading"
        :default-sort="{ prop: 'createTime', order: 'descending' }" :data="orderList"
        @selection-change="handleSelectionChange" ref="multipleTable">
        <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"
          :show-overflow-tooltip="true" />
        <el-table-column label="性别" align="center" prop="tjCustomerSex" width="55px" height="10px"
          :show-overflow-tooltip="true">
      <el-table
        border
        style="margin: 14px; width: 99%"
        v-loading="loading"
        :default-sort="{ prop: 'createTime', order: 'descending' }"
        :data="orderList"
        @selection-change="handleSelectionChange"
        ref="multipleTable"
      >
        <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"
          :show-overflow-tooltip="true"
        />
        <el-table-column
          label="性别"
          align="center"
          prop="tjCustomerSex"
          width="55px"
          height="10px"
          :show-overflow-tooltip="true"
        >
          <template slot-scope="scope">
            <span v-if="scope.row.tjCustomerSex == '0'">男</span>
            <span v-if="scope.row.tjCustomerSex == '1'">女</span>
          </template>
        </el-table-column>
        <el-table-column label="年龄" align="center" prop="tjCustomerAge" height="10px" width="60px"
          :show-overflow-tooltip="true" />
        <el-table-column label="电话" align="center" prop="tjCustomerPhone" :show-overflow-tooltip="true" height="10px"
          width="110px" />
        <el-table-column label="体检类型" align="center" prop="tjType" height="10px" width="80px"
          :show-overflow-tooltip="true">
        <el-table-column
          label="年龄"
          align="center"
          prop="tjCustomerAge"
          height="10px"
          width="60px"
          :show-overflow-tooltip="true"
        />
        <el-table-column
          label="电话"
          align="center"
          prop="tjCustomerPhone"
          :show-overflow-tooltip="true"
          height="10px"
          width="110px"
        />
        <el-table-column
          label="体检类型"
          align="center"
          prop="tjType"
          height="10px"
          width="80px"
          :show-overflow-tooltip="true"
        >
          <template slot-scope="scope">
            <span v-if="scope.row.tjType == '1'">个人</span>
            <span v-if="scope.row.tjType == '2'">团队</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="pacName" height="10px" :show-overflow-tooltip="true"
          width="140px" />
        <el-table-column label="登记人" align="center" prop="createBy" height="10px" :show-overflow-tooltip="true"
          width="100px" />
        <el-table-column label="登记时间" align="center" prop="createTime" width="155px" height="10px" sortable
          :show-overflow-tooltip="true">
        <el-table-column
          label="体检号"
          align="center"
          prop="tjNumber"
          :show-overflow-tooltip="true"
          width="160px"
        />
        <el-table-column
          label="所选套餐"
          align="center"
          prop="pacName"
          height="10px"
          :show-overflow-tooltip="true"
          width="140px"
        />
        <el-table-column
          label="登记人"
          align="center"
          prop="createBy"
          height="10px"
          :show-overflow-tooltip="true"
          width="100px"
        />
        <el-table-column
          label="登记时间"
          align="center"
          prop="createTime"
          width="155px"
          height="10px"
          sortable
          :show-overflow-tooltip="true"
        >
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.createTime) }}</span>
          </template>
@@ -106,7 +248,13 @@
            <span>{{ parseTime(scope.row.reportTime) }}</span>
          </template>
        </el-table-column> -->
        <el-table-column label="备注" align="center" prop="remark" height="10px" :show-overflow-tooltip="true" />
        <el-table-column
          label="备注"
          align="center"
          prop="remark"
          height="10px"
          :show-overflow-tooltip="true"
        />
        <!-- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" height="10px"
          width="60px">
          <template slot-scope="scope">
@@ -115,19 +263,24 @@
          </template>
        </el-table-column> -->
      </el-table>
    </template>
    <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-drawer title="我是标题" :visible.sync="drawer" :with-header="false">
      <div class="drawer1">
        <div class="drawer2">
          <span>体检人:{{ gation.tjCustomerName }}</span><br />
          <span>体检人:{{ gation.tjCustomerName }}</span
          ><br />
          <span>联系电话:{{ gation.tjCustomerPhone }}</span>
        </div>
        <span class="drawer6">基本信息</span>
@@ -144,23 +297,46 @@
            <span>体检号:{{ gation.tjNumber }}</span>
            <span>报告时间:{{ gation.createTime }}</span>
            <span>体检时间:{{ gation.finishTime }}</span>
            <el-button type="primary" plain size="mini" @click="viewReport1">最近一次体检报告</el-button>
            <el-button type="primary" plain size="mini" @click="viewReport1"
              >最近一次体检报告</el-button
            >
          </div>
        </div>
        <span class="drawer6">调查问卷</span>
        <div>
          <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
          <el-form
            ref="form"
            :model="form"
            label-width="80px"
            style="margin-top: 20px"
          >
            <el-form-item label="调查结果:">
              <el-select v-model="value" placeholder="请选择调查结果">
                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                >
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="血压:" style="width: 300px" prop="pressure">
              <el-input v-model="form.pressure" placeholder="请输入血压"></el-input>
              <el-input
                v-model="form.pressure"
                placeholder="请输入血压"
              ></el-input>
            </el-form-item>
            <el-form-item label="低压:" placeholder="请输入低压" style="width: 300px" prop="lowPressure">
              <el-input v-model="form.lowPressure" placeholder="请输入低压"></el-input>
            <el-form-item
              label="低压:"
              placeholder="请输入低压"
              style="width: 300px"
              prop="lowPressure"
            >
              <el-input
                v-model="form.lowPressure"
                placeholder="请输入低压"
              ></el-input>
            </el-form-item>
            <div style="margin-left: 20px">
              <el-form-item label="1.是否吸烟">
@@ -201,31 +377,54 @@
      </div>
    </el-drawer>
    <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>
    <div style="
    <div
      style="
                position: absolute;
                bottom: 100px;
                left: 500px;
                width: 700px;
                display: none;
              ">
      "
    >
      <div id="printBill">
        <barcode :value="barcode" :height="40" :width="2" :margin="0">条形码加载失败</barcode>
        <div style="font-size: 13px; color: #000000" v-for="(item, index) in DataList1" :key="index">
        <barcode :value="barcode" :height="40" :width="2" :margin="0"
          >条形码加载失败</barcode
        >
        <div
          style="font-size: 13px; color: #000000"
          v-for="(item, index) in DataList1"
          :key="index"
        >
          <div style="width: 48%; margin-top: 10px">
            姓名:{{ item.tjCustomerName }}
          </div>
@@ -388,7 +587,7 @@
        djbeginTime: undefined,
        djendTime: undefined,
        name: undefined,
        tjNum:undefined
        tjNum: undefined,
      },
      startTime: "",
      // 表单参数
@@ -499,7 +698,7 @@
    // 体检报告
    viewReport() {
      const flag = true;
      let dataList = []
      let dataList = [];
      if (this.report.length === 1) {
        this.tjNumber = this.report;
        // this.putAsealOn(tjNumber)
@@ -507,14 +706,14 @@
          if (response.size === 0) {
            this.$message.error("该用户体检报告暂未完成!");
            this.dialogVisible = false;
            dataList.push(this.tjNumber)
            dataList.push(this.tjNumber);
          } else {
            this.dialogVisible = true;
            this.url = window.webkitURL.createObjectURL(response); //将后端返回的blob文件读取出url
          }
        });
      } else {
        let dataList = []
        let dataList = [];
        for (let i = 0; i < this.report.length; i++) {
          if (i <= this.report.length) {
            this.tjNumber = this.report[i];
@@ -522,40 +721,38 @@
              if (response.size === 0) {
                this.$message.error("该用户体检报告暂未完成!");
                this.dialogVisible = false;
                dataList.push(this.tjNumber)
                dataList.push(this.tjNumber);
              } else {
                // this.dialogVisible = true;
                // this.url = window.webkitURL.createObjectURL(response); //将后端返回的blob文件读取出url
                const newBlob = [];
                newBlob.push(response)
                const blob = new Blob(newBlob, { type: 'application/pdf' })
                var date = (new Date()).getTime()
                var ifr = document.createElement('iframe')
                ifr.style.frameborder = 'no'
                ifr.style.display = 'none'
                ifr.style.pageBreakBefore = 'always'
                ifr.setAttribute('id', 'printPdf' + date)
                ifr.setAttribute('name', 'printPdf' + date)
                ifr.src = window.URL.createObjectURL(blob)
                document.body.appendChild(ifr)
                this.doPrint('printPdf' + date)
                window.URL.revokeObjectURL(ifr.src) // 释放URL 对象
                newBlob.push(response);
                const blob = new Blob(newBlob, { type: "application/pdf" });
                var date = new Date().getTime();
                var ifr = document.createElement("iframe");
                ifr.style.frameborder = "no";
                ifr.style.display = "none";
                ifr.style.pageBreakBefore = "always";
                ifr.setAttribute("id", "printPdf" + date);
                ifr.setAttribute("name", "printPdf" + date);
                ifr.src = window.URL.createObjectURL(blob);
                document.body.appendChild(ifr);
                this.doPrint("printPdf" + date);
                window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
              }
            });
          } else {
            return
            return;
          }
        }
      }
    },
    doPrint(val) {
      var ordonnance = document.getElementById(val).contentWindow
      var ordonnance = document.getElementById(val).contentWindow;
      setTimeout(() => {
        ordonnance.print()
      }, 100)
        ordonnance.print();
      }, 100);
    },
    // 最近一次体检报告
@@ -629,7 +826,6 @@
        this.CompanyList = response.data;
      });
    },
    // 选框数据
    searchSelect(val) { },
src/views/system/user/index.vue
@@ -650,6 +650,27 @@
        <el-button @click="upload.open = false">取 消</el-button>
      </div>
    </el-dialog>
    <!-- 重置密码对话框 -->
    <el-dialog
      title="提示"
      :visible.sync="dialogVisible1"
      width="30%"
      :before-close="handleClose">
      <el-form>
        <span>请输入“{{row.userName}}”的新密码</span>
        <el-form-item>
          <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>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="dialogVisible = false">取 消</el-button>
        <el-button type="primary" @click="tijiao">确 定</el-button>
      </span>
    </el-dialog>
  </div>
</template>
@@ -694,6 +715,10 @@
  components: { Treeselect },
  data() {
    return {
      row:[],
      flag: false,
      password:"",
      dialogVisible1:false,
      nums: "",
      userInfoList: [],
      hospList: [],
@@ -840,6 +865,14 @@
    deptName(val) {
      this.$refs.tree.filter(val);
    },
  },
  computed: {
    type() {
      return this.flag ? "text" : "password";
    },
    elIcon() {
      return this.flag ? "el-icon-minus" : "el-icon-view";
    }
  },
  created() {
    this.getList();
@@ -1073,19 +1106,37 @@
    },
    /** 重置密码按钮操作 */
    handleResetPwd(row) {
      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        closeOnClickModal: false,
        inputPattern: /^.{5,20}$/,
        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
      console.log(row);
      this.dialogVisible1 = true;
      this.row = row;
      // this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
      //   confirmButtonText: "确定",
      //   cancelButtonText: "取消",
      //   closeOnClickModal: false,
      //   inputPattern: /^.{5,20}$/,
      //   inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
      //   inputType:'password'
      // })
      //   .then(({ value }) => {
      //     resetUserPwd(row.userId, value).then((response) => {
      //       this.$modal.msgSuccess("修改成功");
      //       // ,新密码是:" + value
      //     });
      //   })
      //   .catch(() => { });
    },
    tijiao(){
      let data = {
        password:this.password,
        userId:this.row.userId,
      }
      resetUserPwd(data).then(res=>{
        console.log(res);
        if(res.code == 200){
          this.$modal.msgSuccess("修改成功");
          this.dialogVisible1 = false;
        }
      })
        .then(({ value }) => {
          resetUserPwd(row.userId, value).then((response) => {
            this.$modal.msgSuccess("修改成功,新密码是:" + value);
          });
        })
        .catch(() => { });
    },
    /** 分配角色操作 */
    handleAuthRole: function (row) {
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.101:5011`,
        target: `http://192.168.0.100:5011`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''