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

qx

2025-07-04 ad54cf427ee94e01e8c72a01f738615eb2b6569d

 src/views/reservation/reservations/index.vue

@@ -142,6 +142,18 @@
            <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
@@ -184,6 +196,7 @@
              />
            </el-select>
          </el-form-item>

          <el-form-item>
            <el-button
              type="primary"
@@ -319,7 +332,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"
@@ -329,7 +342,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"
@@ -379,9 +392,23 @@
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="邮箱"
        label="套餐名称"
        align="center"
        prop="email"
        prop="dwDeptName"
        :show-overflow-tooltip="true"
        width="160px"
      />
      <el-table-column
        label="分组名称"
        align="center"
        prop="groupingName"
        :show-overflow-tooltip="true"
        width="160px"
      />
      <el-table-column
        label="单位部门"
        align="center"
        prop="department"
        :show-overflow-tooltip="true"
        width="160px"
      />
@@ -1920,7 +1947,12 @@
</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 {
@@ -1989,6 +2021,8 @@
      taocan: false,
      webSocket: null,
      defaultKeys: [],
      deptList: [],
      groupingList: [],
      value1: "",
      pacName: "",
      hides: false,
@@ -2392,6 +2426,7 @@
      this.title = "添加体检单位信息维护";
    },
    idFn1(value) {
      console.log(value);
      if (value) {
        this.form.dictCompId = value;
        this.CompanyList.forEach((item) => {
@@ -2400,7 +2435,20 @@
            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;
      });
    },
    /** 查询体检预约列表 */
    getList() {
@@ -3359,12 +3407,14 @@
  -moz-border-radius: 2em;
  border-radius: 2em;
}

.dialog-footer2 {
  width: 960px;
  height: 36px;
  display: flex;
  justify-content: center;
}

/* 修改 滑块 */
#printIframe::-webkit-scrollbar-thumb {
  background-color: #dcdfe6;