zcdsj
/
factory_mp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcdsj:84af330ea871b985eac138c84f8f3809fadfc3dc
Branches Tags
zcdsj:main
..
compare: zcdsj:c481034133bef9b7a929329701169cd513d4dd9b
Branches Tags
zcdsj:main

No commits in common. "84af330ea871b985eac138c84f8f3809fadfc3dc" and "c481034133bef9b7a929329701169cd513d4dd9b" have entirely different histories.
84af330ea8 ... c481034133

5 changed files with 91 additions and 180 deletions
Show Stats Expand all files Collapse all files

53
pages/index/index.vue
View File

@ -1,12 +1,25 @@
<template> <template>
<view class="container"> <view class="container">
<image src="/static/banner.jpg" mode="widthFix" style="width:100%"></image>
<uni-section :title="welTitle" type="circle" titleFontSize="15px" titleColor="#0000CD" <uni-section :title="welTitle" type="circle" titleFontSize="15px" titleColor="#0000CD"
@click="goUserInfo"> @click="goUserInfo">
<template v-slot:right> <template v-slot:right>
<span style="color:gray">{{currentDate}}</span> <span style="color:gray">{{currentDate}}</span>
</template> </template>
</uni-section> </uni-section>
<image src="/static/banner1.png" mode="widthFix" style="width:100%"></image> <uni-section title="功能入口" type="line">
<uni-grid :column="5" :show-border="false" :square="false">
<uni-grid-item v-for="(item ,index) in moduleList" :index="index" :key="index">
<view class="grid-item-box" @click="pageEnter(item)">
<image class="image" :src="item.url" mode="aspectFill" />
<text class="text">{{item.text}}</text>
<view v-if="item.badge" class="grid-dot">
<uni-badge :text="item.badge" :type="item.type" />
</view>
</view>
</uni-grid-item>
</uni-grid>
</uni-section>
<view style="height: 12rpx;"></view> <view style="height: 12rpx;"></view>
<uni-row :gutter="12"> <uni-row :gutter="12">
<uni-col :span="12" style="border-radius: 20upx;"> <uni-col :span="12" style="border-radius: 20upx;">
@ -23,33 +36,13 @@
</uni-col> </uni-col>
</uni-row> </uni-row>
<view style="height: 12rpx;"></view> <view style="height: 12rpx;"></view>
<uni-section title="功能入口" type="line"> <uni-section title="列表信息" type="line">
<uni-grid :column="5" :show-border="false" :square="false">
<uni-grid-item v-for="(item ,index) in moduleList" :index="index" :key="index">
<view class="grid-item-box" @click="pageEnter(item)">
<image class="image" :src="item.url" mode="aspectFill" />
<text class="text">{{item.text}}</text>
<view v-if="item.badge" class="grid-dot">
<uni-badge :text="item.badge" :type="item.type" />
</view>
</view>
</uni-grid-item>
<uni-grid-item>
<view class="grid-item-box" @click="cameraClick">
<image class="image" src="/static/yuding.png" mode="aspectFill" />
<text class="text">拍照</text>
</view>
</uni-grid-item>
</uni-grid>
</uni-section>
<!-- <uni-section title="列表信息" type="line">
<uni-list> <uni-list>
<uni-list-item v-for="(item ,index) in moduleList" :index="index" :key="index" :title="item.text"> <uni-list-item v-for="(item ,index) in moduleList" :index="index" :key="index" :title="item.text">
</uni-list-item> </uni-list-item>
</uni-list> </uni-list>
</uni-section> --> </uni-section>
</view> </view>
</template> </template>
@ -59,7 +52,6 @@
data() { data() {
return { return {
welTitle: "", welTitle: "",
imageSrc:"",
currentDate: tool.getTodayDate(), currentDate: tool.getTodayDate(),
moduleList: [{ moduleList: [{
navigate:'/pages/ofm/booking', navigate:'/pages/ofm/booking',
@ -107,19 +99,6 @@
url:item.navigate url:item.navigate
}) })
}, },
cameraClick(){
uni.chooseImage({
count: 1, // 默认选择1张图片
sourceType: ['album', 'camera'], // 支持相册和相机
success: function (res) {
// 返回选择或拍摄的图片路径
console.log(res.tempFilePaths[0]);
},
fail: function (err) {
console.log('选择或拍照失败', err);
}
});
},
} }
} }
</script> </script>

200
pages/ofm/booking.vue
View File

@ -27,7 +27,7 @@
<view class="dateView"> <view class="dateView">
<view class="viewLabel">预约时间：</view> <view class="viewLabel">预约时间：</view>
<view v-if="type=='show'">{{form.mdate}}</view> <view v-if="type=='show'">{{form.mdate}}</view>
<uni-datetime-picker v-else style="width: 540upx;" type="date" :clear-icon="false" v-model="form.mdate" @change="mdateChange"/> <uni-datetime-picker v-else style="width: 540upx;" type="date" :clear-icon="false" v-model="form.mdate"/>
</view> </view>
<view class="titleView"> <view class="titleView">
<view class="viewLabel">备注：</view> <view class="viewLabel">备注：</view>
@ -45,11 +45,11 @@
</view> </view>
<view :class="{'amBlockHide':!showAm,'amBlock': showAm}"> <view :class="{'amBlockHide':!showAm,'amBlock': showAm}">
<view v-for="(item,index) in timesListAm" :key="item.value" class="timeBlock "> <view v-for="(item,index) in timesListAm" :key="item.value" class="timeBlock ">
<view :class="{'isSelected':item.isSelect,'isSloted':item.sloted,'timeItem': true}" @click="timeItemClickAm(index)">{{item.label}}</view> <view :class="{'isSelected':item.selected,'timeItem': true}" @click="timeItemClickAm(index)">{{item.label}}</view>
</view> </view>
</view> </view>
<view v-for="(item,index) in timesListPm" :key="item.value" class="timeBlock"> <view v-for="(item,index) in timesListPm" :key="item.value" class="timeBlock">
<view :class="{'isSelected':item.isSelect,'isSloted':item.sloted,'timeItem': true}" @click="timeItemClickPm(index)">{{item.label}}</view> <view :class="{'isSelected':item.selected,'timeItem': true}" @click="timeItemClickPm(index)">{{item.label}}</view>
</view> </view>
</view> </view>
<view class="footerView"> <view class="footerView">
@ -80,7 +80,6 @@
totalCount:0, totalCount:0,
pickDate:'', pickDate:'',
mroomId:'', mroomId:'',
type:'',
ticketId:null, ticketId:null,
showAm:false, showAm:false,
bookingTitle:'', bookingTitle:'',
@ -101,95 +100,72 @@
transitions:[], transitions:[],
//凌晨0-6点 //凌晨0-6点
timesListAm:[ timesListAm:[
{value:0,label:'00:00-00:30',isSelect:false,sloted:false}, {value:0,label:'00:00-00:30',isSelect:false},
{value:1,label:'00:30-01:00',isSelect:false,sloted:false}, {value:1,label:'00:30-01:00',isSelect:false},
{value:2,label:'01:00-01:30',isSelect:false,sloted:false}, {value:2,label:'01:00-01:30',isSelect:false},
{value:3,label:'01:30-02:00',isSelect:false,sloted:false}, {value:3,label:'01:30-02:00',isSelect:false},
{value:4,label:'02:00-02:30',isSelect:false,sloted:false}, {value:4,label:'02:00-02:30',isSelect:false},
{value:5,label:'02:30-03:00',isSelect:false,sloted:false}, {value:5,label:'02:30-03:00',isSelect:false},
{value:6,label:'03:00-03:30',isSelect:false,sloted:false}, {value:6,label:'03:00-03:30',isSelect:false},
{value:7,label:'03:30-04:00',isSelect:false,sloted:false}, {value:7,label:'03:30-04:00',isSelect:false},
{value:8,label:'04:00-04:30',isSelect:false,sloted:false}, {value:8,label:'04:00-04:30',isSelect:false},
{value:9,label:'04:30-05:00',isSelect:false,sloted:false}, {value:9,label:'04:30-05:00',isSelect:false},
{value:10,label:'05:00-05:30',isSelect:false,sloted:false}, {value:10,label:'05:00-05:30',isSelect:false},
{value:11,label:'05:30-06:00',isSelect:false,sloted:false} {value:11,label:'05:30-06:00',isSelect:false}
], ],
timesListPm:[ timesListPm:[
{value:12,label:'06:00-06:30',isSelect:false,sloted:false}, {value:12,label:'06:00-06:30',isSelect:false},
{value:13,label:'06:30-07:00',isSelect:false,sloted:false}, {value:13,label:'06:30-07:00',isSelect:false},
{value:14,label:'07:00-07:30',isSelect:false,sloted:false}, {value:14,label:'07:00-07:30',isSelect:false},
{value:15,label:'07:30-08:00',isSelect:false,sloted:false}, {value:15,label:'07:30-08:00',isSelect:false},
{value:16,label:'08:00-08:30',isSelect:false,sloted:false}, {value:16,label:'08:00-08:30',isSelect:false},
{value:17,label:'08:30-09:00',isSelect:false,sloted:false}, {value:17,label:'08:30-09:00',isSelect:false},
{value:18,label:'09:00-09:30',isSelect:false,sloted:false}, {value:18,label:'09:00-09:30',isSelect:false},
{value:19,label:'09:30-10:00',isSelect:false,sloted:false}, {value:19,label:'09:30-10:00',isSelect:false},
{value:20,label:'10:00-10:30',isSelect:false,sloted:false}, {value:20,label:'10:00-10:30',isSelect:false},
{value:21,label:'10:30-11:00',isSelect:false,sloted:false}, {value:21,label:'10:30-11:00',isSelect:false},
{value:22,label:'11:00-11:30',isSelect:false,sloted:false}, {value:22,label:'11:00-11:30',isSelect:false},
{value:23,label:'11:30-12:00',isSelect:false,sloted:false}, {value:23,label:'11:30-12:00',isSelect:false},
{value:24,label:'12:00-12:30',isSelect:false,sloted:false}, {value:24,label:'12:00-12:30',isSelect:false},
{value:25,label:'12:30-13:00',isSelect:false,sloted:false}, {value:25,label:'12:30-13:00',isSelect:false},
{value:26,label:'13:00-13:30',isSelect:false,sloted:false}, {value:26,label:'13:00-13:30',isSelect:false},
{value:27,label:'13:30-14:00',isSelect:false,sloted:false}, {value:27,label:'13:30-14:00',isSelect:false},
{value:28,label:'14:00-14:30',isSelect:false,sloted:false}, {value:28,label:'14:00-14:30',isSelect:false},
{value:29,label:'14:30-15:00',isSelect:false,sloted:false}, {value:29,label:'14:30-15:00',isSelect:false},
{value:30,label:'15:00-15:30',isSelect:false,sloted:false}, {value:30,label:'15:00-15:30',isSelect:false},
{value:31,label:'15:30-16:00',isSelect:false,sloted:false}, {value:31,label:'15:30-16:00',isSelect:false},
{value:32,label:'16:00-16:30',isSelect:false,sloted:false}, {value:32,label:'16:00-16:30',isSelect:false},
{value:33,label:'16:30-17:00',isSelect:false,sloted:false}, {value:33,label:'16:30-17:00',isSelect:false},
{value:34,label:'17:00-17:30',isSelect:false,sloted:false}, {value:34,label:'17:00-17:30',isSelect:false},
{value:35,label:'17:30-18:00',isSelect:false,sloted:false}, {value:35,label:'17:30-18:00',isSelect:false},
{value:36,label:'18:00-18:30',isSelect:false,sloted:false}, {value:36,label:'18:00-18:30',isSelect:false},
{value:37,label:'18:30-19:00',isSelect:false,sloted:false}, {value:37,label:'18:30-19:00',isSelect:false},
{value:38,label:'19:00-19:30',isSelect:false,sloted:false}, {value:38,label:'19:00-19:30',isSelect:false},
{value:39,label:'19:30-20:00',isSelect:false,sloted:false}, {value:39,label:'19:30-20:00',isSelect:false},
{value:40,label:'20:00-20:30',isSelect:false,sloted:false}, {value:40,label:'20:00-20:30',isSelect:false},
{value:41,label:'20:30-21:00',isSelect:false,sloted:false}, {value:41,label:'20:30-21:00',isSelect:false},
{value:42,label:'21:00-21:30',isSelect:false,sloted:false}, {value:42,label:'21:00-21:30',isSelect:false},
{value:43,label:'21:30-22:00',isSelect:false,sloted:false}, {value:43,label:'21:30-22:00',isSelect:false},
{value:44,label:'22:00-22:30',isSelect:false,sloted:false}, {value:44,label:'22:00-22:30',isSelect:false},
{value:45,label:'22:30-23:00',isSelect:false,sloted:false}, {value:45,label:'22:30-23:00',isSelect:false},
{value:46,label:'23:00-23:30',isSelect:false,sloted:false}, {value:46,label:'23:00-23:30',isSelect:false},
{value:47,label:'23:30-24:00',isSelect:false,sloted:false} {value:47,label:'23:30-24:00',isSelect:false}
] ]
} }
}, },
onLoad(options) { onLoad(options) {
let that = this; let that = this;
that.form.id=''; that.form.id='';
that.selectList = [];
that.mroomId = options.mroomId; that.mroomId = options.mroomId;
that.getmRooms(); that.getmRooms();
if(options.item){ that.getTransitions();
let bookingItem = JSON.parse(options.item); console.log('options',options)
that.form = Object.assign({},bookingItem); console.log(uni.getStorageSync('userInfo'))
that.ticketId = that.form.ticket;
that.getTransitions();
}else{
that.getTransitions();
}
if(options.slots){
that.form.slots = [];
let slots = options.slots.split(',');
if(slots.length>0){
slots.forEach(item=>{
let slot = Number(item);
that.form.slots.push(slot);
if(slot<12){
that.timesListAm[slot].isSelect = true;
that.selectList.push(that.timesListAm[slot])
}else{
that.timesListPm[slot].isSelect = true;
that.selectList.push(that.timesListPm[slot])
}
})
that.totalCount = slots.length*0.5;
}
}
}, },
methods:{ methods:{
getTransitions(){ getTransitions(){
let that = this; let that = this;
console.log('getTransitions')
if(that.ticketId!==null){ if(that.ticketId!==null){
that.$api.getTransition(that.ticketId).then(res=>{ that.$api.getTransition(that.ticketId).then(res=>{
that.transitions = res; that.transitions = res;
@ -221,33 +197,24 @@
this.showAm = !this.showAm; this.showAm = !this.showAm;
}, },
timeItemClickAm(index){ timeItemClickAm(index){
if(this.timesListPm[index].sloted){ this.timesListAm[index].selected = !this.timesListAm[index].selected;
this.clickItems();
}else{
this.timesListAm[index].isSelect = !this.timesListAm[index].isSelect;
this.clickItems();
}
}, },
timeItemClickPm(index){ timeItemClickPm(index){
if(this.timesListPm[index].sloted){ this.timesListPm[index].selected = !this.timesListPm[index].selected;
this.clickItems();
}else{
this.timesListPm[index].isSelect = !this.timesListPm[index].isSelect;
this.clickItems();
}
}, },
clickItems(){ clickItems(){
let that = this; let that = this;
that.selectList = [];
let lists = [],slots=[]; let lists = [],slots=[];
that.timesListAm.forEach(item=>{ that.timesListAm.forEach(item=>{
if(item.isSelect){ if(item.selected){
lists.push(item) lists.push(item)
slots.push(item.value); slots.push(item.value);
} }
}) })
that.timesListPm.forEach(item2=>{ that.timesListPm.forEach(item2=>{
if(item2.isSelect){ if(item2.selected){
lists.push(item2) lists.push(item2)
slots.push(item2.value); slots.push(item2.value);
} }
@ -258,45 +225,13 @@
that.form.slots = slots; that.form.slots = slots;
},500) },500)
}, },
//选择会议室和日期后查询有无预定
bindPickerChange(e) { bindPickerChange(e) {
this.form.mroom = e.detail.value; this.form.mroom = e.detail.value;
this.index = e.detail.value; this.index = e.detail.value;
if(this.form.mdate!==''&&this.form.mdate!==null){
this.getmRoomSlot();
}
}, },
mdateChange(){
if(this.form.mroom!==''&&this.form.mroom!==null){
this.getmRoomSlot();
}
},
getmRoomSlot(){
let that = this;
let form = {};
form.page = 0;
form.mroom = that.form.mroom;
form.mdate = that.form.mdate;
that.timesListAm.forEach(slot=>{
slot.sloted = false;
})
that.timesListPm.forEach(slot=>{
slot.sloted = false;
})
that.$api.bookingSlot(form).then(res=>{
res.forEach(item=>{
if(item.slot<12){
that.timesListAm[item.slot].sloted = true;
}else{
that.timesListPm[item.slot].sloted = true;
}
})
})
},
//选择会议室和日期后查询有无预定
submit(id){ submit(id){
let that = this; let that = this;
console.log('that.form',that.form)
if(that.form.id == "") { if(that.form.id == "") {
that.$api.bookingCreate(that.form).then(res=>{ that.$api.bookingCreate(that.form).then(res=>{
that.form.id = res.id; that.form.id = res.id;
@ -407,13 +342,11 @@
background-color: #b9f0cb; background-color: #b9f0cb;
border: 1upx solid #eeeeee; border: 1upx solid #eeeeee;
} }
.timeItem.isSelected{ .timeItem.notCanSelect{
background-color: #00a870; background-color: #ff8888;
color: #fff;
} }
.timeItem.isSloted{ .timeItem.isSelected{
background-color: #fac275!important; background-color: #ffce88
color: #fff;
} }
.footerView{ .footerView{
box-sizing: border-box; box-sizing: border-box;
@ -425,6 +358,5 @@
} }
.buttonSure{ .buttonSure{
margin-top: 10upx; margin-top: 10upx;
margin-right: 10upx;
} }
</style> </style>

17
pages/ofm/bookingRecord.vue
View File

@ -1,14 +1,21 @@
<template> <template>
<view class="container"> <view class="container">
<uni-list v-for="item in dataList" class="uniListItem" @click="itemClick(item)"> <uni-list v-for="item in dataList" class="uniListItem">
<!-- #169316 --> <!-- #169316 -->
<uni-icons v-if="item.state==2" custom-prefix="iconfont" color="#ea7878" type="icon-yijieshu4" size="35" class="stateIcon yiwancheng"></uni-icons> <uni-icons v-if="item.state==2" custom-prefix="iconfont" color="#ea7878" type="icon-yijieshu4" size="35" class="stateIcon yiwancheng"></uni-icons>
<uni-icons v-if="item.state==1" custom-prefix="iconfont" color="#659fed" type="icon-jinhangzhong" size="35" class="stateIcon"></uni-icons> <uni-icons v-if="item.state==1" custom-prefix="iconfont" color="#659fed" type="icon-jinhangzhong" size="35" class="stateIcon"></uni-icons>
<uni-icons v-if="item.state==0" custom-prefix="iconfont" color="#7ed47e" type="icon-weikaishi2" size="35" class="stateIcon"></uni-icons> <uni-icons v-if="item.state==0" custom-prefix="iconfont" color="#7ed47e" type="icon-weikaishi2" size="35" class="stateIcon"></uni-icons>
<uni-list-item :title="item.title" :note="'预约时间：'+item.mdate" :rightText="item.mroom_name" > <uni-list-item :title="item.title" :note="'预约时间：'+item.mdate" :rightText="item.mroom_name">
<text>预约时间段;</text> <text>预约时间段;</text>
</uni-list-item> </uni-list-item>
</uni-list> </uni-list>
<!-- <uni-list-chat v-for="item in dataList" :title="item.meetingName" note="您收到一条新的消息" time="2020-02-02 20:20" >
<view class="chat-custom-right">
<text class="chat-custom-text">刚刚</text>
<uni-icons type="star-filled" color="#999" size="18"></uni-icons>
</view>
</uni-list-chat> -->
</view> </view>
</template> </template>
@ -25,12 +32,6 @@
this.getlistData(); this.getlistData();
}, },
methods:{ methods:{
itemClick(item){
let itemJson = JSON.stringify(item);
uni.navigateTo({
url:'/pages/ofm/booking?item='+itemJson+'&slots='+item.slots,
})
},
getlistData(){ getlistData(){
let that = this; let that = this;
that.$api.bookingList({page:that.page,page_size:that.page_size}).then(res=>{ that.$api.bookingList({page:that.page,page_size:that.page_size}).then(res=>{

BIN
static/banner1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.0 MiB

1
utils/api.js
View File

@ -24,5 +24,4 @@ export default {
bookingCreate:(data) => http(`/ofm/mroombooking/`, 'POST', data), bookingCreate:(data) => http(`/ofm/mroombooking/`, 'POST', data),
bookingUpdate:(id,data) => http(`/ofm/mroombooking/${id}/`, 'PUT', data), bookingUpdate:(id,data) => http(`/ofm/mroombooking/${id}/`, 'PUT', data),
bookingDelete:(id) => http(`/ofm/mroombooking/${id}/`, 'DELETE'), bookingDelete:(id) => http(`/ofm/mroombooking/${id}/`, 'DELETE'),
bookingSlot:(data) => http(`/ofm/mroomslot/`, 'GET' , data),
} }