qx
qx
16 小时以前 a3350d3b221f68b00d7476b481455406cb6ddcc5
qx
10个文件已修改
503 ■■■■■ 已修改文件
src/api/system/comp.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/team/tuanti.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/proposal/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/doctor/checkAll/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/commonAdvice/index.vue 122 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hosp/project/index.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reservation/roupsettlement/index.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/info/index.vue 253 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/package/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/tijian/index.vue 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/system/comp.js
@@ -204,3 +204,13 @@
    }
  })
}
// 根据单位id和部门ID查询单位分组信息
export function gettuantijiesuanrenyuan(data) {
  return request({
    url: '/hosp/water/gettuantijiesuanrenyuan',
    method: 'get',
    params: data
  })
}
src/api/team/tuanti.js
@@ -45,13 +45,11 @@
  });
}
// 
export function getTeamTjPeopleList(teamNo) {
export function getTeamTjPeopleList(data) {
  return request({
    url: '/team/pay/getTeamTjPeopleList',
    method: 'get',
    params:{
      teamNo:teamNo
    }
    params:data
  })
}
src/components/proposal/index.vue
@@ -19,8 +19,10 @@
      <el-form inline @submit.native.prevent="search">
        <el-form-item>
          <el-radio-group v-model="tjproposal" @input="radiotjproposalChange">
            <el-radio-button label="0">常用建议</el-radio-button>
            <el-radio-button label="1">快捷建议</el-radio-button>
            <!-- <el-radio-button label="0">常用建议</el-radio-button>
            <el-radio-button label="1">快捷建议</el-radio-button> -->
            <el-radio-button label="0">快捷建议</el-radio-button>
            <el-radio-button label="1">常用建议</el-radio-button>
          </el-radio-group>
        </el-form-item>
        <el-form-item v-show="tjproposal == 0">
src/views/doctor/checkAll/index.vue
@@ -2113,6 +2113,7 @@
      this.startTime = [];
      this.resetForm("tableList");
      this.submitForm();
      this.queryParams.tjCategory =null
    },
    huifu(row) {
src/views/hosp/commonAdvice/index.vue
@@ -1,113 +1,52 @@
<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="bt">
        <el-input
          v-model="queryParams.bt"
          placeholder="请输入标题"
          clearable
          @keyup.enter.native="handleQuery"
        />
        <el-input v-model="queryParams.bt" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="建议" prop="nr">
        <el-input
          v-model="queryParams.nr"
          placeholder="请输入检查项目"
          clearable
          @keyup.enter.native="handleQuery"
        />
        <el-input v-model="queryParams.nr" placeholder="请输入检查项目" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item>
        <el-button
          type="primary"
          icon="el-icon-search"
          size="mini"
          @click="handleQuery"
          >搜索</el-button
        >
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
          >重置</el-button
        >
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
    <el-table
      :data="dataList"
      ref="elTable"
      v-loading="loading"
      @selection-change="handleSelectionChange"
      border
      height="580px"
    >
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" size="mini" @click="proposalChange">新增</el-button>
      </el-col>
    </el-row>
    <el-table :data="dataList" ref="elTable" v-loading="loading" @selection-change="handleSelectionChange" border
      height="580px">
      <el-table-column type="selection" width="40" align="center" />
      <el-table-column label="序号" width="70" align="center" prop="newID" />
      <el-table-column label="标题" width="120" align="center" prop="title" />
      <el-table-column label="建议内容" align="left" prop="advice" />
      <el-table-column
        label="操作"
        align="center"
        fixed="right"
        class-name="small-padding fixed-width"
        width="100px"
      >
      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="100px">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleEdit(scope.row)"
            title="修改"
          ></el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            title="删除"
          ></el-button>
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)" title="修改"></el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            title="删除"></el-button>
        </template>
      </el-table-column>
    </el-table>
    <pagination
      v-show="total > 0"
      :total="total"
      :page.sync="queryParams.page"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize"
      @pagination="getList" />
    <!-- 修改快速建议标题和内容 -->
    <el-dialog
      :title="title"
      :visible.sync="open"
      width="1000px"
      append-to-body
      :close-on-click-modal="false"
    >
    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
      <el-form ref="form" :model="form" label-width="80px" :inline="true">
        <el-form-item label="标题" prop="title">
          <el-input
            v-model="form.title"
            placeholder="请输入标题"
            style="width: 200px"
          />
          <el-input v-model="form.title" placeholder="请输入标题" style="width: 200px" />
        </el-form-item>
        <el-form-item label="内容" prop="advice">
          <el-input
            v-model="form.advice"
            type="textarea"
            placeholder="请输入主要内容"
            style="width: 780px"
          />
          <el-input v-model="form.advice" type="textarea" placeholder="请输入主要内容" style="width: 780px" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -125,6 +64,9 @@
  getAdvice,
  delAdvice
} from "@/api/advice/advice";
import {
  addCyTjAdvice,
} from "@/api/system/biaoqianzidian";
import {
  getKjTjAdviceKjbqBySex,
  getCyTjAdviceKjbqBySex,
@@ -198,6 +140,9 @@
      this.open = false;
      this.reset();
    },
    proposalChange() {
      this.open = true;
    },
    // 表单重置
    reset() {
      this.form = {
@@ -238,7 +183,12 @@
              this.getList();
            });
          } else {
            addAdvice(this.form).then((response) => {
            // addAdvice(this.form).then((response) => {
            //   this.$modal.msgSuccess("新增成功");
            //   this.open = false;
            //   this.getList();
            // });
            addCyTjAdvice(this.form).then((response) => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
@@ -277,5 +227,3 @@
  },
};
</script>
src/views/hosp/project/index.vue
@@ -636,6 +636,12 @@
            ></el-option>
          </el-select>
        </el-form-item>
         <el-form-item label="是否外送" prop="proDelivery">
          <el-select v-model="form.proDelivery" placeholder="请选择是否外送" style="width: 200px">
            <el-option v-for="dict in wsTypesy" :key="dict.value" :label="dict.label"
              :value="dict.value"></el-option>
          </el-select>
        </el-form-item>
      </el-form>
      <el-button
        style="margin-left: 40px"
@@ -1022,6 +1028,16 @@
          label: "否",
        },
      ],
         wsTypesy: [
        {
          value:"1",
          label:"是"
        },
        {
          value:"0",
          label:"否"
        }
      ],
      xmmc: "",
      chargeId: [],
      List: false,
src/views/reservation/roupsettlement/index.vue
@@ -11,7 +11,7 @@
            <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
          </el-form-item>
          <el-form-item label="单位名称" prop="company">
          <el-form-item label="单位名称" prop="dwId">
            <el-select :remote-method="getRemoteData" v-model="queryParams.company" remote default-first-option
              allow-create filterable style="width: 200px" placeholder="请选择单位名称" clearable @change="idFn1">
              <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
@@ -107,7 +107,7 @@
    <div class="pag">
      <div class="pag1">
        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page"
          :limit.sync="queryParams.pageSize" @pagination="getList" />
      </div>
    </div>
@@ -178,7 +178,7 @@
</template>
<script>
import { addComp } from "@/api/system/comp";
import { addComp,gettuantijiesuanrenyuan } from "@/api/system/comp";
import {
  listReservation,
} from "@/api/reservation/reservation";
@@ -257,12 +257,6 @@
      value: 1,
      sendFlag: 0,
      sector: 0,
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
      },
      fmobj: {},
      // 表单校验
      form1: {},
@@ -330,19 +324,16 @@
      title: "",
      // 查询参数
      queryParams: {
        pageNum: 1,
        page: 1,
        pageSize: 10,
        orderByColumn: "reservationTime",
        isAsc: "desc",
        name: null,
        reservationTime: null,
        idCard: null,
        phoe: null,
        email: null,
        tjType: null,
        company: null,
        reservationTime: null,
        isExpire: null,
        dwId: null,
        djkssj: null,
        djjssj: null,
        jskssj: null,
        jsjssj: null,
        tjh: null,
        jsrid: null,
      },
      // 表单参数
      form: {},
@@ -463,8 +454,8 @@
    /** 查询体检预约列表 */
    getList() {
      this.loading = true;
      listReservation(this.queryParams).then((response) => {
        this.reservationList = response.rows;
      gettuantijiesuanrenyuan(this.queryParams).then((response) => {
        this.reservationList = response.customers;
        //  response.rows.forEach((item, index) =>
        // {item.newID =(this.queryParams.pageNum - 1) * this.queryParams.pageSize +index +1;
        //   });
src/views/system/info/index.vue
@@ -1,48 +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-row>
        <el-col :span="11">
          <el-form-item label="单位名称" prop="company" style="display: flex">
            <el-select
              :remote-method="getRemoteData"
              v-model="queryParams.company"
              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.company" 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-col>
        <el-col :span="6">
          <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-col>
      </el-row>
@@ -93,51 +66,35 @@
            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row> -->
    <el-table
      id="sig"
      v-loading="loading"
      :data="infoList"
      @selection-change="handleSelectionChange"
      border
      ref="tb"
      max-height="260px"
    >
    <el-table id="sig" v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" border ref="tb"
      max-height="260px">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="部门" align="center" prop="pacName" />
      <el-table-column label="预检人数" align="center" prop="count" />
      <el-table-column label="实检人数" align="center" prop="sjCount" />
        <el-table-column label="已结人数" align="center" prop="yjsrs" />
      <el-table-column label="应收金额" align="center" prop="copeWith" />
      <el-table-column label="签约金额" align="center" prop="signingPrice">
      </el-table-column>
      <el-table-column
        label="已付金额"
        align="center"
        prop="transactionAmount"
      />
      <el-table-column label="已付金额" align="center" prop="transactionAmount" />
      <el-table-column label="差额" align="center" prop="difference" />
      <el-table-column label="签约人" align="center" prop="payer" />
      <el-table-column
        label="预约时间"
        align="center"
        prop="createTime"
        :formatter="formatDate"
      />
      <el-table-column label="预约时间" align="center" prop="createTime" :formatter="formatDate" />
    </el-table>
    <el-form
      :inline="true"
      :model="formInline"
      class="demo-form-inline"
      style="margin: 12px 6px"
      label-width="100px"
    >
    <div >
      <el-radio-group v-model="jcStatus" @change="radioChange" style="margin-left: 20px; margin-top: 20px">
        <el-radio-button label="0">已检未结账人员</el-radio-button>
        <el-radio-button label="1">未检人员</el-radio-button>
        <el-radio-button label="2">全部人员</el-radio-button>
      </el-radio-group>
       <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px" label-width="100px">
      <el-row>
        <el-col :span="5">
          <el-form-item label="负责人" style="display: flex">
            <el-input
              v-model="formInline.payer"
              placeholder="单位负责人"
            ></el-input>
            <el-input v-model="formInline.payer" placeholder="单位负责人"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="6">
@@ -147,28 +104,15 @@
        </el-col>
        <el-col :span="6">
          <el-form-item label="交易类型" prop="payType" style="display: flex">
            <el-select
              v-model="formInline.payType"
              placeholder="请选择交易类型"
            >
              <el-option
                v-for="dict in dict.type.dict_pay_type"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              ></el-option>
            <el-select v-model="formInline.payType" placeholder="请选择交易类型">
              <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
                :value="dict.value"></el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="4">
          <el-form-item style="display: flex">
            <el-button
              type="primary"
              size="mini"
              @click="SubmitEvent"
              style="margin: 0 15px"
              >收费</el-button
            >
            <el-button type="primary" size="mini" @click="SubmitEvent" style="margin: 0 15px">结账</el-button>
          </el-form-item>
        </el-col>
        <!-- <el-col :span="7">
@@ -188,64 +132,36 @@
      </el-row>
    </el-form>
    <div style="display: flex; justify-content: space-between;">
      <el-radio-group
        v-model="jcStatus"
        @input="radioChange"
        style="margin-left: 20px; margin-top: 20px"
      >
        <el-radio-button label="0">已检未结账人员</el-radio-button>
        <el-radio-button label="1">未检人员</el-radio-button>
        <el-radio-button label="2">全部人员</el-radio-button>
      </el-radio-group>
      <el-form
        :model="queryParams1"
        ref="queryForm"
        size="small"
        :inline="true"
        v-show="showSearch"
        label-width="68px"
        style="margin-top: 20px; margin-right: 22%;"
      >
    </div>
    <el-row :gutter="20">
       <!-- <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
        style="margin-top: 20px; margin-right: 22%;">
        <el-form-item label="结账时间">
            <el-date-picker clearable v-model="queryParams1.reservationTime" type="date" value-format="yyyy-MM-dd"
              placeholder="请选择结账时间">
            </el-date-picker>
          </el-form-item>
        <el-form-item>
            <el-button
              type="primary"
              icon="el-icon-search"
              size="mini"
              @click="handleQuery1"
              style="margin: 0 15px"
              >搜索</el-button
            >
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery1"
              >重置</el-button
            >
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery1"
            style="margin: 0 15px">查询</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery1">重置</el-button>
          </el-form-item>
      </el-form>
    </div>
    <el-row :gutter="20">
      </el-form> -->
      <el-col :span="12" :xs="24" style="padding: 0px 20px">
        <div class="tj">
          <span class="tj_txt">体检人员情况表</span>
        </div>
        <el-table
          v-loading="loading"
          :data="peopleList"
          border
          max-height="260px"
        >
        <el-table v-loading="loadings" :data="peopleList" border max-height="260px" @selection-change="handlepeopleListChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="序号" align="center" prop="newID" width="50" />
          <el-table-column label="姓名" align="center" prop="name" width="100" />
          <el-table-column label="性别" align="center" prop="sex" width="80" />
          <el-table-column label="电话" align="center" prop="iphone" width="120" />
          <el-table-column label="性别" align="center" prop="xb" width="80" />
          <el-table-column label="电话" align="center" prop="dh" width="120" />
                    <el-table-column label="金额" align="center" prop="tjf" width="120" />
          <el-table-column label="状态" align="center" prop="tjStatus" width="80"  />
          <el-table-column label="体检时间" align="center" prop="tjTime">
          </el-table-column>
@@ -257,22 +173,9 @@
          <span class="tj_txt">已结账记录</span>
        </div>
        <el-table
          v-loading="loading"
          :data="dataList"
          border
          max-height="260px"
        >
          <el-table-column
            label="交易金额"
            align="center"
            prop="transactionAmount"
          />
          <el-table-column
            label="交易方式"
            align="center"
            prop="paymentMethod"
          />
        <el-table v-loading="loading" :data="dataList" border max-height="260px">
          <el-table-column label="交易金额" align="center" prop="transactionAmount" />
          <el-table-column label="交易方式" align="center" prop="paymentMethod" />
          <el-table-column label="交易人员" align="center" prop="payer" />
          <el-table-column label="操作人员" align="center" prop="payee">
          </el-table-column>
@@ -328,6 +231,8 @@
      },
      // 遮罩层
      loading: true,
       // 遮罩层
      loadings: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@@ -342,6 +247,7 @@
      // 体检单位缴费明细表格数据
      infoList: [],
      copeWith: "",
      pacIds: "",
      transactionAmount: "",
      dataList: [],
      tableList: [],
@@ -416,7 +322,33 @@
      this.compId = val;
    },
    radioChange(val) {},
    radioChange(val) {
      this.peopleList = []
      this.loadings = true
       let data = {
          teamNo: this.teamNo,
          pacId: this.pacIds
        }
        getTeamTjPeopleList(data).then((res) => {
          if (res.data) {
            if (this.jcStatus == 0) {
              this.peopleList = res.data.yjwjzList;
            } else if (this.jcStatus == 1) {
              this.peopleList = res.data.wjList;
            } else {
              this.peopleList = res.data.syList;
            }
          }
           this.loadings = false
        });
    },
    handlepeopleListChange(selection){
      console.log(selection)
    },
    // 体检公司拼音搜索
    getRemoteData(query) {
@@ -462,7 +394,7 @@
        this.infoList.forEach((item) => {
          this.copeWith = item.copeWith;
          this.transactionAmount = item.transactionAmount;
          this.formInline.price = item.copeWith - item.transactionAmount;
          if (item.payInfo != null) {
            this.tjCompPayId = item.payInfo.tjCompPayId;
          }
@@ -502,7 +434,6 @@
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      console.log(2222);
      if (selection.length > 1) {
        let del_row = selection.shift();
        this.$refs.tb.toggleRowSelection(del_row, false); //设置这一行取消选中
@@ -512,11 +443,12 @@
      // this.multiple = !selection.length;
      this.tableList = selection;
      this.teamNo = "";
      this.pacIds = "";
      this.tableList.forEach((item) => {
        this.teamNo = item.teamNo;
        this.pacIds = item.pacId
        this.copeWith = item.copeWith;
        this.transactionAmount = item.transactionAmount;
        this.formInline.price = item.copeWith - item.transactionAmount;
        if (item.payInfo != null) {
          this.tjCompPayId = item.payInfo.tjCompPayId;
        }
@@ -537,18 +469,24 @@
          });
        }
      });
      console.log(11111);
      this.loadings = true
      if (this.teamNo) {
        getTeamTjPeopleList(this.teamNo).then((res) => {
          if (res.data) {
            this.peopleList = res.data;
            res.data.forEach((item, index) => {
              item.newID =
                (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
                index +
                1;
            });
        let data = {
          teamNo: this.teamNo,
          pacId: this.pacIds
          }
        getTeamTjPeopleList(data).then((res) => {
          if (res.data) {
            if (this.jcStatus == 0) {
              this.peopleList = res.data.yjwjzList;
            } else if (s.jcStatus == 1) {
              this.peopleList = res.data.wjList;
            } else {
              this.peopleList = res.data.syList
                ;
            }
          }
           this.loadings = false
        });
      }
    },
@@ -558,9 +496,6 @@
    //   this.open = true;
    //   this.title = "添加体检单位缴费明细";
    // },
    // 单选按钮
    radioChange(val) {},
    /** 收费提交按钮 */
    SubmitEvent() {
src/views/system/package/index.vue
@@ -318,7 +318,7 @@
      debounceTimer: null,
      rules: {
        pacName: [{ required: true, message: "请输入套餐名称", trigger: "blur" }],
        pics: [{ required: true, message: "请输入原价", trigger: "blur" }],
        // pics: [{ required: true, message: "请输入原价", trigger: "change" }],
        xianprice: [{ required: true, message: "请输入现价", trigger: "blur" }],
      },
    };
src/views/system/tijian/index.vue
@@ -146,17 +146,7 @@
                  },
                  trigger: 'blur',
                },
<<<<<<< HEAD
              ]">
                <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
                  证件号码
                </span>
                <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="请输入身份证号"
                  @input="handleIdCardInput" />
                <!-- <i style="
=======
                trigger: 'blur',
              },
            ]">
              <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
                证件号码
@@ -164,7 +154,6 @@
              <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="请输入身份证号"
                @input="handleIdCardInput" maxlength="18"/>
              <!-- <i style="
>>>>>>> 0c23ed71897641b9ee66d81082cbc999e0c5f0ae
                    font-size: 1rem;
                    position: absolute;
                    right: -20px;
@@ -478,10 +467,19 @@
                  <el-input v-model="form.cusName" placeholder="请输入姓名" :disabled="isDisabled" />
                </el-form-item>
                <el-form-item label="性别" prop="cusSex">
                  <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="性别" style="width: 150px">
                  <el-select :disabled="isDisabled" 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="age">
                  <el-input v-model="form.age" :disabled="isDisabled"  style="width: 142px"/>
                  <!-- <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 15%">
                    <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
                      :value="dict.value"></el-option>
                  </el-select> -->
                </el-form-item>
                <el-form-item label="证件号码" prop="cusIdcard">
                  <span slot="label"> 证件号码 </span>
@@ -1174,7 +1172,10 @@
        .then(() => {
          this.TotalPrice1 = 0;
          getTransitionList1(row.cusId).then((response) => {
            this.tableData1 = response.data;
            this.tableData1 = response.data.list;
            if (response.data.tjCategory != null) {
              this.tjCategory = response.data.tjCategory;
            }
            this.tableData1.forEach((item) => {
              this.TotalPrice1 += item.ordPrice;
@@ -1495,7 +1496,10 @@
            let cusId = this.form.cusIdcard;
            this.proIds = [];
            getTransitionList1(cusId).then((response) => {
              this.tableData1 = response.data;
              this.tableData1 = response.data.list;
              if (response.data.tjCategory != null) {
                this.tjCategory = response.data.tjCategory;
              }
              this.TotalPrice1 = 0;
              if (this.tableData1) {
                this.tableData1.forEach((item) => {
@@ -1869,7 +1873,10 @@
                _this.tcShow = true;
                getTransitionList1(this.form.cusIdcard).then((res) => {
                  this.tableData1 = res.data;
                  this.tableData1 = res.data.list;
                  if (res.data.tjCategory != null) {
                    this.tjCategory = res.data.tjCategory;
                  }
                  if (this.tableData1) {
                    this.tableData1.forEach((item) => {
                      this.TotalPrice1 += item.ordPrice;
@@ -1894,7 +1901,10 @@
                  _this.formPacId = this.form.pacId;
                  let cusId = this.form.cusIdcard;
                  getTransitionList1(cusId).then((response) => {
                    this.tableData1 = response.data;
                    this.tableData1 = response.data.list;
                    if (response.data.tjCategory != null) {
                      this.tjCategory = response.data.tjCategory;
                    }
                    if (this.tableData1) {
                      this.TotalPrice1 = 0;
                      this.tableData1.forEach((item) => {
@@ -2400,7 +2410,10 @@
          let cusId = this.form.cusIdcard;
          this.proIds = [];
          getTransitionList1(cusId).then((response) => {
            this.tableData1 = response.data;
            this.tableData1 = response.data.list;
            if (response.data.tjCategory != null) {
              this.tjCategory = response.data.tjCategory;
            }
            this.TotalPrice1 = 0;
            if (this.tableData1.length >= 1) {
              this.list1 = false;
@@ -3026,14 +3039,11 @@
    // 处理订单项目
    processOrderItems(cusId) {
      console.log(111112222233333)
      getTransitionList1(cusId).then((response) => {
        this.contentLoading = false;
        this.tableData1 = response.data.list;
        if (response.data.tjCategory != null) {
          this.tjCategory = response.data.tjCategory;
        }
        let Price = 0;
        if (this.tableData1) {