Commit 706afaa7 authored by hailiang.sun's avatar hailiang.sun

bug修改

parent eb0f5f57
...@@ -32,4 +32,4 @@ npm serve ...@@ -32,4 +32,4 @@ npm serve
-800000056423 -6046 -800000056423 -6046
-800000056424 -7922 -800000056424 -7922
-800000056425 -2468 -800000056425 -2468
-800000056426 -5577 -- 有可约数据-没套餐 -800000056426 -5577
...@@ -50,7 +50,13 @@ ...@@ -50,7 +50,13 @@
</div> </div>
</div> </div>
<div class="foot"> <div class="foot">
<button class="confirm" @click="confirm">确定选择</button> <button
:class="['confirm', storageDate.length <= 0 ? 'sure' : '']"
:disabled="storageDate.length <= 0"
@click="confirm"
>
确定选择
</button>
<button class="cancle" @click="cancle">取消</button> <button class="cancle" @click="cancle">取消</button>
</div> </div>
</div> </div>
...@@ -278,6 +284,7 @@ export default { ...@@ -278,6 +284,7 @@ export default {
}); });
} }
this.swiperData.dateDay[index].Choice = !_Choice; this.swiperData.dateDay[index].Choice = !_Choice;
console.log("确定了?", this.storageDate);
this.$emit("changeDay", this.storageDate); this.$emit("changeDay", this.storageDate);
} }
}, },
...@@ -286,7 +293,6 @@ export default { ...@@ -286,7 +293,6 @@ export default {
let swiperData = {}; let swiperData = {};
this.getDay(`${arr[0]}-${arr[1]}-${arr[2]}`).then((val) => { this.getDay(`${arr[0]}-${arr[1]}-${arr[2]}`).then((val) => {
swiperData = val; swiperData = val;
console.log("不一样", this.schedules, swiperData, arr);
for (let i = 0; i < swiperData.dateDay.length; i++) { for (let i = 0; i < swiperData.dateDay.length; i++) {
for (let k = 0; k < this.schedules.length; k++) { for (let k = 0; k < this.schedules.length; k++) {
if ( if (
...@@ -295,11 +301,9 @@ export default { ...@@ -295,11 +301,9 @@ export default {
) { ) {
swiperData.dateDay[i].personCount = this.schedules[k].personCount; swiperData.dateDay[i].personCount = this.schedules[k].personCount;
swiperData.dateDay[i].disable = false; swiperData.dateDay[i].disable = false;
console.log("没有执行?", swiperData.dateDay[i].disable);
} }
} }
} }
console.log("产出", swiperData);
this.$emit("changeDay", this.storageDate); this.$emit("changeDay", this.storageDate);
this.$set(this, "swiperData", swiperData); this.$set(this, "swiperData", swiperData);
}); });
...@@ -679,6 +683,9 @@ export default { ...@@ -679,6 +683,9 @@ export default {
background: #3f7ffb; background: #3f7ffb;
color: #fff; color: #fff;
} }
.sure {
background: #ccc;
}
.cancle { .cancle {
background: #ccc; background: #ccc;
color: #fff; color: #fff;
......
...@@ -139,6 +139,7 @@ export default { ...@@ -139,6 +139,7 @@ export default {
hospitalId: "", //医院id hospitalId: "", //医院id
supplierId: "", //选择服务中id supplierId: "", //选择服务中id
getScheduleList: [], // 排期列表 getScheduleList: [], // 排期列表
appointmentId: "", // 追加的套餐的id
}; };
}, },
created() { created() {
...@@ -328,7 +329,7 @@ export default { ...@@ -328,7 +329,7 @@ export default {
// 查看排期 // 查看排期
let month = moment().startOf("month").format("yyyyMM"); let month = moment().startOf("month").format("yyyyMM");
// let start = month + "1"; // let start = month + "01";
// let end = month + moment().daysInMonth(); // let end = month + moment().daysInMonth();
this.getScheduleByCode("20211125", "20211225"); this.getScheduleByCode("20211125", "20211225");
}, },
...@@ -338,6 +339,7 @@ export default { ...@@ -338,6 +339,7 @@ export default {
this.datePickShow = false; this.datePickShow = false;
this.showDatemask = false; this.showDatemask = false;
console.log("确认选择", val, this.serviceDate); console.log("确认选择", val, this.serviceDate);
return false;
const _this = this; const _this = this;
const query = { const query = {
dataSource: "M", //数据来源P电脑PC ,M 手机 dataSource: "M", //数据来源P电脑PC ,M 手机
...@@ -375,6 +377,7 @@ export default { ...@@ -375,6 +377,7 @@ export default {
if (res.returnCode === "0000") { if (res.returnCode === "0000") {
console.log("立即预约=", res); console.log("立即预约=", res);
_this.$message.success("预约成功"); _this.$message.success("预约成功");
_this.appointmentId = res.content;
// 提示预约成功,之后跳转到预约详情页面 // 提示预约成功,之后跳转到预约详情页面
setTimeout(() => { setTimeout(() => {
// 需要获取用户id // 需要获取用户id
...@@ -382,6 +385,7 @@ export default { ...@@ -382,6 +385,7 @@ export default {
name: "Detail", name: "Detail",
query: { query: {
id: _this.id, id: _this.id,
appointmentId: _this.appointmentId,
}, },
}); });
}, 1000); }, 1000);
......
...@@ -107,17 +107,20 @@ export default { ...@@ -107,17 +107,20 @@ export default {
maritalStatus: "", maritalStatus: "",
}, //客户信息 }, //客户信息
tips: require("../../assets/imgs/detail/tips.png"), tips: require("../../assets/imgs/detail/tips.png"),
appointmentList: [], //已预约列表
item: {}, // 详情对象,通过路由带过来 item: {}, // 详情对象,通过路由带过来
appointmentId: "", // 新增的套餐id,
}; };
}, },
created() { created() {
const { id } = this.$route.query; const { id, appointmentId } = this.$route.query;
console.log("对象带过来没?", this.$route); console.log("对象带过来没?", this.$route);
this.item = this.$route.params; this.item = this.$route.params;
this.id = id; this.id = id;
this.getCustomerDetail(); //获取客户信息 this.getCustomerDetail(); //获取客户信息
this.getAppointmentList(); //获取客户的预约详情 // 新增新增预约
if (appointmentId) {
this.getAppointmentList(appointmentId); //获取客户的预约详情
}
}, },
methods: { methods: {
// 获取客户信息 // 获取客户信息
...@@ -141,11 +144,15 @@ export default { ...@@ -141,11 +144,15 @@ export default {
}); });
}, },
// 获取预约详情 // 获取预约详情
getAppointmentList() { getAppointmentList(appointmentId) {
api.getAppointmentList({ id: parseInt(this.id) }).then((res) => { api.getAppointmentList({ id: parseInt(this.id) }).then((res) => {
if (res.returnCode == "0000") { if (res.returnCode == "0000") {
console.log("111111111111获取已预约列表==", res.content); console.log("111111111111获取已预约列表==", res.content);
this.appointmentList = res.content; res.content.forEach((el) => {
if (el.id === parseInt(appointmentId)) {
this.item = el;
}
});
} }
}); });
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<span class="point"></span> {{ item.servicepackageName }} <span class="point"></span> {{ item.servicepackageName }}
</div> </div>
<!-- $router.push(item.fileList[0]&&item.fileList[0].url) --> <!-- $router.push(item.fileList[0]&&item.fileList[0].url) -->
<div class="detail" @click="openModel"> <div class="detail">
<img :src="eyes" alt="" />点击查看服务套餐详情 <img :src="eyes" alt="" />点击查看服务套餐详情
<!-- {{item.fileList[0].url}} --> <!-- {{item.fileList[0].url}} -->
</div> </div>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
}} }}
</div> </div>
</div> </div>
<a-modal v-model="visible" width="1000px" :footer="null"> <a-modal width="1000px" :footer="null">
<img <img
style="width: 100%; padding: 20px 20px" style="width: 100%; padding: 20px 20px"
:src="item.fileList[0] && item.fileList[0].url" :src="item.fileList[0] && item.fileList[0].url"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment