qxtj

qinxianzhangyao

2024-06-25 b54b3c4662338ca0897b8dbc9172f7f00306a09d

qxtj

 dist.zip

Binary files differ

 src/views/doctor/checkAll/index.vue

@@ -342,226 +342,131 @@
          <div
            style="font-size: 14px; overflow-y: auto; height: calc(100% - 11%)"
          >
            <table
              style="
                width: 96%;
                margin: 10px 10px;
                border: 1px solid #dfe6ec;
                border-collapse: collapse;
              "
              cellspacing="4"
            <div
              v-for="(item, index) in changedate"
              :key="index"
              style="margin-left: 10px"
            >
              <caption style="background-color: #f8f8f9">
                {{
                  item.parent || ""
                }}
              </caption>
              <tr
                style="border: 1px solid #dfe6ec; border-collapse: collapse"
                align="center"
              <div style="text-align: center; background-color: #f8f8f9;margin-top: 10px;">
                {{ item.parent || "" }}
              </div>
              <el-table
                :data="item.sons"
                border
                style="width: 100%"
                :row-style="changRed"
              >
                <th
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                <el-table-column align="center" label="检测项目" width="240">
                  <template slot-scope="scope">
                    <div v-if="scope.row.project != null">
                      {{ scope.row.project.proName || "" }}
                    </div>
                    <div v-else>{{ scope.row.proName }}</div>
                  </template>
                </el-table-column>
                <el-table-column
                  align="center"
                  prop="proResult"
                  label="检测结果"
                  width="180"
                >
                  检测项目
                </th>
                <th
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                </el-table-column>
                <el-table-column align="center" prop="" label="单位">
                  <template slot-scope="scope">
                    <div v-if="scope.row.project != null">
                      {{ scope.row.standard.company || "" }}
                    </div>
                    <div v-else>{{ scope.row.proAdvice }}</div>
                  </template>
                </el-table-column>
                <el-table-column align="center" prop="" label=" 参考范围">
                  <template slot-scope="scope">
                    <div v-if="scope.row.project != null">
                      {{
                        scope.row.standard.tjStandardGtValue +
                        "-" +
                        scope.row.standard.tjStandardLtValue
                      }}
                    </div>
                    <div v-else>{{ scope.row.stanId }}</div>
                  </template>
                </el-table-column>
              </el-table>
              <table style="width: 100%">
                <tr
                  style="border: 1px solid #dfe6ec; border-collapse: collapse"
                >
                  检测结果
                </th>
                <th
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                >
                  单位
                </th>
                <th
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                >
                  参考范围
                </th>
              </tr>

              <tr
                style="
                  border: 1px solid #dfe6ec;
                  border-collapse: collapse;
                  width: 200px;
                  height: 35px;
                  text-align: center;
                "
                v-for="item1 in item.sons"
                :key="item1.proId"
              >
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                  v-if="item1.project != null"
                >
                  {{ item1.project.proName || "" }}
                </td>
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                  v-else
                >
                  {{ item1.proName }}
                </td>
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                >
                  {{ item1.proResult }}
                  <!-- <el-input v-model="item1.proResult" placeholder="请输入内容"></el-input> -->
                </td>
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                  v-if="item1.project != null"
                >
                  {{ item1.standard.company }}
                </td>
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                  v-else
                >
                  {{ item1.proAdvice }}
                </td>
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                  v-if="item1.project != null"
                >
                  {{
                    item1.standard.tjStandardGtValue +
                    "-" +
                    item1.standard.tjStandardLtValue
                  }}
                </td>
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                  v-else
                >
                  {{ item1.stanId }}
                </td>
              </tr>
              <tr
                style="
                  border: 1px solid #dfe6ec;
                  border-collapse: collapse;
                  width: 200px;
                "
              >
                <td>小结：</td>
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                >
                  <el-input v-model="item.remark" disabled></el-input>
                  <!-- <el-select v-model="item.value" multiple filterable placeholder="请选择" style="width: 100%" @change="xiAoJieChange($event, item)">
                  <td
                    style="
                      border: 1px solid #dfe6ec;
                      border-collapse: collapse;
                      width: 240px;
                    "
                  >
                    小结：
                  </td>
                  <td
                    style="
                      border: 1px solid #dfe6ec;
                      border-collapse: collapse;
                      width: 180px;
                    "
                  >
                    <el-input v-model="item.remark" disabled></el-input>
                    <!-- <el-select v-model="item.value" multiple filterable placeholder="请选择" style="width: 100%" @change="xiAoJieChange($event, item)">
                <el-option v-for="item1 in item.parentAdvice" :key="item1.id" :label="item1.title" :value="item1.id">
                </el-option>
              </el-select> -->
                </td>
                <td
                  </td>
                  <td
                    style="
                      border: 1px solid #dfe6ec;
                      border-collapse: collapse;
                      width: 350px;
                    "
                  >
                    主检医师：
                  </td>
                  <td
                    style="border: 1px solid #dfe6ec; border-collapse: collapse"
                  >
                    {{ item.doctorName }}
                  </td>
                </tr>
                <tr
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                >
                  主检医师：
                </td>
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                >
                  {{ item.doctorName }}
                </td>
              </tr>
              <tr
                style="
                  border: 1px solid #dfe6ec;
                  border-collapse: collapse;
                  width: 200px;
                "
              >
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                >
                  备注：
                </td>
                <td
                  style="
                    border: 1px solid #dfe6ec;
                    border-collapse: collapse;
                    width: 200px;
                  "
                  colspan="2"
                >
                  <textarea
                    placeholder="请输入内容"
                    :autosize="{ minRows: 2, maxRows: 2 }"
                    style="width: 100%; height: 100%"
                    v-model="changedate[index].remark"
                    v-on:input="change"
                  ></textarea>
                  <!-- <el-input type="textarea" autosize >
                  <td
                    style="
                      border: 1px solid #dfe6ec;
                      border-collapse: collapse;
                      width: 240px;
                    "
                  >
                    备注：
                  </td>
                  <td
                    style="border: 1px solid #dfe6ec; border-collapse: collapse;"
                    colspan="2"
                  >
                    <textarea
                      placeholder="请输入内容"
                      :autosize="{ minRows: 2, maxRows: 2 }"
                      style="width: 100%; height: 100%"
                      v-model="changedate[index].remark"
                      v-on:input="change"
                    ></textarea>
                    <!-- <el-input type="textarea" autosize >
              </el-input> -->
                </td>
              </tr>
            </table>
                  </td>
                </tr>
              </table>
            </div>

            <div style="margin: 0 0px 10px 15px">
              <el-button type="primary" @click="propoChange"
                >快捷建议</el-button
@@ -587,15 +492,16 @@
                </el-input>
              </el-form-item>
            </el-form>
            <div slot="footer" class="dialog-footers" >
            <div slot="footer" class="dialog-footers">
              <el-button
              v-if="tjproject == '0'"
                type="primary"
                size="mini"
                @click.stop="rowClick"
                icon="el-icon-edit-outline"
                >开处方</el-button
              >
              <div v-if="tjproject == '0'" style="padding-left:10px ;">
              <div v-if="tjproject == '0'" style="padding-left: 10px">
                <el-button
                  type="primary"
                  @click="determine"
@@ -1495,9 +1401,9 @@
    },

    rowClick(row) {
      if(row.tjNumber){
      if (row.tjNumber) {
        this.preObj = row;
      }else{
      } else {
        this.preObj = this.tableAll;
      }
      this.$refs.Pre.open = true;
@@ -1591,12 +1497,12 @@
              this.changedate.forEach((item) => {
                // this.remark = item.remark;
                item.sons.forEach((item3) => {
                  if (item3.standard.tjStandardGtValue === null) {
                    item3.standard.tjStandardGtValue = "";
                  }
                  if (item3.standard.tjStandardLtValue === null) {
                    item3.standard.tjStandardLtValue = "";
                  }
                  // if (item3.standard.tjStandardGtValue === null) {
                  //   item3.standard.tjStandardGtValue = "";
                  // }
                  // if (item3.standard.tjStandardLtValue === null) {
                  //   item3.standard.tjStandardLtValue = "";
                  // }
                });
                // item.remark = "";
              });
@@ -1673,6 +1579,14 @@
      this.resetForm("tableList");
      this.submitForm();
    },
    changRed({ row }) {
      if (row.ycbz != "" && row.ycbz != null) {
        // 变颜色的条件
        return {
          backgroundColor: "red", // 这个return的就是样式 可以是color 也可以是backgroundColor
        };
      }
    },

    // 点击详情
    handleClick(row) {

 src/views/doctor/examination/index.vue

@@ -533,23 +533,13 @@
      });
    },
    tongbu(row) {
      this.$refs.tb.toggleRowSelection(row);
      let tjNumber = row.tjNumber;
      dataSynchronization(tjNumber).then((res) => {
        if (res.code == 200) {
          // this.$forceUpdate();
          // this.getList();
          this.$modal.msgSuccess("同步成功！");
          cSWebGetPro(tjNumber).then((res) => {
            this.xiangmuList = res.data;
            this.xiangmuList.forEach((item) => {
              // console.log(item);
              // if (item.type == 0) {
              //   this.dis = true;
              // } else {
              //   this.dis = false;
              // }
            });
          });
        }
      });
    },

 src/views/hosp/customer/index.vue

@@ -1,9 +1,21 @@
<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="cusName">
        <el-input v-model="queryParams.cusName" placeholder="请输入姓名" clearable style="width:120px"
          @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.cusName"
          placeholder="请输入姓名"
          clearable
          style="width: 120px"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <!-- <el-form-item label="性别" prop="cusSex">
        <el-select v-model="queryParams.cusSex" placeholder="请选择性别" clearable style="width:120px">
@@ -17,8 +29,13 @@
        <el-input v-model="queryParams.cusAddr" placeholder="请输入现居住地址" clearable @keyup.enter.native="handleQuery"/>
      </el-form-item> -->
      <el-form-item label="联系电话" prop="cusPhone">
        <el-input v-model="queryParams.cusPhone" placeholder="请输入联系电话" style="width:140px" clearable
          @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.cusPhone"
          placeholder="请输入联系电话"
          style="width: 140px"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <!-- <el-form-item label="邮政编码" prop="cusPostcode">
        <el-input v-model="queryParams.cusPostcode" placeholder="请输入邮政编码" clearable @keyup.enter.native="handleQuery"/>
@@ -56,11 +73,21 @@
        </el-select>
      </el-form-item> -->
      <el-form-item label="身份证号" prop="cusIdcard">
        <el-input v-model="queryParams.cusIdcard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.cusIdcard"
          placeholder="请输入身份证号"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="介绍人" prop="cusIntroduce">
        <el-input v-model="queryParams.cusIntroduce" placeholder="请输入介绍人" clearable style="width:140px"
          @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.cusIntroduce"
          placeholder="请输入介绍人"
          clearable
          style="width: 140px"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <!-- <el-form-item label="体检次数" prop="cusNumber">
        <el-input
@@ -71,32 +98,76 @@
        />
      </el-form-item> -->
      <el-form-item label="体检次数" prop="cusNumber">
        <el-input v-model="queryParams.cusNumber" placeholder="输入整数" clearable style="width:100px"
          @keyup.enter.native="handleQuery" />
        <el-input
          v-model="queryParams.cusNumber"
          placeholder="输入整数"
          clearable
          style="width: 100px"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="是否VIP" prop="cusIsvip">
        <el-select v-model="queryParams.cusIsvip" placeholder="选择VIP" clearable style="width:100px">
          <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
        <el-select
          v-model="queryParams.cusIsvip"
          placeholder="选择VIP"
          clearable
          style="width: 100px"
        >
          <el-option
            v-for="dict in dict.type.sys_yes_no"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"  style="margin: 0 15px;">搜索</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"
          style="margin: 0 15px"
          >搜索</el-button
        >
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
          >重置</el-button
        >
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
          v-hasPermi="['hosp:customer:add']">新增</el-button>
        <el-button
          type="primary"
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['hosp:customer:add']"
          >新增</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
          v-hasPermi="['hosp:customer:edit']">修改</el-button>
        <el-button
          type="primary"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['hosp:customer:edit']"
          >修改</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
          v-hasPermi="['hosp:customer:remove']">删除</el-button>
        <el-button
          type="primary"
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['hosp:customer:remove']"
          >删除</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
@@ -109,101 +180,303 @@
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
          v-hasPermi="['hosp:customer:export']">导出</el-button>
        <el-button
          type="primary"
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['hosp:customer: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>

    <el-table border v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="40px" align="center" fixed="left" />
      <el-table-column label="序号" align="center" prop="newID" fixed="left" :show-overflow-tooltip="true" width="50px" />
      <el-table-column label="姓名" align="center" prop="cusName" width="90px" fixed="left"
        :show-overflow-tooltip="true" />
      <el-table-column label="性别" align="center" prop="cusSex" :show-overflow-tooltip="true" width="60px">
    <el-table
      border
      v-loading="loading"
      :data="customerList"
      @selection-change="handleSelectionChange"
    >
      <el-table-column
        type="selection"
        width="40px"
        align="center"
        fixed="left"
      />
      <el-table-column
        label="序号"
        align="center"
        prop="newID"
        fixed="left"
        :show-overflow-tooltip="true"
        width="50px"
      />
      <el-table-column
        label="姓名"
        align="center"
        prop="cusName"
        width="90px"
        fixed="left"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="性别"
        align="center"
        prop="cusSex"
        :show-overflow-tooltip="true"
        width="60px"
      >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex" />
          <dict-tag
            :options="dict.type.sys_user_sex"
            :value="scope.row.cusSex"
          />
        </template>
      </el-table-column>
      <el-table-column label="出生日期" align="center" prop="cusBrithday" width="100px" :show-overflow-tooltip="true">
      <el-table-column
        label="出生日期"
        align="center"
        prop="cusBrithday"
        width="100px"
        :show-overflow-tooltip="true"
      >
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.cusBrithday, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>
      <el-table-column label="身份证号" align="center" prop="cusIdcard" width="170px" :show-overflow-tooltip="true" />
      <el-table-column label="联系电话" align="center" prop="cusPhone" width="110px" :show-overflow-tooltip="true" />
      <el-table-column label="现住址" align="center" prop="cusAddr" width="180px" :show-overflow-tooltip="true" />
      <el-table-column
        label="身份证号"
        align="center"
        prop="cusIdcard"
        width="170px"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="联系电话"
        align="center"
        prop="cusPhone"
        width="110px"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="现住址"
        align="center"
        prop="cusAddr"
        width="180px"
        :show-overflow-tooltip="true"
      />

      <el-table-column label="邮政编码" align="center" prop="cusPostcode" width="80px" :show-overflow-tooltip="true" />
      <el-table-column label="邮箱" align="center" prop="cusEmail" width="170px" :show-overflow-tooltip="true" />
      <el-table-column label="民族" align="center" prop="cusNational" width="80px" :show-overflow-tooltip="true">
      <el-table-column
        label="邮政编码"
        align="center"
        prop="cusPostcode"
        width="80px"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="邮箱"
        align="center"
        prop="cusEmail"
        width="170px"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="民族"
        align="center"
        prop="cusNational"
        width="80px"
        :show-overflow-tooltip="true"
      >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.dict_user_national" :value="scope.row.cusNational" />
          <dict-tag
            :options="dict.type.dict_user_national"
            :value="scope.row.cusNational"
          />
        </template>
      </el-table-column>
      <el-table-column label="婚姻状况" align="center" prop="cusMarryStatus" :show-overflow-tooltip="true" width="80px">
      <el-table-column
        label="婚姻状况"
        align="center"
        prop="cusMarryStatus"
        :show-overflow-tooltip="true"
        width="80px"
      >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.cusMarryStatus" />
          <dict-tag
            :options="dict.type.dict_user_marry"
            :value="scope.row.cusMarryStatus"
          />
        </template>
      </el-table-column>

      <el-table-column label="介绍人" align="center" prop="cusIntroduce" width="90px" :show-overflow-tooltip="true" />
      <el-table-column label="次数" align="center" prop="cusNumber" width="55px" :show-overflow-tooltip="true" />
      <el-table-column label="VIP" align="center" prop="cusIsvip" width="55px" :show-overflow-tooltip="true">
      <el-table-column
        label="介绍人"
        align="center"
        prop="cusIntroduce"
        width="90px"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="次数"
        align="center"
        prop="cusNumber"
        width="55px"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="VIP"
        align="center"
        prop="cusIsvip"
        width="55px"
        :show-overflow-tooltip="true"
      >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.cusIsvip" />
          <dict-tag
            :options="dict.type.sys_yes_no"
            :value="scope.row.cusIsvip"
          />
        </template>
      </el-table-column>
      <el-table-column label="黑名单" align="center" prop="isBlack" width="76px" >
      <el-table-column
        label="黑名单"
        align="center"
        prop="isBlack"
        width="76px"
      >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isBlack" />
          <dict-tag
            :options="dict.type.sys_yes_no"
            :value="scope.row.isBlack"
          />
        </template>
      </el-table-column>
      <el-table-column label="索引卡号" align="center" prop="indexCard" :show-overflow-tooltip="true" />
      <el-table-column fixed="right" label="操作" align="center" width="90px" class-name="small-padding fixed-width">
      <el-table-column
        label="索引卡号"
        align="center"
        prop="indexCard"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        fixed="right"
        label="操作"
        align="center"
        width="90px"
        class-name="small-padding fixed-width"
      >
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['hosp:customer:edit']" title="修改"></el-button>
          <el-button size="mini" type="text" icon="el-icon-share" @click="handleDetails(scope.row)"
            v-hasPermi="['hosp:customer:edit']" title="详情"></el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            v-hasPermi="['hosp:customer:remove']" title="删除"></el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['hosp:customer:edit']"
            title="修改"
          ></el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-share"
            @click="handleDetails(scope.row)"
            v-hasPermi="['hosp:customer:edit']"
            title="详情"
          ></el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['hosp:customer:remove']"
            title="删除"
          ></el-button>
        </template>
      </el-table-column>
    </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-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
    <el-dialog
      :title="title"
      :visible.sync="open"
      width="1000px"
      append-to-body
    >
      <el-form
        ref="form"
        :model="form"
        :rules="rules"
        label-width="100px"
        :inline="true"
      >
        <el-form-item label="姓名" prop="cusName">
          <el-input v-model="form.cusName" placeholder="请输入姓名" style="width: 200px" />
          <el-input
            v-model="form.cusName"
            placeholder="请输入姓名"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="性别" prop="cusSex">
          <el-select v-model="form.cusSex" placeholder="请选择性别" style="width: 200px">
            <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
              :value="parseInt(dict.value)"></el-option>
          <el-select
            v-model="form.cusSex"
            placeholder="请选择性别"
            style="width: 200px"
          >
            <el-option
              v-for="dict in dict.type.sys_user_sex"
              :key="dict.value"
              :label="dict.label"
              :value="parseInt(dict.value)"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="身份证号" prop="cusIdcard">
          <el-input v-model="form.cusIdcard" placeholder="请输入身份证号" style="width: 200px" />
          <el-input
            v-model="form.cusIdcard"
            @input="inputChange"
            placeholder="请输入身份证号"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="出生日期" prop="cusBrithday">
          <el-date-picker clearable v-model="form.cusBrithday" type="date" value-format="yyyy-MM-dd"
            placeholder="请选择出生日期" style="width: 200px">
          <el-date-picker
            disabled
            clearable
            v-model="form.cusBrithday"
            type="date"
            value-format="yyyy-MM-dd"
            placeholder="请选择出生日期"
            style="width: 200px"
          >
          </el-date-picker>
        </el-form-item>
        <el-form-item label="现住址" prop="cusAddr">
          <el-input v-model="form.cusAddr" placeholder="请输入现居住地址" style="width: 200px" />
        <el-form-item label="年龄" prop="age">
          <el-input
            disabled
            v-model="form.age"
            placeholder="请输入年龄"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="联系电话" prop="cusPhone">
          <el-input v-model="form.cusPhone" placeholder="请输入联系电话" style="width: 200px" />
          <el-input
            v-model="form.cusPhone"
            placeholder="请输入联系电话"
            style="width: 200px"
          />
        </el-form-item>
        <!-- <el-form-item label="账号密码" prop="cusPassword">
          <el-input v-model="form.cusPassword" placeholder="请输入账号密码" style="width: 220px" />
@@ -212,32 +485,72 @@
          <el-input v-model="form.cusPostcode" placeholder="请输入邮政编码"  />
        </el-form-item> -->
        <el-form-item label="邮箱" prop="cusEmail">
          <el-input v-model="form.cusEmail" placeholder="请输入邮箱" style="width: 200px" />
          <el-input
            v-model="form.cusEmail"
            placeholder="请输入邮箱"
            style="width: 200px"
          />
        </el-form-item>
        <!-- <el-form-item label="索引卡号" prop="indexCard">
          <el-input v-model="form.indexCard" placeholder="请输入索引卡号" style="width: 220px" />
        </el-form-item> -->
        <el-form-item label="民族" prop="cusNational">
          <el-select v-model="form.cusNational" placeholder="请选择民族" style="width: 200px" filterable>
            <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
              :value="dict.value"></el-option>
          <el-select
            v-model="form.cusNational"
            placeholder="请选择民族"
            style="width: 200px"
            filterable
          >
            <el-option
              v-for="dict in dict.type.dict_user_national"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="婚姻状况" prop="cusMarryStatus">
          <el-select v-model="form.cusMarryStatus" placeholder="请选择婚姻状况" style="width: 200px">
            <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
              :value="dict.value"></el-option>
          <el-select
            v-model="form.cusMarryStatus"
            placeholder="请选择婚姻状况"
            style="width: 200px"
          >
            <el-option
              v-for="dict in dict.type.dict_user_marry"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>

        <el-form-item label="介绍人" prop="cusIntroduce">
          <el-input v-model="form.cusIntroduce" placeholder="请输入介绍人" style="width: 200px" />
          <el-input
            v-model="form.cusIntroduce"
            placeholder="请输入介绍人"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="是否VIP" prop="cusIsvip">
          <el-select v-model="form.cusIsvip" placeholder="请选择是否VIP" style="width: 200px">
            <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
              :value="dict.value"></el-option>
          <el-select
            v-model="form.cusIsvip"
            placeholder="请选择是否VIP"
            style="width: 200px"
          >
            <el-option
              v-for="dict in dict.type.sys_yes_no"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="现住址" prop="cusAddr">
          <el-input
            v-model="form.cusAddr"
            placeholder="请输入现居住地址"
            style="width: 200px"
          />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -247,28 +560,74 @@
    </el-dialog>

    <!-- 点击右边弹出层 -->
    <el-drawer :visible.sync="drawer" :with-header="false" size="70%" :before-close="handleClose">
      <div style="text-align: center;margin: 10px 0;">
    <el-drawer
      :visible.sync="drawer"
      :with-header="false"
      size="70%"
      :before-close="handleClose"
    >
      <div style="text-align: center; margin: 10px 0">
        <span>健康记录</span>
      </div>
      <template>
        <el-tabs v-model="activeName" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px;">
        <el-tabs
          v-model="activeName"
          type="border-card"
          @tab-click="handleTabClick"
          style="margin-left: 10px"
        >
          <el-tab-pane label="体检记录" name="first">
            <el-row>
              <el-col :span="14">
                <el-table ref="selectChargeRuleRef" v-loading="loading" :data="detailsList" border height="680px"
                  style="width: 96%; margin: 10px 10px" @selection-change="selectChargeRule">
                  <el-table-column type="selection" width="40px" align="center" fixed="left" />
                <el-table
                  ref="selectChargeRuleRef"
                  v-loading="loading"
                  :data="detailsList"
                  border
                  height="680px"
                  style="width: 96%; margin: 10px 10px"
                  @selection-change="selectChargeRule"
                >
                  <el-table-column
                    type="selection"
                    width="40px"
                    align="center"
                    fixed="left"
                  />
                  <!-- <el-table-column prop="tjNum" label="体检号" width="155" align="center"></el-table-column> -->
                  <el-table-column prop="tjTime" label="体检时间" width="155" align="center"></el-table-column>
                  <el-table-column prop="tjProName" label="体检项目" align="center"></el-table-column>
                  <el-table-column prop="userName" label="总检医师" width="75" align="center"></el-table-column>
                  <el-table-column prop="paidIn" label="体检费用" width="75" align="center"></el-table-column>
                  <el-table-column
                    prop="tjTime"
                    label="体检时间"
                    width="155"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="tjProName"
                    label="体检项目"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="userName"
                    label="总检医师"
                    width="75"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="paidIn"
                    label="体检费用"
                    width="75"
                    align="center"
                  ></el-table-column>
                </el-table>
              </el-col>
              <el-col :span="10">
                <div>
                  <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%;height: 680px;"></iframe>
                  <iframe
                    id="printIframe"
                    :src="url"
                    frameborder="0"
                    style="width: 100%; height: 680px"
                  ></iframe>
                </div>
              </el-col>
            </el-row>
@@ -276,18 +635,52 @@
          <el-tab-pane label="门诊记录" name="second">
            <el-row>
              <el-col :span="14">
                <el-table ref="selectChargeRuleRef" v-loading="loading" :data="detailsList" border height="680px"
                  style="width: 96%; margin: 10px 10px" @selection-change="selectChargeRule">
                  <el-table-column type="selection" width="40px" align="center" />
                  <el-table-column prop="project.proScope" label="序号"></el-table-column>
                  <el-table-column prop="project.proScope" label="就诊时间" align="center"></el-table-column>
                  <el-table-column prop="project.proScope" label="就诊科室" align="center"></el-table-column>
                  <el-table-column prop="project.proScope" label="接诊医师" align="center"></el-table-column>
                  <el-table-column prop="project.proScope" label="就诊总费用" align="center"></el-table-column>
                <el-table
                  ref="selectChargeRuleRef"
                  v-loading="loading"
                  :data="detailsList"
                  border
                  height="680px"
                  style="width: 96%; margin: 10px 10px"
                  @selection-change="selectChargeRule"
                >
                  <el-table-column
                    type="selection"
                    width="40px"
                    align="center"
                  />
                  <el-table-column
                    prop="project.proScope"
                    label="序号"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="就诊时间"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="就诊科室"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="接诊医师"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="就诊总费用"
                    align="center"
                  ></el-table-column>
                </el-table>
              </el-col>
              <el-col :span="10">
                <quill-editor v-model="form.content" :options="editorOption" style="height:680px;width:96%">
                <quill-editor
                  v-model="form.content"
                  :options="editorOption"
                  style="height: 680px; width: 96%"
                >
                </quill-editor>
              </el-col>
            </el-row>
@@ -295,57 +688,168 @@
          <el-tab-pane label="住院记录" name="third">
            <el-row>
              <el-col :span="14">
            <el-table ref="selectChargeRuleRef" v-loading="loading" :data="detailsList" border height="680px"
              style="width: 96%; margin: 10px 10px" @selection-change="selectChargeRule">
              <el-table-column type="selection" width="40px" align="center" />
              <el-table-column prop="project.proScope" label="序号" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="入院时间" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="出院时间" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="住院天数" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="住院科室" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="主治医师" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="主要诊断" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="是否手术" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="离院方式" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="住院总费用" align="center"></el-table-column>
            </el-table>
          </el-col>
                <el-table
                  ref="selectChargeRuleRef"
                  v-loading="loading"
                  :data="detailsList"
                  border
                  height="680px"
                  style="width: 96%; margin: 10px 10px"
                  @selection-change="selectChargeRule"
                >
                  <el-table-column
                    type="selection"
                    width="40px"
                    align="center"
                  />
                  <el-table-column
                    prop="project.proScope"
                    label="序号"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="入院时间"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="出院时间"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="住院天数"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="住院科室"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="主治医师"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="主要诊断"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="是否手术"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="离院方式"
                    align="center"
                  ></el-table-column>
                  <el-table-column
                    prop="project.proScope"
                    label="住院总费用"
                    align="center"
                  ></el-table-column>
                </el-table>
              </el-col>
              <el-col :span="10">
                <quill-editor v-model="form.content" :options="editorOption" style="height:680px;width:96%">
                <quill-editor
                  v-model="form.content"
                  :options="editorOption"
                  style="height: 680px; width: 96%"
                >
                </quill-editor>
              </el-col>
            </el-row>
          </el-tab-pane>
          <el-tab-pane label="手术记录" name="fourth">
            <el-table v-loading="loading" :data="detailsList" border height="460px"
              style="width: 96%; margin: 10px 10px">
              <el-table-column prop="project.proScope" label="序号" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="开始时间" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="结束时间" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="手术名称" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="手术编码" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="手术级别" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="术者" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="一助" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="二助" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="麻醉方式" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="麻醉开始时间" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="麻醉结束时间" align="center"></el-table-column>
              <el-table-column prop="project.proScope" label="麻醉医师" align="center"></el-table-column>
            <el-table
              v-loading="loading"
              :data="detailsList"
              border
              height="460px"
              style="width: 96%; margin: 10px 10px"
            >
              <el-table-column
                prop="project.proScope"
                label="序号"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="开始时间"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="结束时间"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="手术名称"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="手术编码"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="手术级别"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="术者"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="一助"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="二助"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="麻醉方式"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="麻醉开始时间"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="麻醉结束时间"
                align="center"
              ></el-table-column>
              <el-table-column
                prop="project.proScope"
                label="麻醉医师"
                align="center"
              ></el-table-column>
            </el-table>
          </el-tab-pane>
        </el-tabs>
      </template>

    </el-drawer>
  </div>
</template>

<script>
import { quillEditor } from 'vue-quill-editor'
import 'quill/dist/quill.core.css'
import 'quill/dist/quill.snow.css'
import 'quill/dist/quill.bubble.css'
import { quillEditor } from "vue-quill-editor";
import "quill/dist/quill.core.css";
import "quill/dist/quill.snow.css";
import "quill/dist/quill.bubble.css";

import {
  listCustomer,
@@ -353,9 +857,9 @@
  delCustomer,
  addCustomer,
  updateCustomer,
  getHistryTjOrderByCusIdCard
  getHistryTjOrderByCusIdCard,
} from "@/api/hosp/customer";
import { getPdf ,addCustomerBlack} from "@/api/hosp/order";
import { getPdf, addCustomerBlack } from "@/api/hosp/order";

export default {
  name: "Customer",
@@ -370,32 +874,32 @@
    let checkPhoneNum = (rule, value, callback) => {
      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
      if (value == "" && value == undefined && !value) {
        return callback('');
        return callback("");
      } else if (value != undefined && value != "") {
        return callback();
      } else if (!patter.test(value)) {
        return callback('');
        return callback("");
      }
    };
    return {
      editorOption: {
        placeholder: '请在这里输入',
        placeholder: "请在这里输入",
        modules: {
          toolbar: [
            ['bold', 'italic', 'underline', 'strike'], //加粗，斜体，下划线，删除线
            ['blockquote', 'code-block'], //引用，代码块
            ["bold", "italic", "underline", "strike"], //加粗，斜体，下划线，删除线
            ["blockquote", "code-block"], //引用，代码块
            [{ header: 1 }, { header: 2 }], // 标题，键值对的形式；1、2表示字体大小
            [{ list: 'ordered' }, { list: 'bullet' }], //列表
            [{ script: 'sub' }, { script: 'super' }], // 上下标
            [{ indent: '-1' }, { indent: '+1' }], // 缩进
            [{ direction: 'rtl' }], // 文本方向
            [{ size: ['small', false, 'large', 'huge'] }], // 字体大小
            [{ list: "ordered" }, { list: "bullet" }], //列表
            [{ script: "sub" }, { script: "super" }], // 上下标
            [{ indent: "-1" }, { indent: "+1" }], // 缩进
            [{ direction: "rtl" }], // 文本方向
            [{ size: ["small", false, "large", "huge"] }], // 字体大小
            [{ header: [1, 2, 3, 4, 5, 6, false] }], //几级标题
            [{ color: [] }, { background: [] }], // 字体颜色，字体背景颜色
            [{ font: [] }], //字体
            [{ align: [] }], //对齐方式
            ['clean'], //清除字体样式
            ['image', 'video'], //上传图片、上传视频
            ["clean"], //清除字体样式
            ["image", "video"], //上传图片、上传视频
          ],
        },
      },
@@ -408,7 +912,7 @@
      single: true,
      drawer: false,
      detailsList: [],
      activeName: 'first',
      activeName: "first",
      // 非多个禁用
      multiple: true,
      url: "",
@@ -445,7 +949,9 @@
      form: {},
      // 表单校验
      rules: {
        cusName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
        cusName: [
          { required: true, validator: checkPhoneNum, trigger: "blur" },
        ],
        cusSex: [
          { required: true, validator: checkPhoneNum, trigger: "change" },
        ],
@@ -559,32 +1065,61 @@

    // 详情
    handleDetails(row) {
      this.drawer = true
      let cusId = row.cusId
      getHistryTjOrderByCusIdCard(cusId).then(res => {
        this.detailsList = res.data
      })
      this.drawer = true;
      let cusId = row.cusId;
      getHistryTjOrderByCusIdCard(cusId).then((res) => {
        this.detailsList = res.data;
      });
    },

    handleBlacklist(){
      let data ={
        cusId :this.ids[0]
      }
      addCustomerBlack(data).then(res => {
        this.$modal.msgSuccess("已加入黑名单")
    handleBlacklist() {
      let data = {
        cusId: this.ids[0],
      };
      addCustomerBlack(data).then((res) => {
        this.$modal.msgSuccess("已加入黑名单");
        this.getList();
      })
      });
    },

    inputChange() {
      const reg =
        /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
      if (reg.test(this.form.cusIdcard)) {
        var org_birthday = this.form.cusIdcard.substring(6, 14);
        var org_gender = this.form.cusIdcard.substring(16, 17);
        var sex = org_gender % 2 == 1 ? 0 : 1;
        var birthday =
          org_birthday.substring(0, 4) +
          "-" +
          org_birthday.substring(4, 6) +
          "-" +
          org_birthday.substring(6, 8);
        var birthdays = new Date(birthday.replace(/-/g, "-"));
        let d = new Date();
        let age =
          d.getFullYear() -
          birthdays.getFullYear() -
          (d.getMonth() < birthdays.getMonth() ||
          (d.getMonth() == birthdays.getMonth() &&
            d.getDate() < birthdays.getDate())
            ? 1
            : 0);
        this.form.cusSex = sex;
        this.form.cusBrithday = birthday;
        this.form.age = age;
      }
    },

    selectChargeRule(val) {
      if (val.length > 1) {
        this.$refs.selectChargeRuleRef.clearSelection()
        this.$refs.selectChargeRuleRef.toggleRowSelection(val[val.length - 1])
        this.$refs.selectChargeRuleRef.clearSelection();
        this.$refs.selectChargeRuleRef.toggleRowSelection(val[val.length - 1]);
      }
      let selectedRule = val[val.length - 1]
      let selectedRule = val[val.length - 1];
      if (this.activeName == "first") {
        const flag = true;
        let tjNumber = selectedRule.tjNum
        let tjNumber = selectedRule.tjNum;
        // let tjNumber = "10001240305100029"
        getPdf(tjNumber, flag).then((response) => {
          if (response.size === 0) {
@@ -608,19 +1143,15 @@
          }
        });
      } else if (this.activeName == "second") {

      } else if (this.activeName == "third") {

      }

    },


    handleClose() {
      this.$tab.refreshPage();
    },
    handleTabClick() {
      console.log(this.activeName)
      console.log(this.activeName);
    },
    /** 提交按钮 */
    submitForm() {
@@ -654,7 +1185,7 @@
          this.getList();
          this.$modal.msgSuccess("删除成功");
        })
        .catch(() => { });
        .catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {

 src/views/hosp/order/index.vue

@@ -787,7 +787,7 @@
    <!-- 添加或修改体检记录对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body>
      <el-tabs v-model="activeName1" type="card">
        <el-tab-pane label="订单流水" name="first">
        <!-- <el-tab-pane label="订单流水" name="first">
          <el-table :data="numberList" style="width: 100%">
            <el-table-column prop="proName" label="项目/耗材" width="300">
            </el-table-column>
@@ -821,26 +821,34 @@
              </template>
            </el-table-column>
          </el-table>
        </el-tab-pane>
        </el-tab-pane> -->
        <el-tab-pane label="项目汇总" name="second">
          <el-table :data="huizongList" style="width: 100%">
            <el-table-column prop="newID" label="序号"> </el-table-column>
            <el-table-column prop="parent_pro_name" label="项目">
          <el-table :data="huizongList" style="width: 100%" max-height="280">
            <el-table-column align="center" prop="newID" label="序号" width="50"> </el-table-column>
            <el-table-column align="center" prop="parent_pro_name" label="项目">
            </el-table-column>
            <el-table-column prop="ks" label="科室"> </el-table-column>
            <el-table-column prop="price" label="费用合计"> </el-table-column>
            <el-table-column align="center" prop="ks" label="科室"> </el-table-column>
            <el-table-column align="center" prop="price" label="费用合计"> </el-table-column>
          </el-table>
          <el-table :data="bill" style="width: 100%;margin-top: 10px;">
            <el-table-column align="center" prop="copeWith" label="应付">
            </el-table-column>
            <el-table-column align="center" prop="discount" label="折扣">
            </el-table-column>
            <el-table-column align="center" prop="paidIn" label="实付" >
            </el-table-column>
          </el-table>
        </el-tab-pane>
        <el-tab-pane label="明细项目" name="third">
          <el-table :data="infoList" style="width: 100%">
            <el-table-column prop="newID" label="序号"> </el-table-column>
            <el-table-column prop="parent_pro_name" label="父项">
          <el-table :data="infoList" style="width: 100%" max-height    ="300" :span-method="objectSpanMethod1">
            <el-table-column align="center" prop="newID" label="序号"  width="50"> </el-table-column>
            <el-table-column align="center" prop="parent_pro_name" label="父项">
            </el-table-column>
            <el-table-column prop="proName" label="子项"> </el-table-column>
            <el-table-column prop="danjia" label="单价"> </el-table-column>
            <el-table-column prop="num" label="数量"> </el-table-column>
            <el-table-column prop="zongjia" label="总价"> </el-table-column>
            <el-table-column prop="time" label="开单时间"> </el-table-column>
            <el-table-column align="center" prop="pro_name" label="子项"> </el-table-column>
            <el-table-column align="center" prop="danjia" label="单价"> </el-table-column>
            <el-table-column align="center" prop="num" label="数量"> </el-table-column>
            <el-table-column align="center" prop="zongjia" label="总价"> </el-table-column>
            <el-table-column align="center" prop="time" label="开单时间"  width="180"> </el-table-column>
          </el-table>
        </el-tab-pane>
      </el-tabs>
@@ -880,7 +888,7 @@
    return {
      huizongList: [],
      infoList: [],
      activeName1: "first",
      activeName1: "second",
      filterText: "",
      orderIds: "",
      tjnumbers: "",
@@ -1023,12 +1031,12 @@
    },
    filterNode(value, data) {
      if (!value) return true;
      return data.proName.indexOf(value) !== -1;
      // if (value == data.proName) {
      //   return data.proName.indexOf(value) !== -1;
      // } else {
      //   return data.proEngName.indexOf(value) !== -1;
      // }
      // return data.proName.indexOf(value) !== -1;
       if(data.proName.indexOf(value) !== -1){
        return data.proName.indexOf(value) !== -1;
      }else{
        return data.proEngName.indexOf(value) !== -1;
      }
    },
    // / 处理默认选中当前日期
    // getNowTime() {
@@ -1287,8 +1295,6 @@
        this.title = "订单流水";
      });
      getTransitionInfo(tjNumber).then((res) => {
        console.log(111);
        console.log(res);
        this.huizongList = res.data.huizong;
        this.infoList = res.data.info;
        this.huizongList.forEach((item, index) => {
@@ -1314,6 +1320,22 @@
        this.numberList = response.data.charging;
        this.bill = response.data.water;
        this.title = "订单流水";
      });
      getTransitionInfo(tjNumber).then((res) => {
        this.huizongList = res.data.huizong;
        this.infoList = res.data.info;
        this.huizongList.forEach((item, index) => {
          item.newID =
            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
            index +
            1;
        });
        this.infoList.forEach((item, index) => {
          item.newID =
            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
            index +
            1;
        });
      });
    },

@@ -1485,7 +1507,7 @@

    //  // 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      console.log(row, column, rowIndex, columnIndex);
      // console.log(row, column, rowIndex, columnIndex);
      let fields = ["propinName"];
      let cellValue = row[column.property];
      if (cellValue && fields.includes(column.property)) {
@@ -1505,6 +1527,27 @@
      }
    },

    objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
      // console.log(row, column, rowIndex, columnIndex);
      let fields = ["parent_pro_name"];
      let cellValue = row[column.property];
      if (cellValue && fields.includes(column.property)) {
        let prevRow = this.infoList[rowIndex - 1];
        let nextRow = this.infoList[rowIndex + 1];
        if (prevRow && prevRow[column.property] === cellValue) {
          return { rowspan: 0, colspan: 0 };
        } else {
          let countRowspan = 1;
          while (nextRow && nextRow[column.property] === cellValue) {
            nextRow = this.infoList[++countRowspan + rowIndex];
          }
          if (countRowspan > 1) {
            return { rowspan: countRowspan, colspan: 1 };
          }
        }
      }
    },

    // 收费按钮
    submitPrice() {
      this.proIds = [];

 src/views/system/package/index.vue

@@ -781,12 +781,12 @@
    },
    filterNode(value, data) {
      if (!value) return true;
      return data.proName.indexOf(value) !== -1;
      // if(value == data.proName){
      //   return data.proName.indexOf(value) !== -1;
      // }else{
      //   return data.proEngName.indexOf(value) !== -1;
      // }
      // return data.proName.indexOf(value) !== -1;
      if(data.proName.indexOf(value) !== -1){
        return data.proName.indexOf(value) !== -1;
      }else{
        return data.proEngName.indexOf(value) !== -1;
      }
    },
    /** 查询体检套餐列表 */
    getList() {

 src/views/system/tijian/index.vue

@@ -1559,12 +1559,12 @@
    },
    filterNode(value, data) {
      if (!value) return true;
      return data.proName.indexOf(value) !== -1;
      // if(value == data.proName){
      //   return data.proName.indexOf(value) !== -1;
      // }else{
      //   return data.proEngName.indexOf(value) !== -1;
      // }
      // return data.proName.indexOf(value) !== -1;
      if(data.proName.indexOf(value) !== -1){
        return data.proName.indexOf(value) !== -1;
      }else{
        return data.proEngName.indexOf(value) !== -1;
      }
    },
    beforeDestroy() {
      clearInterval(this.timer);

 src/views/system/tijianall/index.vue

@@ -1207,7 +1207,7 @@
    filterNode(value, data) {
      if (!value) return true;
      // return data.proName.indexOf(value) !== -1;
      if(value == data.proName){
      if(data.proName.indexOf(value) !== -1){
        return data.proName.indexOf(value) !== -1;
      }else{
        return data.proEngName.indexOf(value) !== -1;
@@ -1798,7 +1798,6 @@
    },
    //  // 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      console.log(row, column, rowIndex, columnIndex);
      let fields = ["propinName"];
      let cellValue = row[column.property];
      if (cellValue && fields.includes(column.property)) {