Skip to content

S
schedule
Commit d0ab4820 by liang ce
Options

提交代码

parent c6bbe932
Showing with 90 additions and 74 deletions
PageComponents/myDynamic/myDynamic.acss
......@@ -57,15 +57,6 @@
line-height: 24rpx;
}
.dynamicFile {
border: 1px solid #F5F6F7;
border-radius: 8px;
box-sizing: border-box;
padding: 24rpx 16rpx;
display: flex;
align-items: center;
}
.fileIcon {
width: 64rpx;
height: 64rpx;
......
PageComponents/myDynamic/myDynamic.axml
......@@ -10,31 +10,21 @@
<text a:if="{{item.traceTime !== '1970-03-01 00:00:00'}}" class="iconfont iconicon_top1"></text>
</view>
</view>
<block a:for="{{item.meetingLogResourceList}}" a:for-item="dynamicItem">
<block a:for="{{item.meetingLogDataList}}" a:for-item="dynamicItem">
<view class="userDynamic">
<view class="dynamicTime">
<text>{{dynamicItem.creatorInfo.username}}更新了{{dynamicItem.logType === 'accessory' ? '文件' : '任务'}}</text>
<text>{{dynamicItem.creatorInfo.username}}更新了{{dynamicItem.category == 2 ? '文件' : '任务'}}</text>
<text>{{createTime}}</text>
</view>
<block a:for="{{dynamicItem.meetingLogResourceList}}" a:for-item="resourceList">
<file-list a:if="{{dynamicItem.logType === 'schedule_accessory_add'}}" fileList="{{resourceList.fileInfos}}" isCanEdit="{{false}}"/>
<!--<view class="dynamicFile" a:if="{{dynamicItem.logType === 'accessory'}}" a:for="{{resourceList.fileInfos}}" a:for-item="fileList" data-file="{{fileList}}" onTap="previewFileInDingTalk"><view class="fileIcon">
123</view><view class="fileMsg"><view class="fileName">
{{fileList.fileName}}</view><view class="fileSize">
{{(fileList.fileSize/1024/1024).toFixed(2)}}KB</view></view></view> -->
<view class="dynamicFile" a:if="{{dynamicItem.logType === 'task'}}">
<task-list taskList="{{resourceList.taskInfos}}" isCanEdit="{{false}}"/>
<!--<view class="task"><view class="taskName"><text>{{resourceList.taskInfos}}</text><text>{{resourceList.taskInfos}}</text></view><view class="userLogo">
{{resourceList.taskInfos}}</view></view> -->
<file-list a:if="{{dynamicItem.category === '2'}}" fileView="{{dynamicItem}}" isCanEdit="{{false}}"/>
<view class="dynamicFile" a:if="{{dynamicItem.category === '3'}}">
<task-list onChangeTaskStatusOnList="onChangeTaskStatusOnList" taskList="{{[dynamicItem]}}" isCanEdit="{{false}}"/>
</view>
</block>
</view>
</block>
</view>
<view class="placedTop" onTap="changeCollection" data-scheduleid="{{item.scheduleId}}" data-index="{{index}}" data-collection="{{item.traceTime === '1970-03-01 00:00:00' ? 'Y':'N'}}">
<!-- 可能会改 -->
<text class="iconfont iconicon_top1 {{item.traceTime === '1970-03-01 00:00:00' ? '': 'isTopIcon'}}"></text>
<!-- {{item.traceTime === '1970-03-01 00:00:00' ? 'Y':'N'}} -->
</view>
</view>
</view>
......
PageComponents/myDynamic/myDynamic.js
import { getDynamicList, meetingCollection } from "../../api/request";
import {
getDynamicList,
meetingCollection,
updateMeetingTask
} from "../../api/request";
import { dealFileTime } from "../../utils/utils";
Component({
mixins: [],
......@@ -17,25 +21,9 @@ Component({
didMount() {
this.getPages(1);
},
didUpdate() {
this.test();
},
didUpdate() {},
didUnmount() {},
methods: {
test() {
console.log(1);
const promise = new Promise((resolve, reject) => {
console.log(123);
resolve(2);
});
setTimeout(() => {
console.log(3);
});
promise.then(res => {
console.log(res);
});
},
getPages(current) {
let that = this;
let data = {
......@@ -50,28 +38,34 @@ Component({
if (res.data.data) {
let dynamicList = res.data.data.records.map((item, index) => {
// 第二层日程下的动态数据处理
let meetingLogResourceList = item.meetingLogDataList.map(
let meetingLogDataList = item.meetingLogDataList.map(
(item2, index2) => {
if (item2.category === "2" || item2.category === "3") {
if (item2.category === "2") {
// 第三层处理动态下的文件或者任务数据
let meetingLogResourceList = item2.meetingLogResourceList.map(
(item3, index3) => {
return {
...item3,
fileInfos: item3.fileInfos
? JSON.parse(item3.fileInfos)
: ""
};
}
);
return {
logType: item2.logType,
createTime: dealFileTime(item2.createTime),
creatorInfo: JSON.parse(item2.creatorInfo),
meetingLogResourceList: meetingLogResourceList
let meetingLogResource = item2.meetingLogResource;
meetingLogResource.fileInfos = !meetingLogResource.fileInfos
? ""
: JSON.parse(meetingLogResource.fileInfos);
meetingLogResource.creatorInfo = !meetingLogResource.creatorInfo
? ""
: JSON.parse(meetingLogResource.creatorInfo);
meetingLogResource.category = "2";
return meetingLogResource;
} else if (item2.category === "3") {
let meetingLogResource = {
category: "3",
groupId: item2.groupId,
scheduleId: item2.scheduleId,
id: item2.meetingLogResource.id,
acceptorInfo: item2.meetingLogResource.acceptorInfo
? JSON.parse(item2.meetingLogResource.acceptorInfo)
: "",
taskInfos: item2.meetingLogResource.taskInfos
? JSON.parse(item2.meetingLogResource.taskInfos)
: "",
taskStatus: item2.meetingLogResource.taskStatus
};
} else {
return null;
return meetingLogResource;
}
}
);
......@@ -79,7 +73,7 @@ Component({
scheduleId: item.scheduleId,
title: item.title,
traceTime: item.traceTime,
meetingLogResourceList: meetingLogResourceList
meetingLogDataList: meetingLogDataList
};
});
if (current === 1) {
......@@ -97,6 +91,7 @@ Component({
noData: dynamicList.length === that.data.size ? true : false
});
}
console.log(this.data.dynamicList);
}
});
},
......@@ -187,6 +182,43 @@ Component({
if (!this.data.noData) {
this.getPages(this.data.current + 1);
}
},
onChangeTaskStatusOnList(e) {
let that = this;
let data = {
groupId: e.groupId,
scheduleId: e.scheduleId,
resourceType: "task",
creatorId: getApp().globalData.userid,
creatorInfo: getApp().globalData.userInfo,
id: e.id,
logType: "task_status_modify",
taskStatus: e.status
};
updateMeetingTask(data).then(res => {
if (res.data.code === 0) {
let dataIndex1 = "";
let dataIndex2 = "";
that.data.dynamicList.map((item, index) => {
if (item.scheduleId === e.scheduleId) {
dataIndex1 = index;
item.meetingLogDataList.map((item2, index2) => {
if (item2.groupId && item2.groupId === e.groupId) {
dataIndex2 = index2;
}
});
}
});
let setData = `dynamicList[${dataIndex1}].meetingLogDataList[${dataIndex2}]`;
let setDate2 =
that.data.dynamicList[dataIndex1].meetingLogDataList[dataIndex2];
setDate2.taskStatus = e.status;
that.setData({
[setData]: setDate2
});
console.log(that.data.dynamicList);
}
});
}
}
});
components/taskList/taskList.axml
......@@ -2,7 +2,7 @@
<import src="../../template/checkbox/index.axml"/>
<view class="task-list">
<view class="task-box" a:for='{{taskList}}'>
<template is="checkbox" data="{{ status: item.taskStatus, id: item.id }}"></template>
<template is="checkbox" data="{{ status: item.taskStatus, id: item.id, groupId: item.groupId, scheduleId: item.scheduleId}}"></template>
<view class="task-title" data-pop="{{title: '会议任务', type: 'updateTask'}}" onTap="showPop" data-task="{{item}}">{{item.taskInfos.taskTitle}}
<template is="avater" a:if="{{item.acceptorInfo}}" data="{{item: item.acceptorInfo}}"/>
</view>
......
components/taskList/taskList.js
......@@ -6,11 +6,13 @@ Component({
props: {
isCanEdit: true
},
didMount() {
},
didMount() {},
didUpdate() {
if (this.props.taskList.id === 108) {
console.log(this.props);
}
},
didUnmount() { },
didUnmount() {},
methods: {
showPop(e) {
if (this.props.isCanEdit) {
......@@ -21,16 +23,16 @@ Component({
closePop() {
this.setData({
show: false
})
});
},
checkChange(e) {
let { status, id } = e.target.dataset;
if (status == '0') {
status = '1'
let { status, id, groupId, scheduleId } = e.target.dataset;
if (status == "0") {
status = "1";
} else {
status = '0'
status = "0";
}
this.props.onChangeTaskStatusOnList({ status, id, groupId, scheduleId });
}
this.props.onChangeTaskStatusOnList({ status, id })
}
},
});
template/checkbox/index.axml
<!-- checkbox模板 {status: status}-->
<template name="checkbox">
<view class="checkbox {{status == '1' ? 'checkbox-active': ''}}" data-id="{{id}}" data-status="{{status}}" onTap="checkChange">
<view class="checkbox {{status == '1' ? 'checkbox-active': ''}}" data-id="{{id}}" data-groupId="{{groupId}}" data-scheduleId="{{scheduleId}}" data-status="{{status}}" onTap="checkChange">
<text a:if="{{status == '1'}}" class="iconfont iconicon_ok"></text>
</view>
</template>
\ No newline at end of file
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