diff --git a/pages.json b/pages.json
index cdd52a3..f42a362 100644
--- a/pages.json
+++ b/pages.json
@@ -198,7 +198,6 @@
 		    {
 		        "navigationStyle": "custom"
 		    }
-		    
 		}
 		,{
 		    "path" : "pages/ProductManage/SlittingFeeding",
@@ -207,6 +206,13 @@
 		    	"enablePullDownRefresh": true,
 		    	"onReachBottomDistance": 50
 		    }   
+		},
+		{
+			"path": "pages/DispatchManage/TaskManage",
+			"style" :
+			{
+			    "navigationStyle": "custom"
+			}
 		}
     ],
 	"globalStyle": {
diff --git a/pages/DispatchManage/TaskManage.vue b/pages/DispatchManage/TaskManage.vue
new file mode 100644
index 0000000..d754bee
--- /dev/null
+++ b/pages/DispatchManage/TaskManage.vue
@@ -0,0 +1,134 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="任务管理"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">关键字</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>任务号</th>
+								<th>载具编码</th>
+								<th>取货点1</th>
+								<th>放货点1</th>
+								<th>取货点2</th>
+								<th>放货点2</th>
+								<th>状态</th>
+								<th>任务类型</th>
+								<th>AGV</th>
+								<th>生成时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
+								<td>{{e.task_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.point_code1}}</td>
+								<td>{{e.point_code2}}</td>
+								<td>{{e.point_code3}}</td>
+								<td>{{e.point_code4}}</td>
+								<td>{{e.task_status}}</td>
+								<td>{{e.task_type}}</td>
+								<td>{{e.car_no}}</td>
+								<td>{{e.create_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_taskConfirm">强制完成</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_againLssued">重新下发</button>
+			<button class="submit-button" @tap="_taskTaskQuery">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {taskTaskQuery, againLssued, taskConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				dataList: [],
+				disabled1: false,
+				disabled2: false,
+				pkId: '',
+				pkObj: {}
+			};
+		},
+		methods: {
+			/** 初始化查询 */
+			async _taskTaskQuery () {
+				let res = await taskTaskQuery(this.val1)
+				this.dataList = [...res.data]	
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.task_code ? '' : e.task_code
+				this.pkObj = this.pkId === e.task_code ? e : {}
+			},
+			/** 重新下发 */
+			async _againLssued () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await againLssued(this.pkObj)
+					this.disabled1 = false
+					this.pkId = ''
+					this._taskTaskQuery()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 强制完成 */
+			async _taskConfirm () {
+				this.disabled2 = true
+				if (!this.pkId) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await taskConfirm(this.pkObj)
+					this.disabled2 = false
+					this.pkId = ''
+					this._taskTaskQuery()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/static/image/.DS_Store b/static/image/.DS_Store
index 473fbc2..3684645 100644
Binary files a/static/image/.DS_Store and b/static/image/.DS_Store differ
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
new file mode 100644
index 0000000..15c177a
Binary files /dev/null and b/static/image/menu/RF10.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index d90c2f0..5620f00 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -70,6 +70,9 @@ export const authority = () => {
 				]},
 			{menu_id: '9', path: 'RF09', name: '打印管理', sonTree: [
 				{menu_id: '1', name: '客户标签打印', path: '/pages/WarehouseManage/CustomerLabelPrint'},
+				]},
+			{menu_id: '10', path: 'RF10', name: '调度管理', sonTree: [
+				{menu_id: '1', name: '任务管理', path: '/pages/DispatchManage/TaskManage'},
 				]}
 		]
 	}
@@ -357,4 +360,29 @@ export const feedingConfirm = (row) => request({
 	data: {
 		cut_rows: row
 	}
+})
+
+/**
+ * 任务管理
+ */
+//1.1任务查询	
+export const taskTaskQuery = (search) => request({
+url:'api/pda/task/taskQuery',
+data: {
+	search: search
+}
+})
+//1.2重新下发
+export const againLssued = (row) => request({
+url:'api/pda/task/againLssued',
+data: {
+	task_rows: row
+}
+})
+//1.3强制完成	
+export const taskConfirm = (row) => request({
+url:'api/pda/task/confirm',
+data: {
+	task_rows: row
+}
 })
\ No newline at end of file