lsw пре 11 месеци
родитељ
комит
0bbb1ebcbe

+ 1 - 1
app/common/common.scss

@@ -521,7 +521,7 @@
 	text-align: center;
 	.btn {
 		border-radius: 35px;
-		width: 50%;
+		width: 40%;
 		.icon {
 			padding-right: 5px;
 		}

+ 7 - 6
app/components/images/images.vue

@@ -98,10 +98,11 @@ export default {
 <style lang="scss" scoped>
 .imgs {
 	margin-top: 10px;
+	overflow: hidden;
 	.uploads {
 		float: left;
-		width: 80px;
-		height: 80px;
+		width: 75px;
+		height: 75px;
 		text-align: center;
 		border-radius: 5px;
 		margin: 5px 5px 0px 0px;
@@ -127,13 +128,13 @@ export default {
 		position: relative;
 		overflow: hidden;
 		border-radius: 5px;
-		width: 80px;
-		height: 80px;
+		width: 75px;
+		height: 75px;
 
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
 		image {
-			width: 80px;
-			height: 80px;
+			width: 75px;
+			height: 75px;
 			border-radius: 5px;
 		}
 		.del {

+ 3 - 3
app/components/task/task.vue

@@ -1,6 +1,6 @@
 <template>
 	<view v-if="show">
-		<u-popup :show="show" round="15" mode="center" :closeable="true" :customStyle="{ width: '95%' }" @close="show = false">
+		<u-popup :show="show" round="15" mode="center" :closeable="true" :customStyle="{ width: '90%' }" @close="show = false">
 			<view class="popup">
 				<u-divider text="上传任务日志" class="mt20 mb0"></u-divider>
 				<view class="bbg">
@@ -47,8 +47,8 @@ export default {
 						content: '上传成功',
 						showCancel: false,
 						success: (res) => {
+							this.$emit('confirm');
 							this.show = false;
-							this.$emit('success');
 						}
 					});
 				}
@@ -60,7 +60,7 @@ export default {
 
 <style lang="scss">
 textarea {
-	height: 150px;
+	height: 130px;
 	width: 93%;
 	padding: 10px;
 	margin-top: 10px;

+ 1 - 1
app/pages.json

@@ -300,7 +300,7 @@
 			}
 		},
 		{
-			"path": "pages/user/resume/application/task",
+			"path": "pages/user/resume/application/task_to_do",
 			"style": {
 				"navigationBarTitleText": "任务清单",
 				"enablePullDownRefresh": true

+ 1 - 1
app/pages/user/index.vue

@@ -179,7 +179,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="cd" @click="go('/pages/user/resume/application/task')">
+			<view class="cd" @click="go('/pages/user/resume/application/task_to_do')">
 				<view class="out">
 					<view class="int">
 						<view class="icon" style="background-color: #03a9f4">&#xe63c;</view>

+ 0 - 90
app/pages/user/resume/application/task.vue

@@ -1,90 +0,0 @@
-<template>
-	<view class="main pt0">
-		<view class="tab">
-			<u-tabs :list="tab" @click="tabClick"></u-tabs>
-		</view>
-		<view class="item_job" v-for="(item, index) in list" :key="index" @click="go('/pages/user/resume/application/task_detail?id=' + item.positionId + '&taskId=' + item.id)">
-			<view class="top">
-				<view class="title omit">{{ item.title }}</view>
-				<view class="salary">{{ item.salary }}¥</view>
-			</view>
-			<view class="bot bt">
-				<view class="desc">
-					<text>完工结算</text>
-					<text>{{ item.startDate }}至{{ item.endDate }}</text>
-				</view>
-				<view class="distance">{{ item.createTime }}</view>
-			</view>
-			<view class="flex">
-				<view class="f br agree" v-if="item.isComplete == 0">进行中...</view>
-			</view>
-		</view>
-		<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
-		<u-empty v-if="!loadMore && list.length == 0"></u-empty>
-	</view>
-</template>
-<script>
-export default {
-	data() {
-		return {
-			tab: [
-				{ name: '全部', isComplete: '' },
-				{ name: '进行中', isComplete: 0 },
-				{ name: '已完成', isComplete: 1 }
-			],
-			list: [],
-			param: { pageNum: 1, pageSize: 10, state: 1, type: 1, isAccept: 1 },
-			loadMore: true
-		};
-	},
-	onLoad(e) {
-		this.getData();
-	},
-	methods: {
-		getData() {
-			this.http.request({
-				url: '/app/deliver/user/list',
-				data: this.param,
-				loading: 'false',
-				success: (res) => {
-					this.loadMore = res.data.pages > this.param.pageNum ? true : false;
-					res.data.rows.forEach((item) => {
-						item.createTime = uni.$u.timeFrom(Date.parse(item.createTime));
-						this.list.push(item);
-					});
-				}
-			});
-		},
-		go(url) {
-			uni.navigateTo({ url: url });
-		},
-		tabClick(e) {
-			this.param.isComplete = e.isComplete;
-			this.refresh();
-		},
-		//刷新数据
-		refresh() {
-			this.loadMore = true;
-			this.param.pageNum = 1;
-			this.list = [];
-			this.getData();
-		}
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		setTimeout(() => {
-			this.refresh();
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	//上拉加载
-	onReachBottom() {
-		if (this.loadMore) {
-			this.param.pageNum++;
-			this.getData();
-		}
-	}
-};
-</script>
-
-<style lang="scss"></style>

+ 68 - 58
app/pages/user/resume/application/task_list.vue

@@ -1,31 +1,18 @@
 <template>
 	<view>
-		<view class="position">
-			<view class="item" v-for="(item, index) in list" :key="index" @click="go('/pages/job/position/manage/full_time_push?id=' + item.id)">
-				<view class="top">
-					<view class="title omit">
-						<text class="icon" :style="{ color: item.state == 0 ? '#4CAF50' : '#545555' }">&#xe614;</text>
-						<text>{{ item.title }}</text>
-					</view>
-					<view class="audit" v-if="item.audit == 0">
-						<text class="icon">&#xe642;</text>
-						<text>审核中</text>
-					</view>
-					<view class="audit" style="color: #4caf50" v-if="item.audit == 1">
-						<text class="icon">&#xe612;</text>
-						<text>审核通过</text>
-					</view>
-					<view class="audit" v-if="item.audit == 2">
-						<text class="icon">&#xec72;</text>
-						<text>审核不通过</text>
-					</view>
+		<view class="list">
+			<view class="item" v-for="(item, index) in list" :key="index">
+				<view class="left">
+					<text class="icon">&#xe627;</text>
 				</view>
-				<view class="flex">
-					<view class="f danger" @click.stop="manageRemove(item)">删除</view>
+				<view class="con">
+					<view class="date">{{ item.createTime }}</view>
+					<view class="del" @click="remove(item)">删除</view>
+					<images v-model="item.pic" :read="true"></images>
+					<view class="contents">{{ item.contents }}</view>
 				</view>
 			</view>
-			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
-			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
+			<u-empty v-if="list.length == 0"></u-empty>
 		</view>
 		<view class="mfooter">
 			<button class="btn" @click="show()">
@@ -33,7 +20,7 @@
 				<text>添加</text>
 			</button>
 		</view>
-		<task ref="task" success="success()"></task>
+		<task ref="task" @confirm="confirm()"></task>
 	</view>
 </template>
 
@@ -42,28 +29,23 @@ export default {
 	data() {
 		return {
 			list: [],
-			param: { pageNum: 1, pageSize: 10 },
-			loadMore: true
+			param: {}
 		};
 	},
 	onLoad(e) {
 		this.param.taskId = e.taskId;
 		this.getData();
-		uni.$on('task_list', (res) => {
-			this.refresh();
-		});
 	},
 	methods: {
 		getData() {
 			this.http.request({
 				url: '/app/task/list',
 				data: this.param,
-				loading: 'false',
 				success: (res) => {
-					this.loadMore = res.data.pages > this.param.pageNum ? true : false;
-					res.data.rows.forEach((item) => {
+					this.list = res.data.data;
+					this.list.forEach((item) => {
+						item.pic = item.pic.split(',');
 						item.createTime = uni.$u.timeFrom(Date.parse(item.createTime));
-						this.list.push(item);
 					});
 				}
 			});
@@ -71,14 +53,17 @@ export default {
 		show() {
 			this.$refs.task.init(this.param.taskId);
 		},
-		manageRemove(item) {
+		confirm() {
+			this.getData();
+		},
+		remove(item) {
 			uni.showModal({
 				title: '提示',
-				content: '确定删除该职位?删除后包括已投递简历也全部清除',
+				content: '确定删除?',
 				success: (res) => {
 					if (res.confirm) {
 						this.http.request({
-							url: '/app/position/manage/remove/' + item.id,
+							url: '/app/task/remove/' + item.id,
 							success: (res) => {
 								uni.showToast({ title: '删除成功' });
 								this.list.splice(this.list.indexOf(item), 1);
@@ -87,30 +72,55 @@ export default {
 					}
 				}
 			});
-		},
-		//刷新数据
-		refresh() {
-			this.loadMore = true;
-			this.param.pageNum = 1;
-			this.list = [];
-			this.getData();
-		}
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		setTimeout(() => {
-			this.refresh();
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	//上拉加载
-	onReachBottom() {
-		if (this.loadMore) {
-			this.param.pageNum++;
-			this.getData();
 		}
 	}
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+.list {
+	padding-top: 16px;
+	.item {
+		padding: 20px 15px 20px 20px;
+		display: flex;
+		.left {
+			flex: 0.1;
+			border-left: 1px solid darkgray;
+			margin-top: -44px;
+			.icon {
+				float: left;
+				margin-left: -12px;
+				position: relative;
+				background-color: $main-color;
+				color: white;
+				border-radius: 50%;
+				padding: 5px;
+				margin-top: 8px;
+				font-size: 15px;
+			}
+		}
+		.con {
+			flex: 1;
+			background-color: white;
+			padding: 0px 12px 10px 12px;
+			position: relative;
+			border-radius: 5px;
+			font-size: 14px;
+			.date {
+				top: -31px;
+				left: 0px;
+				position: absolute;
+			}
+			.del {
+				top: -31px;
+				right: 0px;
+				position: absolute;
+				color: #F44336;
+			}
+			.contents {
+				padding-top: 5px;
+			}
+		}
+	}
+}
+</style>

+ 2 - 7
ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_TaskListController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.web.work.api;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.web.work.api.config.BaseController;
 import com.ruoyi.web.work.domain.TaskList;
 import com.ruoyi.web.work.domain.dto.TaskListDto;
@@ -10,8 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 任务进度列
  *
@@ -25,11 +22,9 @@ public class Api_TaskListController extends BaseController {
     private ITaskListService taskListService;
 
     @GetMapping("/list")
-    public TableDataInfo list(TaskList taskList) {
+    public AjaxResult list(TaskList taskList) {
         taskList.setUserId(getUser().getId());
-        startPage();
-        List<TaskList> list = taskListService.selectList(taskList);
-        return getDataTable(list);
+        return AjaxResult.success(taskListService.selectList(taskList));
     }
 
     @PostMapping("/add")

+ 1 - 0
ruoyi-admin/src/main/resources/mapper/work/TaskListMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isRead != null "> and is_read = #{isRead}</if>
             <if test="contents != null  and contents != ''"> and contents = #{contents}</if>
         </where>
+        order by id desc
     </select>
 
 </mapper>