Skip to content

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

修改bug

上级 e8d36ccd
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 533 行增加 和 452 行删除
app.js
浏览文件 @ ae9155bf
......@@ -15,7 +15,7 @@ App({
globalData: {
//domain:'http://id24iu.natappfree.cc',
//domain:"http://dd2.ubainsyun.com",
domain: "http://zhenglide.natapp1.cc" ,
domain: "http://zhenglide.natapp1.cc" ,
corpId: '',
userId:'',
person:'',
......
pages/conference/addmeeting/addmeeting.axml
浏览文件 @ ae9155bf
......@@ -27,6 +27,10 @@
<image src='../../../resource/images/off.png' onTap='delTopic'></image>
</view>
</view>
<!-- <view class='item-avatar-xs'>
<text>会议密码：</text>
<input type='password' value="{{message.messagePassword}}" placeholder='请输入会议密码' name="messagePassword" />
</view> -->
<view class='item-avatar-xs'>
<text>会议信息：</text>
<textarea placeholder='输入内容' value="{{message.messageContent}}" name="messageContent"></textarea>
......@@ -58,7 +62,7 @@
<text class="hour">{{hindex}}:00</text>
<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-max-book-time="{{maxBookTime}}" 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>
</scroll-view >
......@@ -67,7 +71,7 @@
<text>公司参与人员</text>
<text class='left'>〉</text>
</navigator>
<navigator url="../ex_visitor/ex_visitor?mid={{mid}}" open-type="navigate" class='item-avatar-xs'>
<navigator url="../ex_visitor/ex_visitor?mid={{mid}}&truntype={{truntype}}" open-type="navigate" class='item-avatar-xs'>
<text>邀请外部人员</text>
<text class='left'>〉</text>
</navigator>
......
pages/conference/details/details.axml
浏览文件 @ ae9155bf
......@@ -7,7 +7,7 @@
</text></label> <label>人数：{{conference.maxPerson}}人 </label> <label>地点：{{conference.area.areaName}} |{{conference.nextArea.areaName}}</label>
</view>
<view class='de_bg'>
<view class='de_title2'>当天会议</view>
<view class='de_title2'>当天会议</vie
<view class='de_border'></view>
</view>
<view class='de_time'>{{date}}</view>
......@@ -30,6 +30,6 @@
</view>
</view>
<view class='de_btn' data-cnum="{{conference.conferenceNumber}}" onTap="goto">
<view class='de_btn' data-max-book-time="{{conference.maxBookTime}}" data-max-book-day="{{conference.maxBookDay}}" data-cnum="{{conference.conferenceNumber}}" onTap="goto">
<button class='de_btn2' >添加预定</button>
</view>
\ No newline at end of file
pages/conference/details/details.js
浏览文件 @ ae9155bf
......@@ -12,13 +12,16 @@ Page({
date: dateFtt("yyyy-MM-dd", new Date())
},
goto:function(e){
var cnum= e.currentTarget.dataset.cnum;
var maxBookTime= e.currentTarget.dataset.maxBookTime;
var maxBookDay= e.currentTarget.dataset.maxBookDay;
dd.navigateTo({
url: '../addmeeting/addmeeting?cnum=' + cnum
url: '../addmeeting/addmeeting?cnum=' + cnum +'&maxBookTime='+ maxBookTime +'&maxBookDay='+ maxBookDay
})
},
setImageUrl: function(e) {
console.log("图片加载错误detail");
//console.log("图片加载错误detail");
var index = e.currentTarget.dataset.index;
// document.getElementById(id).src = "../../../resource/images/list-room.png";
......@@ -35,8 +38,10 @@ Page({
// 生命周期函数--监听页面加载
console.log("load会议室编号",query);
var _this=this;
_this.setData({
conference: null
})
dd.httpRequest({
......@@ -48,10 +53,13 @@ Page({
dataType: 'json',
success: function(res) {
console.log('success----', res)
//var maxBookTime= _this.data.result;
_this.setData({
conference: res.data.result
conference: res.data.result,
//maxBookTime
})
//console.log('maxbooktime',maxBookTime);
},
fail: function(res) {
console.log("httpRequestFail---", res)
......@@ -68,12 +76,12 @@ Page({
onReady(query) {
// 页面加载完成
console.log("ready会议室编号",query)
// console.log("ready会议室编号",query)
},
onShow(query) {
// 页面显示
console.log("show会议室编号",query)
// console.log("show会议室编号",query)
},
onHide() {
// 页面隐藏
......
pages/conference/ex_visitor/ex_visitor.axml
浏览文件 @ ae9155bf
......@@ -26,9 +26,9 @@
<view a:for="{{employeeList}}" a:for-item="employee" a:for-index="index" class='item-avatar-xs-a'>
<!-- <checkbox value="{{employee.name}}" checked="{{employee.checked}}" /> -->
<view data-index="{{index}}" data-id="{{employee.id}}" onTap="deleteSign" class="del">
<view data-index="{{index}}" data-id="{{employee.id}}" onTap="deleteSign" class="del">
<icon type="cancel" size="18" color="red"/>
</view>
</view>
<text class="checkbox-text">{{employee.name}}</text>
</view>
......
pages/conference/ex_visitor/ex_visitor.js
浏览文件 @ ae9155bf
......@@ -3,13 +3,12 @@ let domain = app.globalData.domain;
//获取用户信息的url
let addExSignUrl = domain + "/dingding/addExSign";
let delExSignUrl = domain + "/dingding/delExSign"
let delExSignUrl = domain + "/dingding/delExSign";
Page({
data: {
employeeList:[
],
employeeList:[],
mid:null,
personNum:0
},
......@@ -18,8 +17,6 @@ Page({
formSubmit: function(e){
console.log('form发生了submit事件，携带数据为：', e.detail.value);
var _this = this;
if(e.detail.value.signName.length == 0){
dd.alert({
......@@ -28,6 +25,7 @@ Page({
})
return false;
}
// if (e.detail.value.signMobile.length != 0) {
// var phoneReg = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/;
// var phone = e.detail.value.signMobile;
......@@ -83,13 +81,13 @@ Page({
signMobile: e.detail.value.signMobile,
signEmail: e.detail.value.signEmail,
signName: e.detail.value.signName,
},
dataType: 'json',
success: function(res) {
// console.log('success----', res)
console.log('success----', res)
if (res.data.success) {
//console.log("预定成功");
dd.alert({
......@@ -97,10 +95,9 @@ Page({
content: '添加成功',
buttonText: '确定',
success: () => {
var employeeList= _this.data.employeeList;
var emp={};
var emp={};
emp['name'] = res.data.result.signName;
emp['id'] = res.data.result.signId;
emp['checked'] = true;
......@@ -108,13 +105,26 @@ Page({
_this.setData({
personNum: _this.data.personNum + 1,
employeeList
employeeList,
});
},
//console.log('employeeList---',_this.data.employeeList);
},
});
// var employeeList= _this.data.employeeList;
// if(getCurrentPages().length !=2){
// // let pages = getCurrentPages(); //当前页面栈
// // let curPage = pages[pages.length - 3];
// // let data = curPage.data;
// employeeList = [];
// _this.setData({
// employeeList:employeeList
// })
// }
} else {
dd.showToast({
type: 'fail',
......@@ -177,7 +187,7 @@ Page({
},
fail: function(res) {
console.log("httpRequestFail---", res)
dd.alert({ content: JSON.stringify(res) });
//dd.alert({ content: JSON.stringify(res) });
},
complete: function(res) {
dd.hideLoading();
......@@ -188,25 +198,56 @@ Page({
},
onLoad: function(query) {
// 生命周期函数--监听页面加载
this.setData({
mid: query.mid
})
//var _this = this;
// if(getCurrentPages().length !=2){
// // let pages = getCurrentPages(); //当前页面栈
// // let curPage = pages[pages.length - 3];
// // let data = curPage.data;
// employeeList = [];
// _this.setData({
// isshowvisitor=0,
// employeeList:employeeList
// })
// }
},
onReady() {
onReady(query) {
// 页面加载完成
},
onShow() {
// 页面显示
// this.onLoad()
if(getCurrentPages().length >=3){
console.log('执行执行-----');
this.setData({
//currentPage: 1,
employeeList:[]
})
this.onLoad()
}
},
onHide() {
// 页面隐藏
},
onUnload() {
// 页面被关闭
// var _this = this;
// var employeeList= _this.data.employeeList;
// var pages = getCurrentPages(); //当前页面栈
// if(pages.length >=3){
// var beforePage = pages[pages.length - 3]; //获取上一个页面的实例对象
// //_this.data.employeeList = [];
// employeeList = [];
// _this.setData({
// employeeList
// })
// }
// console.log('employeeList---', _this.data.employeeList);
},
onTitleClick() {
// 标题被点击
......
pages/conference/index/index.acss
浏览文件 @ ae9155bf
......@@ -38,7 +38,7 @@ white-space: nowrap;
background: none;
font-size: 0.3rem;
position: absolute;
/* margin-top: 5rpx; */
margin-top: 5rpx;
}
.list_box{
margin-top: 30rpx;
......
pages/conference/index/index.js
浏览文件 @ ae9155bf
......@@ -67,7 +67,7 @@ Page({
_this.setData({
authCode: res.authCode
})
console.log("authCode" ,res.authCode)
dd.httpRequest({
url: url,
......
pages/conference/modifymeeting/modifymeeting.axml
浏览文件 @ ae9155bf
......@@ -10,16 +10,16 @@
<input type='text' value="{{message.messageCompere}}" placeholder='请输入主持人' name="messageCompere" />
</view>
<view class='item-avatar-xs'>
<text>添加议题：</text>
<input type='text' placeholder='输入议题' name="messageTheme" />
<image src='../../../resource/images/add.png' onTap='addList'></image>
</view>
<view class="item-avatar-xs" a:for="{{lists}}" a:key="{{index}}">
<view class='add'>
<input type='text' placeholder='输入议题' name="messageTheme" />
<image src='../../../resource/images/off.png' onTap='delList'></image>
</view>
</view>
<text>添加议题：</text>
<input type='text' placeholder='输入议题' onInput="inputTopic" value="{{topicList[0]}}" data-index="{{0}}" name="topicList[0]" />
<image src='../../../resource/images/add.png' onTap='addTopic'></image>
</view>
<view class="item-avatar-xs" a:for="{{topicList.length-1}}" a:for-item="i" a:key="{{index}}" >
<view class='add' >
<input type='text' placeholder='输入议题' value="{{topicList[i]}}" onInput="inputTopic" data-index="{{index+1}}" name="topicList[{{index+1}}]" />
<image src='../../../resource/images/off.png' onTap='delTopic'></image>
</view>
</view>
<view class='item-avatar-xs'>
<text>会议信息：</text>
<textarea placeholder='输入内容' value="{{messageContent}}" name="messageContent"></textarea>
......
pages/conference/modifymeeting/modifymeeting.js
浏览文件 @ ae9155bf
......@@ -19,7 +19,7 @@ Page({
//msgArray: ['无提醒', '提前十分钟', '提前半小时', '提前一小时'],
showView: false,
dates: dateFtt("yyyy-MM-dd", new Date()),
lists: [{}],
topicList: [],
text: '',
cnum:'',
allTime: {
......@@ -37,6 +37,33 @@ Page({
min:0,
}
},
//添加议题
addTopic: function() {
var topicList = this.data.topicList;
var newData ="";
topicList.push(newData);//实质是添加lists数组内容，使for循环多一次
this.setData({
topicList: topicList,
})
},
//删除议题
delTopic: function() {
var topicList = this.data.topicList;
topicList.pop(); //实质是删除lists数组内容，使for循环少一次
this.setData({
topicList: topicList,
})
},
inputTopic:function (e){
// console.log(e);
var topicList = this.data.topicList;
var index= e.currentTarget.dataset.index;
topicList[index]=e.detail.value;
this.setData({
topicList
})
console.log( this.data.topicList)
},
//方式选项点击
clicks: function(e) {
......@@ -583,11 +610,19 @@ console.log(e.currentTarget.dataset.hour);
dataType: 'json',
success: function(res) {
console.log('success----', res);
var list=res.data.result.topicList;
var topicList=[];
for(var t in list){
topicList.push(list[t].topicName);
}
console.log("topicList",topicList)
_this.setData({
message: res.data.result,
messageContent: res.data.result.messageContent,
topicList:topicList
});
var noticeList= _this.data.noticeList;
var cnum = res.data.result.cnum;
......
pages/conference/visitor/visitor.js
浏览文件 @ ae9155bf
......@@ -46,18 +46,7 @@ Page({
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++){
......@@ -75,17 +64,7 @@ Page({
_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
});
......@@ -104,69 +83,6 @@ Page({
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();
// }
// })
},
......@@ -344,11 +260,11 @@ Page({
cnum:query.cnum
})
dd.httpRequest({
url: getDepartmentUrl,
url: getStaffUrl,
method: 'POST',
data: {
userId: userId,
},
dataType: 'json',
success: function(res) {
......
pages/meeting/details/details.js
浏览文件 @ ae9155bf
......@@ -40,10 +40,12 @@ Page({
console.log('success----议题', res)
var topicStr = _this.data.topicStr;
var topicList= res.data.result;
for(var i=0 ;i<topicList.length;i++){
topicStr +=topicList[i].topicName +" "
for(var i=0;i<topicList.length;i++){
//for( var j=1; j<topicList.length; j++ ){
topicStr += " " + '(' + (i+1) + ')、' + topicList[i].topicName +" "
//}
}
console.log('topicStr',topicStr);
_this.setData({
topicStr
......
pages/meeting/record/record.axml
浏览文件 @ ae9155bf
......@@ -34,12 +34,12 @@
</view>
<view class="tr">
<view class="td td1">会议时间：{{message.startTimeFormat}} - {{message.endTimeFormat}}</view>
<view class="td td2">会议范围：{{message.department}}</view>
<view class="td td2">部门：{{message.department}}</view>
</view>
<view class="tr btn">
<view class="td td1">
<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}}" data-config-value-id="{{message.configValueId}}" onTap="modify">修改会议</button>
<button class="btn2" size='mini' type='warn' data-mid="{{message.messageId}}" data-config-value-id="{{message.configValueId}}" onTap="cancelmeeting">取消会议</button>
</view>
</view>
......@@ -60,7 +60,7 @@
</view>
<view class="tr">
<view class="td td1">会议时间：{{mymessage.startTimeFormat}} - {{mymessage.endTimeFormat}}</view>
<view class="td td2">会议范围：{{mymessage.department}}</view>
<view class="td td2">部门：{{mymessage.department}}</view>
</view>
<view class="tr btn">
<view class="td td1">
......@@ -69,7 +69,7 @@
<button class="btn1" a:if="{{mymessage.configValueId == 1}}" size='mini' type='primary'>正在会议</button>
<button class="btn1" a:if="{{mymessage.configValueId == 3}}" size='mini' type='warn'>暂停</button>
<button class="btn1" a:if="{{mymessage.configValueId == 2}}" size='mini' type='default'>未开始</button>
<button class="btn2" size='mini' data-date="{{dates}}" data-conference-name="{{mymessage.conference.conferenceName}}" data-mid="{{mymessage.messageId}}" type='primary' onTap="meetjy">会议纪要</button>
<button class="btn2" size='mini' data-date="{{dates}}" data-conference-name="{{mymessage.conference.conferenceName}}" data-message-password="{{mymessage.messagePassword}}" data-mid="{{mymessage.messageId}}" data-minutesCode="{{conference.minutesCode}}" type='primary' onTap="meetjy">会议纪要</button>
</view>
</view>
<view class="tr">
......
pages/meeting/record/record.js
浏览文件 @ ae9155bf
......@@ -76,10 +76,20 @@ Page({
},
meetjy: function(e){
var mid = e.currentTarget.dataset.mid;
// console.log("conferenceName", e.currentTarget.dataset.conferenceName);
dd.navigateTo({
url: '../summary/summary?mid=' + mid + '&conferenceName=' + e.currentTarget.dataset.conferenceName + "&date=" + e.currentTarget.dataset.date
})
let minutesCode = e.currentTarget.dataset.minutesCode;
let messagePassword = e.currentTarget.dataset.messagePassword;
console.log("minutesCode" ,minutesCode);
if(minutesCode != "" && minutesCode!=null ){
dd.navigateTo({
url: '../summary/summary?mid=' + mid + '&conferenceName=' + e.currentTarget.dataset.conferenceName + "&date=" + e.currentTarget.dataset.date
})
}else{
dd.alert({
content: '没有授权码，无法查看',
buttonText: '我知道了',
})
}
},
onReady() {
// 页面加载完成
......@@ -107,7 +117,7 @@ Page({
that.setData({
messageList,
messageList
});
console.log('会议列表-----',that.data.messageList);
},
......@@ -182,21 +192,54 @@ Page({
},
modify:function(e){
dd.navigateTo({
url: '../../conference/modifymeeting/modifymeeting?mid='+e.currentTarget.dataset.mid
})
//var mid= e.currentTarget.dataset.mid;
let configValueId = e.currentTarget.dataset.configValueId;
if( configValueId === 1){
dd.alert({
content: '会议进行中，不可修改',
buttonText: '确定',
})
}else if(configValueId === 4){
dd.alert({
content: '会议已结束，不可修改',
buttonText: '确定',
})
}else{
dd.navigateTo({
url: '../../conference/modifymeeting/modifymeeting?mid='+ e.currentTarget.dataset.mid
})
}
},
cancelmeeting:function (e){
var mid= e.currentTarget.dataset.mid;
let configValueId = e.currentTarget.dataset.configValueId;
if( configValueId === 1 || configValueId === 4 || configValueId === 3 ){
// if( configValueId === 1 || configValueId === 4 || configValueId === 3 ){
// dd.alert({
// content: '会议结束或进行中，不可取消',
// buttonText: '确定',
// })
// }
if( configValueId === 1){
dd.alert({
content: '会议结束或进行中，不可取消',
content: '会议进行中，不可取消',
buttonText: '确定',
})
}else if(configValueId === 4){
dd.alert({
content: '会议已结束，不可取消',
buttonText: '确定',
})
}else {
dd.httpRequest({
}
else if(configValueId === 3){
dd.alert({
content: '会议暂停中，不可取消',
buttonText: '确定',
})
}
else {
dd.httpRequest({
url: canclemeetingUrl,
method: 'POST',
data: {
......
pages/meeting/recording/recording.axml
浏览文件 @ ae9155bf
......@@ -13,7 +13,7 @@
</view>
<view class="tr">
<view class="td td1">会议时间：{{history.startTimeFormat}} - {{history.endTimeFormat}}</view>
<view class="td td2">会议范围：{{history.department}}</view>
<view class="td td2">部门：{{history.department}}</view>
</view>
<view class="tr">
<view class="td td2">地点：{{history.conference.conferenceName}}</view>
......@@ -24,7 +24,7 @@
<view class="tr btn">
<view class="td td1">
<text>会议操作：</text>
<button class="btn1" size='mini' data-mid="{{history.messageId}}" type='primary' onTap="summary">会议纪要</button>
<button class="btn1" size='mini' data-mid="{{history.messageId}}" data-minutesCode="{{conference.minutesCode}}" type='primary' onTap="summary">会议纪要</button>
<button class="btn3" size='mini' data-mid="{{history.messageId}}" data-message-name="{{history.messageName}}" data-conference-name="{{history.conference.conferenceName}}"
data-message-compere="{{history.messageCompere}}" data-topic-list="{{history.topicList}}" data-start-time="{{history.startTimeFormat}}" data-end-time="{{history.endTimeFormat}}"
data-department="{{history.department}}" data-message-content="{{history.messageContent}}" data-config-value-id-string="{{history.configValueIdString}}" type='default' onTap="details">详细信息</button>
......
pages/meeting/recording/recording.js
浏览文件 @ ae9155bf
......@@ -33,7 +33,7 @@ Page({
historyList
});
console.log(that.data.historyList);
//console.log(that.data.historyList);
},
fail: function(res) {
console.log("httpRequestFail---", res)
......@@ -49,11 +49,21 @@ Page({
summary(e){
var mid= e.currentTarget.dataset.mid;
console.log(e)
dd.navigateTo({
url: '/pages/meeting/summary/summary?mid='+mid ,
type:'redirect'
})
let minutesCode = e.currentTarget.dataset.minutesCode;
console.log("minutesCode" ,minutesCode);
//console.log(e)
if(minutesCode != "" && minutesCode !=null ){
dd.navigateTo({
url: '/pages/meeting/summary/summary?mid='+mid ,
type:'redirect'
})
}else{
dd.alert({
content: '没有授权,无法查看',
buttonText: '我知道了',
})
}
},
destine(e){
console.log(e.currentTarget.dataset.cnum);
......
pages/mine/opinion/opinion.axml
浏览文件 @ ae9155bf
......@@ -15,6 +15,6 @@
<view class="contact">
联系方式<input type="text" placeholder="留下联系方式，我们将尽快与您联系" name="" />
</view>
<button class="btn" type="primary" >提交</button>
<button class="btn" type="primary" onTap="sumit" >提交</button>
</form>
</view>
\ No newline at end of file
pages/mine/opinion/opinion.js
浏览文件 @ ae9155bf
......@@ -56,15 +56,21 @@ Page({
});
},
sumit(){
dd.alert({
content: '提交成功',
buttonText: '我知道了',
})
},
onReady() {
// 页面加载完成
opinion({
})
},
onShow() {
},
onHide() {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论