From 33de1cf5576373b99dc2a6ed4be097f4d6ad0892 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 30 七月 2025 10:58:03 +0800
Subject: [PATCH] 1111
---
src/views/reservation/reservations/index.vue | 106 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 67 insertions(+), 39 deletions(-)
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 371047c..d039963 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -118,10 +118,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="companyId">
<el-select
:remote-method="getRemoteData"
- v-model="queryParams.company"
+ v-model="queryParams.companyId"
remote
default-first-option
allow-create
@@ -141,7 +141,7 @@
<i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
</el-form-item>
- <el-form-item label="濂楅鍚嶇О" prop="dwDeptName">
+ <!-- <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" />
@@ -152,7 +152,7 @@
<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> -->
<el-form-item label="棰勭害鏃堕棿">
<el-date-picker
clearable
@@ -409,14 +409,21 @@
<el-table-column
label="濂楅鍚嶇О"
align="center"
- prop="tcmc"
+ prop="dwDeptName"
:show-overflow-tooltip="true"
width="160px"
/>
<el-table-column
label="鍒嗙粍鍚嶇О"
align="center"
- prop="fzmc"
+ prop="groupingName"
+ :show-overflow-tooltip="true"
+ width="160px"
+ />
+ <el-table-column
+ label="鍒嗙粍鍚嶇О"
+ align="center"
+ prop="department"
:show-overflow-tooltip="true"
width="160px"
/>
@@ -620,10 +627,10 @@
style="width: 160px"
/>
</el-form-item>
- <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="companyId">
<el-select
:remote-method="getRemoteData"
- v-model="formIn.company"
+ v-model="formIn.companyId"
remote
default-first-option
allow-create
@@ -956,10 +963,11 @@
>
</el-table-column>
<el-table-column label="鎶樻墸" width="160px" align="center">
+ <!-- @input="validateDiscount(scope.row)" -->
<template slot-scope="scope">
<el-input-number
v-model.number="scope.row.discount"
- @input="validateDiscount(scope.row)"
+
placeholder="杈撳叆鎶樻墸"
size="small"
type="number"
@@ -1411,10 +1419,10 @@
style="width: 160px"
/>
</el-form-item>
- <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="companyId">
<el-select
:remote-method="getRemoteData"
- v-model="formIn.company"
+ v-model="formIn.companyId"
remote
default-first-option
allow-create
@@ -1732,9 +1740,10 @@
</el-table-column>
<el-table-column label="鎶樻墸" width="160px" align="center">
<template slot-scope="scope">
+ <!-- @input="validateDiscount(scope.row)" -->
<el-input-number
v-model.number="scope.row.discount"
- @input="validateDiscount(scope.row)"
+
placeholder="杈撳叆鎶樻墸"
size="small"
type="number"
@@ -2033,6 +2042,7 @@
webSocket: null,
defaultKeys: [],
deptList: [],
+ groupingList: [],
value1: "",
pacName: "",
hides: false,
@@ -2429,7 +2439,8 @@
this.open1 = true;
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
- idFn1(value) {
+ idFn1(value) {
+ console.log(value)
if (value) {
this.form.dictCompId = value;
this.CompanyList.forEach((item) => {
@@ -2438,7 +2449,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;
@@ -2489,32 +2514,8 @@
});
}
},
- idFn1(value) {
- console.log(value)
- if (value) {
- this.form.dictCompId = value;
- this.CompanyList.forEach((item) => {
- if (item.drugManufacturerId == this.form.dictCompId) {
- this.form.compName = item.cnName;
- 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;
-
- });
- },
+
+
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
@@ -2557,7 +2558,29 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.startTime = [];
+ this.createTimeList = [];
this.resetForm("queryForm");
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ cusName: null,
+ cusSex: null,
+ cusBrithday: null,
+ cusAddr: null,
+ phone: null,
+ yykssj: "", // 棰勭害寮�濮嬫椂闂�
+ yyjssj: "", // 棰勭害缁撴潫鏃堕棿
+ cusPostcode: null,
+ cusEmail: null,
+ indexCard: null,
+ cusNational: null,
+ cusMarryStatus: null,
+ cusIdcard: null,
+ cusIntroduce: null,
+ cusNumber: null,
+ cusIsvip: null,
+ };
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -3108,6 +3131,11 @@
if (this.formIn.timeRegion === "11:00-12:00") {
this.formIn.timeRegion = 3;
}
+ this.CompanyList.forEach((item) => {
+ if (item.drugManufacturerId === this.formIn.companyId) {
+ this.formIn.company = item.cnName;
+ }
+ });
let data;
if (pacId) {
data = {
--
Gitblit v1.8.0