Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region

qx

6 天以前 955a8eeb4a139783dea7ce656026e7916b0b4801

 src/views/reservation/reservations/index.vue

@@ -140,6 +140,19 @@
            </el-select>
            <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
          </el-form-item>

           <el-form-item label="套餐名称" prop="dwDeptName">
            <el-select v-model="queryParams.dwDeptName" placeholder="请选择套餐名称" clearable style="width: 100%"
              @change="idFn2">
              <el-option v-for="dict in deptList" :key="dict.id" :label="dict.dwDeptName" :value="dict.id" />
            </el-select>
          </el-form-item>

          <el-form-item label="分组名称" prop="groupingName">
            <el-select v-model="queryParams.groupingName" placeholder="请选择分组名称" clearable style="width: 100%">
              <el-option v-for="dict in groupingList" :key="dict.id" :label="dict.pacName" :value="dict.id" />
            </el-select>
          </el-form-item>
          <el-form-item label="预约时间">
            <el-date-picker
              clearable
@@ -327,7 +340,7 @@
          <span>{{ parseTime(scope.row.reservationTime, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>
      <el-table-column
      <!-- <el-table-column
        label="体检类型"
        align="center"
        prop="tjType"
@@ -337,7 +350,7 @@
        <template slot-scope="scope">
          <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
        </template>
      </el-table-column>
      </el-table-column> -->
      <el-table-column
        label="婚姻"
        align="center"
@@ -386,10 +399,24 @@
        prop="company"
        :show-overflow-tooltip="true"
      />
      <el-table-column
      <!-- <el-table-column
        label="邮箱"
        align="center"
        prop="email"
        :show-overflow-tooltip="true"
        width="160px"
      /> -->
      <el-table-column
        label="套餐名称"
        align="center"
        prop="tcmc"
        :show-overflow-tooltip="true"
        width="160px"
      />
      <el-table-column
        label="分组名称"
        align="center"
        prop="fzmc"
        :show-overflow-tooltip="true"
        width="160px"
      />
@@ -1935,7 +1962,8 @@
</template>

<script>
import { addComp, addPlOrderAndDetail } from "@/api/system/comp";
import { addComp, addPlOrderAndDetail, Deptlist,
  getDwAndDwDept, } from "@/api/system/comp";
import Big from "big.js";
import { Loading } from "element-ui";
import {
@@ -2004,6 +2032,8 @@
      taocan: false,
      webSocket: null,
      defaultKeys: [],
      deptList: [],
      groupingList: [],
      value1: "",
      pacName: "",
      hides: false,
@@ -2400,7 +2430,8 @@
      this.open1 = true;
      this.title = "添加体检单位信息维护";
    },
    idFn1(value) {
     idFn1(value) {
      console.log(value)
      if (value) {
        this.form.dictCompId = value;
        this.CompanyList.forEach((item) => {
@@ -2409,7 +2440,21 @@
            this.queryParams.company = item.cnName;
          }
        });
        Deptlist(value).then((response) => {
          this.deptList = response.data;
        });
      }
    },
      idFn2(value) {
      let data = {
        deptId: value,
        dwId: this.form.dictCompId,
      };
      getDwAndDwDept(data).then((response) => {
        // 部门名称
        this.groupingList = response.data;

      });
    },
    dateChangebirthday2(val) {
      this.startTime = val;
@@ -2460,6 +2505,8 @@
        });
      }
    },
   
  
    // 表单重置
    reset() {
      this.form = {