Skip to content

U
UbainsMeeting
提交 2c7b1635 authored 作者: 曾美红's avatar 曾美红
浏览文件
操作

二次修改

上级 2bf5ad89
隐藏空白字符变更
内嵌 并排
正在显示 包含 219 行增加 和 72 行删除
pages/conference/addmeeting/addmeeting.axml
浏览文件 @ 2c7b1635
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<text class="hour">{{hindex}}:00</text> <text class="hour">{{hindex}}:00</text>
<view class="scroll-view-item_H" a:for="{{time}}" a:for-item="t" a:for-index="mindex"> <view class="scroll-view-item_H" a:for="{{time}}" a:for-item="t" a:for-index="mindex">
<view data-hour="{{t.hour}}"data-unclick="{{t.unclick}}" data-minute="{{t.minute}}" data-hour-index="{{hindex}}" data-min-index="{{mindex}}" style="background-color:{{t.color}}" class="time-block" onTap="selTime"></view> <view data-hour="{{t.hour}}" data-unclick="{{t.unclick}}" data-minute="{{t.minute}}" data-hour-index="{{hindex}}" data-min-index="{{mindex}}" style="background-color:{{t.color}}" class="time-block" onTap="selTime"></view>
</view> </view>
</view> </view>
</scroll-view > </scroll-view >
......
pages/conference/addmeeting/addmeeting.js
浏览文件 @ 2c7b1635
...@@ -57,19 +57,10 @@ Page({ ...@@ -57,19 +57,10 @@ Page({
//是否安排座位 //是否安排座位
switch: function() { switch: function() {
//console.log("点击"); //console.log("点击");
var mid=this.data.mid; var mid=this.data.mid;
console.log("会议室", this.data.cnum) console.log("会议室", this.data.cnum)
// if (this.data.cnum==""){
// dd.alert({
// title: "参数错误",
// content: "会议室没有选择",
// buttonText: '确定'
// })
// return false;
// }
var _this=this; var _this=this;
dd.httpRequest({ dd.httpRequest({
url: conferenceUrl, url: conferenceUrl,
...@@ -109,6 +100,7 @@ var _this=this; ...@@ -109,6 +100,7 @@ var _this=this;
var startTime = this.data.dates+" "+this.data.time.startTime ; var startTime = this.data.dates+" "+this.data.time.startTime ;
var endTime = this.data.dates + " "+ this.data.time.endTime ; var endTime = this.data.dates + " "+ this.data.time.endTime ;
var _this=this; var _this=this;
// if (typeof (e.detail.value.conferenceName) == "undefined") { // if (typeof (e.detail.value.conferenceName) == "undefined") {
// dd.alert({ // dd.alert({
...@@ -174,6 +166,7 @@ var _this=this; ...@@ -174,6 +166,7 @@ var _this=this;
messageContent: e.detail.value.messageContent, messageContent: e.detail.value.messageContent,
remindMethod : e.detail.value.remindMethod, remindMethod : e.detail.value.remindMethod,
remindTime: e.detail.value.remindTime, remindTime: e.detail.value.remindTime,
conferenceName: _this.data.conferenceName,
}, },
dataType: 'json', dataType: 'json',
success: function(res) { success: function(res) {
...@@ -605,12 +598,14 @@ console.log(e.currentTarget.dataset.hour); ...@@ -605,12 +598,14 @@ console.log(e.currentTarget.dataset.hour);
var _this = this; var _this = this;
//再次预定 数据回显 //再次预定 数据回显
var message= _this.data.message; var message= _this.data.message;
message['conferenceName'] =query.conferenceName;
message['cnum'] =query.cnum; message['cnum'] =query.cnum;
message['messageName'] =query.messageName; message['messageName'] =query.messageName;
message['messageCompere'] =query.messageCompere; message['messageCompere'] =query.messageCompere;
message['messageContent'] =query.messageContent; message['messageContent'] =query.messageContent;
_this.setData({ _this.setData({
message message,
cnum:query.cnum
}) })
//生成会议id //生成会议id
...@@ -799,6 +794,7 @@ console.log(e.currentTarget.dataset.hour); ...@@ -799,6 +794,7 @@ console.log(e.currentTarget.dataset.hour);
onReady() { onReady() {
// 页面加载完成 // 页面加载完成
var _this = this;
if (_this.data.mid==null){ if (_this.data.mid==null){
dd.httpRequest({ dd.httpRequest({
url: generateMidUrl, url: generateMidUrl,
......
pages/conference/index/index.js
浏览文件 @ 2c7b1635
...@@ -123,16 +123,6 @@ Page({ ...@@ -123,16 +123,6 @@ Page({
_this.setData({ _this.setData({
conferenceList: res.data.result conferenceList: res.data.result
}) })
// if(reserveCode !== ""){
// dd.navigateTo({
// url:'../details/details?cnum='+cnum
// })
// }else{
// dd.alert({
// content: '该会议室没有授权码',
// buttonText: '我知道了',
// })
// }
}, },
fail: function(res) { fail: function(res) {
console.log("httpRequestFail---", res) console.log("httpRequestFail---", res)
......
pages/conference/visitor/visitor.axml
浏览文件 @ 2c7b1635
<view class="page"> <view class="page">
<view class='vi_bg'> <view class='vi_bg'>
<view class='vi_search'> <view class='vi_search'>
<image src='../../../resource/images/search2.png' /> <image src='../../../resource/images/search2.png' onTap="query" />
<input type='text' onConfirm="search" placeholder='请输入参会人员名称' /> <input type='text' placeholder='请输入参会人员名称' value="{{inputValue}}" onInput="searchbuild" onConfirm="search" />
</view> </view>
</view> </view>
<view class="graySpace"></view> <view class="graySpace"></view>
......
pages/conference/visitor/visitor.js
浏览文件 @ 2c7b1635
...@@ -4,6 +4,7 @@ let domain = app.globalData.domain; ...@@ -4,6 +4,7 @@ let domain = app.globalData.domain;
let getDepartmentUrl = domain + "/dingding/getDepartment"; let getDepartmentUrl = domain + "/dingding/getDepartment";
let addInSignUrl = domain + "/dingding/addInSign"; let addInSignUrl = domain + "/dingding/addInSign";
let getInSignUrl = domain +"/dingding/getInSign"; let getInSignUrl = domain +"/dingding/getInSign";
let getStaffUrl = domain + "/dingding/getStaff";
Page({ Page({
data: { data: {
...@@ -19,13 +20,164 @@ Page({ ...@@ -19,13 +20,164 @@ Page({
text:"全选" text:"全选"
}, },
mid:null, mid:null,
cnum:null cnum:null ,
inputValue: ''
}, },
search:function(e){
//搜索框文本内容显示
searchbuild(e){
// event.detail = {value: value};
// con
var userId = app.globalData.userId;
// this.setData({
// inputValue:,
// })
console.log('searchbuild-----' + this.data.inputValue);
var _this = this;
dd.httpRequest({
url: getStaffUrl,
data: {
"keyword": e.detail.value,
"userId":userId
},
header: { 'content-type': 'application/x-www-form-urlencoded' },
method: 'POST',
success: function(res){
console.log('res----', res.data)
// if(keyword == ""){
// this.setData({
// departmentList: res.data
// })
// return;
// }
// var departmentList= _this.data.departmentList;
// departmentList=[];
// _this.setData({
// departmentList
// });
var departmentList = _this.data.departmentList;
departmentList = res.data.result;
for (var i = 0; i<departmentList.length;i++){
if(departmentList.length < 3){
departmentList[i]['isColpand']=true;
}else{
departmentList[i]['isColpand']=false;
}
departmentList[i]['checked'] = false;
for (var j = 0; j < departmentList[i].uList.length;j++){
departmentList[i].uList[j]['checked']=false;
}
}
_this.setData({
departmentList
})
// var userList= res.data.result;
// for(let i in userList){
// var department =userList[i].department;
// department['isColpand']=false;
// department['checked'] = false;
// department.uList=[];
// department.uList.push(userList[i]);
// department.uList[0]['checked']=true;
// departmentList.push(department);
// }
that.setData({
departmentList
});
// var data = res.data.departmentList;
// that.setData({
// departmentList: data
// })
},
fail: function(res) {
console.log("httpRequestFail---", res)
},
complete: function(res) {
dd.hideLoading();
}
})
// var that = this;
// dd.httpRequest({
// url: "getStaffUrl" + this.data.inputValue,
// data: {
// inputValue: this.data.inputValue
// },
// method: 'POST',
// success: function(res){
// console.log('res----', res.data)
// var searchData = res.data
// that.setData({
// searchData
// })
// //缓存
// dd.setStorage({
// key: 'departmentList',
// data: {
// inputValue: this.data.inputValue,
// departmentList: res.data
// }
// })
// if(!that.data.inputValue){
// dd.showToast({
// title: '请重新输入',
// duration: 2000,
// })
// } else if (searchData.search.length == 0){
// dd.showToast({
// title: '关键词不存在',
// duration: 2000,
// })
// } else {
// var searchIndex = searchData.search.length;
// var d = 0;
// for (var i = 0; i <= searchIndex -1; i++){
// var searchTitle = searchData.search[d].title;
// console.log(searchTitle);
// d = d + 1;
// for (var x = 0; x <= searchTitle.length; x++){
// for ( var y = 0; y <= searchTitle.length; y++){
// var keyWord = searchTitle.substring(x,y);
// console.log('keyword----', keyWord)
// }
// }
// }
// }
// },
// fail: function(res) {
// console.log("httpRequestFail---", res)
// dd.alert({ content: JSON.stringify(res) });
// },
// complete: function(res) {
// dd.hideLoading();
// }
// })
},
search:function(e){
//event.detail = {value: value}
}, },
select_all:function(e){ select_all:function(e){
if (!this.data.selectall.checked){ if (!this.data.selectall.checked){
......
pages/meeting/record/record.axml
浏览文件 @ 2c7b1635
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<view class="td td1"> <view class="td td1">
<text>会议操作：</text> <text>会议操作：</text>
<button class="btn1" size='mini' type='primary' data-mid="{{message.messageId}}" onTap="modify">修改会议</button> <button class="btn1" size='mini' type='primary' data-mid="{{message.messageId}}" onTap="modify">修改会议</button>
<button class="btn2" size='mini' type='warn' data-mid="{{message.messageId}}" onTap="cancelmeeting">取消会议</button> <button class="btn2" size='mini' type='warn' data-mid="{{message.messageId}}" data-config-value-id="{{message.configValueId}}" onTap="cancelmeeting">取消会议</button>
</view> </view>
</view> </view>
<view class="tr"> <view class="tr">
......
pages/meeting/record/record.js
浏览文件 @ 2c7b1635
...@@ -5,6 +5,7 @@ let domain = app.globalData.domain; ...@@ -5,6 +5,7 @@ let domain = app.globalData.domain;
let mymessageUrl = domain + "/dingding/mymessage"; let mymessageUrl = domain + "/dingding/mymessage";
let myscheduleUrl = domain +"/dingding/myschedule"; let myscheduleUrl = domain +"/dingding/myschedule";
let canclemeetingUrl = domain + "/dingding/canclemeeting"; let canclemeetingUrl = domain + "/dingding/canclemeeting";
let conferenceUrl = domain + "/dingding/conference";
var time = 0; var time = 0;
var touchDot = 0;//触摸时的原点 var touchDot = 0;//触摸时的原点
var interval = ""; var interval = "";
...@@ -75,7 +76,7 @@ Page({ ...@@ -75,7 +76,7 @@ Page({
}, },
meetjy: function(e){ meetjy: function(e){
var mid = e.currentTarget.dataset.mid; var mid = e.currentTarget.dataset.mid;
console.log("conferenceName", e.currentTarget.dataset.conferenceName); // console.log("conferenceName", e.currentTarget.dataset.conferenceName);
dd.navigateTo({ dd.navigateTo({
url: '../summary/summary?mid=' + mid + '&conferenceName=' + e.currentTarget.dataset.conferenceName + "&date=" + e.currentTarget.dataset.date url: '../summary/summary?mid=' + mid + '&conferenceName=' + e.currentTarget.dataset.conferenceName + "&date=" + e.currentTarget.dataset.date
}) })
...@@ -88,25 +89,27 @@ Page({ ...@@ -88,25 +89,27 @@ Page({
// 页面显示 // 页面显示
var that = this; var that = this;
var userId = app.globalData.userId; var userId = app.globalData.userId;
dd.httpRequest({ dd.httpRequest({
url: mymessageUrl, url: mymessageUrl,
method: 'POST', method: 'POST',
data: { data: {
userId: userId, userId: userId,
date: that.data.dates date: that.data.dates,
}, },
dataType: 'json', dataType: 'json',
success: function(res) { success: function(res) {
console.log('success----', res) console.log('success我的预定----', res);
var messageList = that.data.messageList; var messageList = that.data.messageList;
messageList= res.data.result; messageList= res.data.result;
that.setData({ that.setData({
messageList messageList,
}); });
console.log(that.data.messageList); console.log('会议列表-----',that.data.messageList);
}, },
fail: function(res) { fail: function(res) {
console.log("httpRequestFail---", res) console.log("httpRequestFail---", res)
...@@ -127,7 +130,7 @@ Page({ ...@@ -127,7 +130,7 @@ Page({
}, },
dataType: 'json', dataType: 'json',
success: function(res) { success: function(res) {
console.log('success----', res) console.log('success我的日程----', res)
var mymessageList = that.data.mymessageList; var mymessageList = that.data.mymessageList;
mymessageList = res.data.result; mymessageList = res.data.result;
that.setData({ that.setData({
...@@ -184,41 +187,39 @@ Page({ ...@@ -184,41 +187,39 @@ Page({
}) })
}, },
cancelmeeting:function (e){ cancelmeeting:function (e){
// dd.alert({
// title: '取消成功', var mid= e.currentTarget.dataset.mid;
// content: '取消成功', let configValueId = e.currentTarget.dataset.configValueId;
// buttonText: '确定', if( configValueId === 1 || configValueId === 4 || configValueId === 3 ){
// success: () => {
// dd.reLaunch({
// url: '../record/record'
// });
// },
// });
var mid= e.currentTarget.dataset.mid;
dd.httpRequest({
url: canclemeetingUrl,
method: 'POST',
data: {
mid: mid
},
dataType: 'json',
success: function(res) {
console.log('success----', res);
if(res.data.success){
dd.alert({ dd.alert({
title: '取消成功', content: '会议结束或进行中，不可取消',
content: '取消成功',
buttonText: '确定', buttonText: '确定',
success: () => { })
dd.reLaunch({ }else {
url: '../record/record' dd.httpRequest({
}); url: canclemeetingUrl,
}, method: 'POST',
}); data: {
mid: mid,
} configValueId: configValueId,
},
dataType: 'json',
success: function(res) {
console.log('success----', res);
//console.log(e.currentTarget.dataset.configValueId);
//if(res.data.success){
dd.alert({
title: '取消成功',
content: '取消成功',
buttonText: '确定',
success: () => {
dd.reLaunch({
url: '../record/record'
});
},
});
}, },
fail: function(res) { fail: function(res) {
console.log("httpRequestFail---", res) console.log("httpRequestFail---", res)
...@@ -229,6 +230,8 @@ Page({ ...@@ -229,6 +230,8 @@ Page({
} }
}); });
}
}, },
datePicker() { datePicker() {
......
pages/meeting/recording/recording.axml
浏览文件 @ 2c7b1635
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
<view class="tr"> <view class="tr">
<view class="td td2">地点：{{history.conference.conferenceName}}</view> <view class="td td2">地点：{{history.conference.conferenceName}}</view>
</view> </view>
<!-- <view class="tr">
<view class="td td2">地点：{{history.conference.conferenceNumber}}</view>
</view> -->
<view class="tr btn"> <view class="tr btn">
<view class="td td1"> <view class="td td1">
<text>会议操作：</text> <text>会议操作：</text>
...@@ -27,7 +30,7 @@ ...@@ -27,7 +30,7 @@
data-department="{{history.department}}" data-message-content="{{history.messageContent}}" data-config-value-id-string="{{history.configValueIdString}}" type='default' onTap="details">详细信息</button> data-department="{{history.department}}" data-message-content="{{history.messageContent}}" data-config-value-id-string="{{history.configValueIdString}}" type='default' onTap="details">详细信息</button>
<button class="btn2" size='mini' type='default' data-message-name="{{history.messageName}}" data-message-compere="{{history.messageCompere}}" data-topic-list="{{history.topicList}}" <button class="btn2" size='mini' type='default' data-message-name="{{history.messageName}}" data-message-compere="{{history.messageCompere}}" data-topic-list="{{history.topicList}}"
data-message-content="{{history.messageContent}}" data-department="{{history.department}}" data-remind-method="{{history.remindMethod}}" data-remind-time="{{history.remindTime}}" data-message-content="{{history.messageContent}}" data-department="{{history.department}}" data-remind-method="{{history.remindMethod}}" data-remind-time="{{history.remindTime}}"
data-cnum="{{history.conference.conferenceNumber}}" onTap="destine">再次预定</button> data-cnum="{{history.cnum}}" data-conference-name="{{history.conference.conferenceName}}" onTap="destine">再次预定 </button>
</view> </view>
</view> </view>
</view> </view>
......
pages/meeting/recording/recording.js
浏览文件 @ 2c7b1635
...@@ -56,19 +56,22 @@ Page({ ...@@ -56,19 +56,22 @@ Page({
}) })
}, },
destine(e){ destine(e){
console.log(e.currentTarget.dataset.cnum);
//var cnum = e.currentTarget.dataset.cnum; //var cnum = e.currentTarget.dataset.cnum;
dd.navigateTo({ dd.navigateTo({
url: '/pages/conference/addmeeting/addmeeting?cnum=' + e.currentTarget.dataset.cnum + '&messageName=' + e.currentTarget.dataset.messageName + "&messageCompere=" + e.currentTarget.dataset.messageCompere url: '/pages/conference/addmeeting/addmeeting?cnum='+ e.currentTarget.dataset.cnum + '&messageName=' + e.currentTarget.dataset.messageName + "&messageCompere=" + e.currentTarget.dataset.messageCompere
+ "&topicList=" + e.currentTarget.dataset.topicList + "&startTime=" + e.currentTarget.dataset.startTime + "&endTime=" + e.currentTarget.dataset.endTime + "&department=" + e.currentTarget.dataset.department + "&topicList=" + e.currentTarget.dataset.topicList + "&department=" + e.currentTarget.dataset.department + "&conferenceName=" + e.currentTarget.dataset.conferenceName
+ "&messageContent=" + e.currentTarget.dataset.messageContent + "&remindMethod=" + e.currentTarget.dataset.remindMethod + "&remindTime=" + e.currentTarget.dataset.remindTime + "&messageContent=" + e.currentTarget.dataset.messageContent + "&remindMethod=" + e.currentTarget.dataset.remindMethod + "&remindTime=" + e.currentTarget.dataset.remindTime
}) })
}, },
details(e){ details(e){
// console.log(e.currentTarget.dataset.messageName); // console.log(e.currentTarget.dataset.messageName);
dd.navigateTo({ dd.navigateTo({
url: '/pages/meeting/details/details?messageName=' + e.currentTarget.dataset.messageName + '&conferenceName=' + e.currentTarget.dataset.conferenceName + "&messageCompere=" + e.currentTarget.dataset.messageCompere+ "&topicList=" + e.currentTarget.dataset.topicList + "&startTime=" + e.currentTarget.dataset.startTime + "&endTime=" + e.currentTarget.dataset.endTime + "&department=" + e.currentTarget.dataset.department + "&messageContent=" + e.currentTarget.dataset.messageContent + "&configValueIdString=" + e.currentTarget.dataset.configValueIdString url: '/pages/meeting/details/details?messageName=' + e.currentTarget.dataset.messageName + '&conferenceName=' + e.currentTarget.dataset.conferenceName
+ "&messageCompere=" + e.currentTarget.dataset.messageCompere+ "&topicList=" + e.currentTarget.dataset.topicList + "&startTime=" + e.currentTarget.dataset.startTime
+ "&endTime=" + e.currentTarget.dataset.endTime + "&department=" + e.currentTarget.dataset.department + "&messageContent=" + e.currentTarget.dataset.messageContent
+ "&configValueIdString=" + e.currentTarget.dataset.configValueIdString
}) })
}, },
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论