Commit b8cd1f7b authored by hailiang.sun's avatar hailiang.sun

bug修复

parent 95c2e5fb
This diff is collapsed.
...@@ -41,24 +41,24 @@ ...@@ -41,24 +41,24 @@
<!-- 预约详情 --> <!-- 预约详情 -->
<div class="detail"> <div class="detail">
<div class="title"><span class="point"></span>预约详情</div> <div class="title"><span class="point"></span>预约详情</div>
<ul class="items" v-for="item in appointmentList" :key="item.id"> <ul class="items">
<li> <li>
<div class="label">已选服务:</div> <div class="label">已选服务:</div>
<div class="detail_content"> <div class="detail_content">
{{item.servicepackageName}} {{ item.servicepackageName }}
</div> </div>
</li> </li>
<li> <li>
<div class="label">已选服务门店:</div> <div class="label">已选服务门店:</div>
<div class="detail_content">{{item.checkUnitName}}</div> <div class="detail_content">{{ item.checkUnitName }}</div>
</li> </li>
<li> <li>
<div class="label">已选服务门店地址:</div> <div class="label">已选服务门店地址:</div>
<div class="detail_content">{{item.shopAddress}}</div> <div class="detail_content">{{ item.shopAddress }}</div>
</li> </li>
<li> <li>
<div class="label">预约日期:</div> <div class="label">预约日期:</div>
<div class="detail_content">{{item.serviceAppDate}}</div> <div class="detail_content">{{ item.serviceAppDate }}</div>
</li> </li>
</ul> </ul>
<div class="tips"> <div class="tips">
...@@ -68,7 +68,17 @@ ...@@ -68,7 +68,17 @@
> >
</div> </div>
<div class="btns"> <div class="btns">
<a-button type="primary">预约中...</a-button> <a-button type="primary" disabled>{{
item.status === "88" ||
item.status === "99" ||
item.status === "1"
? "预约中..."
: item.status === "3"
? "取消中..."
: item.status === "7"
? "改约中..."
: "状态异常"
}}</a-button>
<a-button type="primary" @click="goIndexPage"> 回首页 </a-button> <a-button type="primary" @click="goIndexPage"> 回首页 </a-button>
</div> </div>
</div> </div>
...@@ -78,66 +88,69 @@ ...@@ -78,66 +88,69 @@
</template> </template>
<script> <script>
// import AppointmentDetail from './components/appointmentDetail' // import AppointmentDetail from './components/appointmentDetail'
import api from '@/api/customer' import api from "@/api/customer";
import { log } from 'util' import { log } from "util";
export default { export default {
name: 'Detail', name: "Detail",
components: { components: {
// AppointmentDetail, // AppointmentDetail,
}, },
data() { data() {
return { return {
id: '', //客户id id: "", //客户id
customerInfo: { customerInfo: {
name: '', name: "",
sex: '', sex: "",
idNo: '', idNo: "",
phone: '', phone: "",
birthDate: '', birthDate: "",
maritalStatus: '', maritalStatus: "",
}, //客户信息 }, //客户信息
tips: require('../../assets/imgs/detail/tips.png'), tips: require("../../assets/imgs/detail/tips.png"),
appointmentList: [], //已预约列表 appointmentList: [], //已预约列表
} item: {}, // 详情对象,通过路由带过来
};
}, },
created() { created() {
const { id } = this.$route.query const { id } = this.$route.query;
this.id = id console.log("对象带过来没?", this.$route);
this.getCustomerDetail()//获取客户信息 this.item = this.$route.params;
this.getAppointmentList()//获取客户的预约详情 this.id = id;
this.getCustomerDetail(); //获取客户信息
this.getAppointmentList(); //获取客户的预约详情
}, },
methods: { methods: {
// 获取客户信息 // 获取客户信息
getCustomerDetail() { getCustomerDetail() {
api.getCustomerDetail({ id: parseInt(this.id) }).then((res) => { api.getCustomerDetail({ id: parseInt(this.id) }).then((res) => {
if (res.returnCode == '0000') { if (res.returnCode == "0000") {
this.customerInfo = res.content this.customerInfo = res.content;
console.table('客户信息customerInfo=', this.customerInfo) console.table("客户信息customerInfo=", this.customerInfo);
} else { } else {
this.$message.error(res.returnMsg) this.$message.error(res.returnMsg);
} }
}) });
}, },
// 回首页 // 回首页
goIndexPage() { goIndexPage() {
this.$router.push({ this.$router.push({
name: 'Index', name: "Index",
query: { query: {
id: this.id, //客户id id: this.id, //客户id
}, },
}) });
}, },
// 获取预约详情 // 获取预约详情
getAppointmentList() { getAppointmentList() {
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 this.appointmentList = res.content;
} }
}) });
}, },
}, },
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
...@@ -180,7 +193,7 @@ export default { ...@@ -180,7 +193,7 @@ export default {
.item { .item {
display: flex; display: flex;
margin-top: 14px; margin-top: 14px;
&.tip{ &.tip {
font-size: 12px; font-size: 12px;
color: #999; color: #999;
} }
......
...@@ -106,9 +106,7 @@ export default { ...@@ -106,9 +106,7 @@ export default {
// 获取客户信息 // 获取客户信息
getCustomerDetail() { getCustomerDetail() {
console.log("ssss");
api.getCustomerDetail({ id: parseInt(this.id) }).then((res) => { api.getCustomerDetail({ id: parseInt(this.id) }).then((res) => {
console.log("sdadad", res.content);
if (res.returnCode == "0000") { if (res.returnCode == "0000") {
this.customerInfo = res.content; this.customerInfo = res.content;
console.table("客户信息customerInfo=", this.customerInfo); console.table("客户信息customerInfo=", this.customerInfo);
......
...@@ -23,7 +23,11 @@ ...@@ -23,7 +23,11 @@
>立即预约</a-button >立即预约</a-button
> >
<div class="date"> <div class="date">
{{ listType == 1 ? (' 有效期至:'+item.validityEnd ): ('预约体检日期:'+item.customerAppDate) }} {{
listType == 1
? " 有效期至:" + item.validityEnd
: "预约体检日期:" + item.customerAppDate
}}
</div> </div>
</div> </div>
</div> </div>
...@@ -31,16 +35,16 @@ ...@@ -31,16 +35,16 @@
<script> <script>
export default { export default {
name: 'item', name: "item",
components: {}, components: {},
props: { props: {
listType: { listType: {
type: String, type: String,
default: '', default: "",
}, },
id: { id: {
type: String | Number, type: String | Number,
default: '', default: "",
}, },
item: { item: {
type: Object, type: Object,
...@@ -49,35 +53,36 @@ export default { ...@@ -49,35 +53,36 @@ export default {
}, },
data() { data() {
return { return {
eyes: require('@/assets/imgs/index/eyes.png'), eyes: require("@/assets/imgs/index/eyes.png"),
} };
}, },
methods: { methods: {
// 立即预约 // 立即预约
handleSubmit() { handleSubmit() {
console.log('立即预约~', this.item.chooseList) console.log("立即预约~", this.item.chooseList);
// 本地存储数据-该产品下可选择的体检套餐 // 本地存储数据-该产品下可选择的体检套餐
window.localStorage.setItem('reservedInfo', JSON.stringify(this.item)) window.localStorage.setItem("reservedInfo", JSON.stringify(this.item));
this.$router.push({ this.$router.push({
name: 'Flow', name: "Flow",
query: { query: {
id: this.id, //客户id id: this.id, //客户id
servicepackageId: this.item.id, //产品id servicepackageId: this.item.id, //产品id
}, },
}) });
}, },
// 查看-预约详情 // 查看-预约详情
handleReadDetail() { handleReadDetail() {
this.$router.push({ this.$router.push({
name: 'Detail', name: "Detail",
query: { query: {
id: this.id, id: this.id,
}, },
}) params: this.item,
});
}, },
}, },
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
...@@ -2,18 +2,33 @@ ...@@ -2,18 +2,33 @@
<div class="index"> <div class="index">
<div class="appointment"> <div class="appointment">
<div class="type"><span class="point"></span> 待预约的服务</div> <div class="type"><span class="point"></span> 待预约的服务</div>
<div v-if="packageList.length == 0" class="point_none">暂无可预约体检</div> <div v-if="packageList.length == 0" class="point_none">
暂无可预约体检
</div>
<div class="item-container" v-else> <div class="item-container" v-else>
<Item v-for="(item, index) in packageList" :item="item" :key="index" listType='1' :id="id"/> <Item
v-for="(item, index) in packageList"
:item="item"
:key="index"
listType="1"
:id="id"
/>
</div> </div>
</div> </div>
<div class="appointmented"> <div class="appointmented">
<div class="type"><span class="point"></span>已预约的服务</div> <div class="type"><span class="point"></span>已预约的服务</div>
<div v-if="appointmentList.length == 0" class="point_none">暂无已预约体检</div> <div v-if="appointmentList.length == 0" class="point_none">
暂无已预约体检
</div>
<div class="item-container" v-else> <div class="item-container" v-else>
<Item v-for="(item, index) in appointmentList" :item="item" :key="index" listType='2' :id="id"/> <Item
v-for="(item, index) in appointmentList"
:item="item"
:key="index"
listType="2"
:id="id"
/>
</div> </div>
</div> </div>
<!-- 新卡-初始对话框 --> <!-- 新卡-初始对话框 -->
<a-modal <a-modal
...@@ -28,125 +43,125 @@ ...@@ -28,125 +43,125 @@
</template> </template>
<script> <script>
import Item from './components/item.vue' import Item from "./components/item.vue";
import Form from './components/form.vue' import Form from "./components/form.vue";
import api from '@/api/customer' import api from "@/api/customer";
export default { export default {
components: { Item, Form }, components: { Item, Form },
data() { data() {
return { return {
id: '',//客户id id: "", //客户id
visible: false, //是否显示"个人基本信息填写"弹窗 visible: false, //是否显示"个人基本信息填写"弹窗
items: [ items: [
{ {
name: '体检套餐名称-某某单位-某某套餐', name: "体检套餐名称-某某单位-某某套餐",
detailUrl: 'http://baidu.com', detailUrl: "http://baidu.com",
type: 1, type: 1,
date: '2021-11-18', date: "2021-11-18",
}, },
{ {
name: '体检套餐名称-某某单位-某某套餐', name: "体检套餐名称-某某单位-某某套餐",
detailUrl: 'http://baidu.com', detailUrl: "http://baidu.com",
type: 1, type: 1,
date: '2021-11-18', date: "2021-11-18",
}, },
{ {
name: '体检套餐名称-某某单位-某某套餐', name: "体检套餐名称-某某单位-某某套餐",
detailUrl: 'http://baidu.com', detailUrl: "http://baidu.com",
type: 1, type: 1,
date: '2021-11-18', date: "2021-11-18",
}, },
{ {
name: '体检套餐名称-某某单位-某某套餐', name: "体检套餐名称-某某单位-某某套餐",
detailUrl: 'http://baidu.com', detailUrl: "http://baidu.com",
type: 1, type: 1,
date: '2021-11-18', date: "2021-11-18",
}, },
], ],
itemb: [ itemb: [
{ {
name: '体检套餐名称-某某单位-某某套餐', name: "体检套餐名称-某某单位-某某套餐",
detailUrl: 'http://baidu.com', detailUrl: "http://baidu.com",
type: 2, type: 2,
date: '2021-11-18', date: "2021-11-18",
}, },
{ {
name: '体检套餐名称-某某单位-某某套餐', name: "体检套餐名称-某某单位-某某套餐",
detailUrl: 'http://baidu.com', detailUrl: "http://baidu.com",
type: 2, type: 2,
date: '2021-11-18', date: "2021-11-18",
}, },
{ {
name: '体检套餐名称-某某单位-某某套餐', name: "体检套餐名称-某某单位-某某套餐",
detailUrl: 'http://baidu.com', detailUrl: "http://baidu.com",
type: 2, type: 2,
date: '2021-11-18', date: "2021-11-18",
}, },
{ {
name: '体检套餐名称-某某单位-某某套餐', name: "体检套餐名称-某某单位-某某套餐",
detailUrl: 'http://baidu.com', detailUrl: "http://baidu.com",
type: 2, type: 2,
date: '2021-11-18', date: "2021-11-18",
}, },
], ],
packageList:[],//待预约列表 packageList: [], //待预约列表
appointmentList:[]//已预约列表 appointmentList: [], //已预约列表
} };
}, },
created() { created() {
const { id } = this.$route.query const { id } = this.$route.query;
this.id = id this.id = id;
this.getCustomerDetail()//客户信息 this.getCustomerDetail(); //客户信息
this.getPackageList() //待预约列表 this.getPackageList(); //待预约列表
this.getAppointmentList() //已预约列表 this.getAppointmentList(); //已预约列表
}, },
methods: { methods: {
showModal() { showModal() {
this.visible = true this.visible = true;
}, },
handleHideModal(e) { handleHideModal(e) {
console.log(e) console.log(e);
this.visible = false this.visible = false;
}, },
// 获取客户详情 // 获取客户详情
getCustomerDetail() { getCustomerDetail() {
api.getCustomerDetail({ id: parseInt(this.id) }).then((res) => { api.getCustomerDetail({ id: parseInt(this.id) }).then((res) => {
if (res.returnCode == '0000') { if (res.returnCode == "0000") {
// 根据information是否显示'个人基本信息填写'弹窗(01:完善 02:不完善) // 根据information是否显示'个人基本信息填写'弹窗(01:完善 02:不完善)
res.content.information == '02' res.content.information == "02"
? (this.visible = true) ? (this.visible = true)
: (this.visible = false) : (this.visible = false);
} else { } else {
this.$message.error(res.returnMsg) this.$message.error(res.returnMsg);
} }
}) });
}, },
// 获取待预约列表 // 获取待预约列表
getPackageList() { getPackageList() {
api.getPackageList({ id: parseInt(this.id) }).then((res) => { api.getPackageList({ id: parseInt(this.id) }).then((res) => {
if (res.returnCode == '0000') { if (res.returnCode == "0000") {
console.log('获取待预约==', res.content) console.log("获取待预约==", res.content);
this.packageList = res.content this.packageList = res.content;
} }
// else { // else {
// this.$message.error(res.returnMsg) // this.$message.error(res.returnMsg)
// } // }
}) });
}, },
// 获取已预约列表 // 获取已预约列表
getAppointmentList() { getAppointmentList() {
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('获取已预约列表==', res.content) console.log("获取已预约列表==", res.content);
this.appointmentList = res.content this.appointmentList = res.content;
} }
// else { // else {
// this.$message.error(res.returnMsg) // this.$message.error(res.returnMsg)
// } // }
}) });
}, },
}, },
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
...@@ -192,7 +207,7 @@ export default { ...@@ -192,7 +207,7 @@ export default {
} }
} }
} }
.point_none{ .point_none {
padding: 26px; padding: 26px;
} }
</style> </style>
...@@ -92,11 +92,9 @@ ...@@ -92,11 +92,9 @@
background: #2c2c31; background: #2c2c31;
background-size: 100% 100%; background-size: 100% 100%;
padding: 58px 0 0 0; padding: 58px 0 0 0;
position: absolute;
width: 100%; width: 100%;
height: 180px; height: 180px;
bottom: 0px; box-sizing: border-box;
box-sizing:border-box;
.con_ { .con_ {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
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