qx

qx

昨天 c1b92c8821e62bbf151d747a0ec630e18677438b

qx

 src/views/doctor/checkAll/index.vue

@@ -1,7 +1,6 @@
<template>
  <div class="mainbox">
    <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px"
      v-if="tjStatus == 0">
       <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px">
      <el-form-item label="姓名" prop="name">
        <el-input v-model="queryParams.name" style="width: 120px" placeholder="请输入姓名" clearable
          @keyup.enter.native="submitForm"></el-input>
@@ -10,11 +9,15 @@
        <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="请输入体检号" clearable
          @keyup.enter.native="submitForm" @blur="hb"></el-input>
      </el-form-item>
      <el-form-item label="体检时间" prop="tjTime">
        <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
          style="width: 310px" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:00:00']"
          format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
        </el-date-picker>
       <el-form-item label="体检类别">
                <el-select style="width: 200px" v-model="queryParams.tjCategory" placeholder="请选择体检类别">
                  <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                </el-select>
              </el-form-item>
      <el-form-item label="套餐名称" prop="tcm">
        <el-input v-model="queryParams.tcm" style="width: 120px" placeholder="请输入套餐名称" clearable
          @keyup.enter.native="submitForm"></el-input>
      </el-form-item>
      <el-form-item label="单位名称" prop="tjCompName" style="margin-left: 20px">
        <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
@@ -22,21 +25,37 @@
          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
        </el-select>
      </el-form-item>
      <el-form-item label="体检类别">
        <el-select style="width: 200px" v-model="queryParams.tjCategory" placeholder="请选择体检类别"  @change="searchCategory">
          <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
            :value="dict.value"></el-option>
        </el-select>
        <!-- <el-input v-model="form.category" placeholder="请输入体检类别" /> -->
      </el-form-item>

      <el-form-item>
        <el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">搜索</el-button>
        <el-button size="mini" @click="resetQuery">重置</el-button>
        <el-button type="primary" size="mini" @click="toggleCollapse" style="margin-right: 15px"
          v-show="isCollapsed == 0">高级搜索</el-button>
        <el-button type="primary" size="mini" @click="toggleCollapse3" style="margin-right: 15px"
          v-show="isCollapsed == 1">高级搜索</el-button>
      </el-form-item>
      <el-row v-show="isCollapsed == 1" :gutter="20">
         <el-col :span="4">
        <el-form-item label="审核医师" prop="shys">
          <el-input ref="inputName" v-model="queryParams.shys" style="width: 120px" placeholder="请输入审核医师" clearable
            @keyup.enter.native="submitForm"></el-input>
        </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="体检时间" prop="tjTime">
            <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
              style="width: 310px" start-placeholder="开始日期" end-placeholder="结束日期"
              :default-time="['00:00:00', '23:00:00']" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
              @change="dateChangebirthday1">
            </el-date-picker>
          </el-form-item>
        </el-col>

      </el-row>
    </el-form>


    <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px"
    <!-- <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px"
      v-if="tjStatus == 1">
      <el-form-item label="姓名" prop="name">
        <el-input v-model="queryParams.name" style="width: 120px" placeholder="请输入姓名" clearable
@@ -62,7 +81,7 @@
          <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
            :value="dict.value"></el-option>
        </el-select>
        <!-- <el-input v-model="form.category" placeholder="请输入体检类别" /> -->
        <el-input v-model="form.category" placeholder="请输入体检类别" /> 
      </el-form-item>
      <el-form-item>
        <el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">搜索</el-button>
@@ -84,7 +103,7 @@
        </el-col>
      </el-row>

    </el-form>
    </el-form> -->

    <el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 20px">
      <el-radio-button label="0">未审核</el-radio-button>
@@ -1050,6 +1069,7 @@
        name: null,
        checkStatus: null,
        shys: null,
        tcm: null,
        tjCategory: null
      },
      formobj: {},

 src/views/hosp/project/index.vue

@@ -470,11 +470,11 @@
      ],
      wsTypesy: [
        {
          value:"0",
          value:"1",
          label:"是"
        },
        {
          value:"1",
          value:"0",
          label:"否"
        }
      ],

 src/views/login.vue

@@ -182,6 +182,12 @@
            case '8099':
            this.loginForm.hospId = "bjfhyy";
            break;
             case '8100':
            this.loginForm.hospId = "ssyjyy";
            break;
             case '8101':
            this.loginForm.hospId = "bjsqyy";
            break;
        }
        Cookies.set("hospId", this.loginForm.hospId);
      } else if (env === 'staging') {
@@ -205,6 +211,12 @@
          case '9017':
            this.loginForm.hospId = "bjxjyy";
            break;
             case '9018':
            this.loginForm.hospId = "ssyjyy";
            break;
             case '9019':
            this.loginForm.hospId = "bjsqyy";
            break;
        }
        Cookies.set("hospId", this.loginForm.hospId);
      }

 src/views/system/tijian/index.vue

@@ -421,6 +421,31 @@
            </el-col>
          </el-row>
        </el-tab-pane>
        <el-tab-pane label="亲属套餐" name="four">
          <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto"
            @submit.native.prevent="handle">
            <el-form-item label="姓名" prop="pacName">
              <el-input v-model="queryParam.pacName" placeholder="请输入姓名" clearable @keyup.enter.native="handle" />
            </el-form-item>
             <el-form-item label="身份证" prop="pacName">
              <el-input v-model="queryParam.pacName" placeholder="请输入身份证" clearable @keyup.enter.native="handle" />
            </el-form-item>
            <el-form-item>
              <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">查询</el-button>
            </el-form-item>
          </el-form>
          <div class="tab4">
            <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
              <el-table v-loading="loading" element-loading-text="正在加载中..." element-loading-spinner="el-icon-loading"
                border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb">
                <el-table-column type="selection" width="40px" align="center" label="选择" />
                <el-table-column label="套餐名称" align="center" prop="pacName" width="120px" />
                <el-table-column label="套餐价格" align="center" prop="price" width="120px" />
                <el-table-column label="套餐明细" align="center" prop="allProName" :show-overflow-tooltip="true" />
              </el-table>
            </div>
          </div>
        </el-tab-pane>
      </el-tabs>
      <span slot="footer" class="dialog-footer">
        <el-button @click="cancel">取 消</el-button>
@@ -479,8 +504,11 @@
                  :max="10" :min="0" @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
              </el-form-item>
              <el-form-item label="实收金额">
                <el-input placeholder="实收金额" v-model="TotalPrice" style="width: 206px" @input="changeXianjia"
                <el-input placeholder="实收金额" v-model="TotalPrice" style="width: 205px" @input="changeXianjia"
                  @blur="numberChangeXianPrice(discount, discount)" />
              </el-form-item>
              <el-form-item label="是否替检" v-if="tjtype">
                <el-input placeholder="是否替检" v-model="sftj" style="width: 150px"></el-input>
              </el-form-item>
              <br />

@@ -923,6 +951,8 @@
      proIds: [],
      // 显示搜索条件
      showSearch: true,
      tjtype: false,
      sftj:null,
      activeNames: "first",
      // 树状形状
      Treedata: [],
@@ -1231,6 +1261,7 @@
      this.title = "添加体检单位信息维护";
    },
    idFn1() {
      this.tjtype = true
      if (this.form.firmName) {
        const originalCompId = this.form.firmId;
        this.CompanyList.forEach((item) => {
@@ -1743,10 +1774,10 @@
      }

      // 可选：检查 sfzImg 是否存在
      if (!formData.sfzImg) {
        this.$message.warning("请先获取身份证头像");
        return;
      }
      // if (!formData.sfzImg) {
      //   this.$message.warning("请先获取身份证头像");
      //   return;
      // }

      addCustomer(formData).then((response) => {
        this.responseList = response.data;
@@ -2946,9 +2977,11 @@

    // 处理订单项目
    processOrderItems(cusId) {
      console.log(11222)
      getTransitionList1(cusId).then((response) => {
        this.tableData1 = response.data;
       this.tableData1 = response.data;
        // if (response.data.tjCategory != null) {
        //   this.tjCategory = response.data.tjCategory;
        // }
        let Price = 0;
        if (this.tableData1) {
          this.tableData1.forEach((item) => {