diff --git a/pages/modules/forced-rest.vue b/pages/modules/forced-rest.vue
index c6223a4..4c8523a 100644
--- a/pages/modules/forced-rest.vue
+++ b/pages/modules/forced-rest.vue
@@ -4,7 +4,7 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
-					<view class="filter_label">设备号</view>
+					<view class="filter_label">静置时间</view>
 					<view class="filter_input_wraper">
 						<input type="text" class="filter_input" v-model="val1">
 					</view>
diff --git a/pages/modules/package-instore.vue b/pages/modules/package-instore.vue
index f6e9cd5..f30690f 100644
--- a/pages/modules/package-instore.vue
+++ b/pages/modules/package-instore.vue
@@ -4,9 +4,15 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
-					<view class="filter_label">设备号</view>
+					<view class="filter_label">托盘编码</view>
 					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val1">
+						<search-box v-model="val1" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">物料数量</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="val2">
 					</view>
 				</view>
 			</view>
@@ -15,20 +21,20 @@
 					<table>
 						<thead>
 							<tr>
-								<th>困料位置</th>
-								<th>设备号</th>
-								<th>静置时间</th>
-								<th>剩余静置时间</th>
-								<th>预计完成时间</th>
+								<th>起点1</th>
+								<th>终点1</th>
+								<th>起点2</th>
+								<th>终点2</th>
+								<th>任务状态</th>
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.group_id === pkId}">
-								<td>{{e.point_code}}</td>
-								<td>{{e.device_code}}</td>
-								<td>{{e.standing_time}}</td>
-								<td>{{e.timeDifferenceMinutes}}</td>
-								<td>{{e.estimatedCompletionTimeString}}</td>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{e.point_name1}}</td>
+								<td>{{e.point_name2}}</td>
+								<td>{{e.point_name3}}</td>
+								<td>{{e.point_name4}}</td>
+								<td>{{e.task_status}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -37,51 +43,50 @@
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId}" :disabled="disabled" @tap="toSure">确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {forcedRestingShow, forcedRestingSubmit} from '@/utils/getData2.js'
-	import {dateTimeFtt} from '@/utils/utils.js'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {manualSortingPackingTaskShow, manualSortingPackingTask} from '@/utils/getData2.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
 				val1: '',
+				val2: '',
 				dataList: [],
-				pkId: '',
-				pkObj: {},
 				disabled: false
 			};
 		},
 		created () {
-			this._forcedRestingShow()
+			this._manualSortingPackingTaskShow()
 		},
 		methods: {
 			/** grid查询 */
-			async _forcedRestingShow () {
-				let res = await forcedRestingShow()
+			async _manualSortingPackingTaskShow () {
+				let res = await manualSortingPackingTaskShow()
 				this.dataList = [...res]
 			},
 			/** 确认 */
 			async toSure () {
 				this.disabled = true
-				if (!this.val1 || !this.pkId) {
+				if (!this.val1 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await forcedRestingSubmit(this.val1, this.pkId)
+					let res = await manualSortingPackingTask(this.val1, this.val2)
 					this.disabled = false
-					this.pkId = ''
-					this.pkObj = {}
 					this.val1 = ''
-					this._forcedRestingShow()
+					this.val2 = ''
+					this._manualSortingPackingTaskShow()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -89,10 +94,6 @@
 				} catch (e) {
 					this.disabled = false
 				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.group_id ? '' : e.group_id
-				this.pkObj = this.pkId === e.group_id ? e : {}
 			}
 		}
 	}