diff --git a/src/mycomponents/job/jobAccept.vue b/src/mycomponents/job/jobAccept.vue
new file mode 100644
index 00000000..b7b8dac2
--- /dev/null
+++ b/src/mycomponents/job/jobAccept.vue
@@ -0,0 +1,47 @@
+<template>
+	<!-- style="margin-top: 10rpx;margin-bottom: 10rpx;" class="uni-flex uni-row space-between u-col-center" -->
+	<view class="task_item" style="margin-left: 15rpx; margin-right: 15rpx;">
+		<view class="uni-flex  u-col" style="flex-direction: column;">
+			<view class="uni-flex uni-row  u-col-center">
+				<text style="font-size: 32rpx;" >承接人: {{dataContent.acceptUserName}}</text>
+			</view>
+			<view class="uni-flex uni-row  u-col-center">
+				<text style="font-size: 32rpx;"  class="center">承接时间 : {{formatDate(dataContent.acceptTime)}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			formatDate: function(val) {
+				return dateFormat(val)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index 002b4e59..7e617a58 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -1,16 +1,19 @@
 <template>
   <view class="">
     <view class="task_text" style="border-top: 1px solid #dedede; padding-top: 20rpx">
-      <itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false"></itemCompareQty>
-      <div>
+      <itemCompareQty :dataContent="dataContent"
+                      :isShowPackCount="isShowPackCount"
+                      :handleQty="dataContent.handleQty" :isShowPackUnit="false"
+      ></itemCompareQty>
+      <view>
         <pack v-if="isShowPack && dataContent.packingNumber != null" :packingCode="dataContent.packingNumber"> </pack>
         <batch v-if="isShowBatch && dataContent.batch != null" :batch="dataContent.batch"></batch>
-        <div class="u-flex justify-between u-p-b-16">
+        <view class="u-flex justify-between u-p-b-16">
           <location v-if="isShowFromLocation && dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode"> </location>
           <level title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== undefined && dataContent.priority !== null"> </level>
           <to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode || dataContent.locationCode"> </to-location>
-        </div>
-      </div>
+        </view>
+      </view>
     </view>
   </view>
 </template>
@@ -52,6 +55,10 @@ const props = defineProps({
   isShowDeliverType: {
     type: Boolean,
     default: false
+  },
+  isShowPackCount: {
+    type: Boolean,
+    default: false
   }
 })
 </script>
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 28d82688..48665471 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -13,7 +13,7 @@
         <u-switch v-model="checkedTodayModel" active-color="#4DD865" inactive-color="#eee" size="35"
           @change="switchChangeToday"></u-switch>
       </view>
-      <view class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;">
+      <view class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;"  v-if="isShowStatus">
 
         <view class="" style="font-size: 32rpx;">
           只看待处理
@@ -43,10 +43,35 @@
       <view v-if="isShowFromLocationCode" class="uni-flex space-between u-col-center"
             style="width: 100%;margin-top: 30rpx;">
         <view class="" style="font-size: 32rpx;">
-          来源库位
+          {{fromLoactionCodeName}}
         </view>
         <u-input style="margin-left: 20rpx;" confirmType="search" v-model="fromLocationCode" :border="true"
-                 placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
+                 :placeholder="`请输入${fromLoactionCodeName}`"
+                 @confirm="fromLocationCodeConfirm" />
+      </view>
+      <view v-if="isShowToLocationCode" class="uni-flex space-between u-col-center"
+            style="width: 100%;margin-top: 30rpx;">
+        <view class="" style="font-size: 32rpx;">
+          目标库位
+        </view>
+        <u-input style="margin-left: 20rpx;" confirmType="search" v-model="toLocationCode" :border="true"
+                 placeholder="请输入目标库位"  />
+      </view>
+      <view v-if="isShowFromAreaCode" class="uni-flex space-between u-col-center"
+            style="width: 100%;margin-top: 30rpx;">
+        <view class="" style="font-size: 32rpx;">
+          来源库区
+        </view>
+        <u-input style="margin-left: 20rpx;" confirmType="search" v-model="fromAreaCode" :border="true"
+                 placeholder="请输入来源库区" />
+      </view>
+      <view v-if="isShowToAreaCode" class="uni-flex space-between u-col-center"
+            style="width: 100%;margin-top: 30rpx;">
+        <view class="" style="font-size: 32rpx;">
+          到库区
+        </view>
+        <u-input style="margin-left: 50rpx;" confirmType="search" v-model="toAreaCode" :border="true"
+                 placeholder="请输入到库区" />
       </view>
 
       <!-- <view class="">
@@ -98,10 +123,18 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
+  fromLoactionCodeName:{
+    type: String,
+    default: "来源库位"
+  },
   isShowFromLocationCode: {
     type: Boolean,
     default: false
   },
+  isShowToLocationCode: {
+    type: Boolean,
+    default: false
+  },
   isShowProductionLineCode: {
     type: Boolean,
     default: false
@@ -117,7 +150,21 @@ const props = defineProps({
   isShowQurery: {
     type: Boolean,
     default: false
-  }
+  },
+  //来源库区
+  isShowFromAreaCode: {
+    type: Boolean,
+    default: false
+  },
+  //到库区
+  isShowToAreaCode: {
+    type: Boolean,
+    default: false
+  },
+  isShowStatus: {
+    type: Boolean,
+    default: true
+  },
 })
 const dataContent = ref({})
 const checkedTodayModel = ref(false)
@@ -129,7 +176,14 @@ const scanNumber = ref()
 const scanAsnNumber = ref()
 const itemCode = ref('')//物料代码
 const creationTime = ref('')
-const status = ref('')
+const status = ref('1,2')
+const toLocationCode = ref('')
+const toAreaCode = ref('')
+const fromAreaCode = ref('')
+const isOnToday = ref(false)
+const isOnWait = ref(false)
+const params = ref({})
+const popup = ref(null)
 // 监视属性
 watch(
   () => props.checkedToday,
@@ -150,6 +204,9 @@ const getQueryCondition = ()=>{
   let params = {
     productionLineCode: productionLineCode.value,
     fromLocationCode: fromLocationCode.value,
+    toLocationCode:toLocationCode.value,
+    fromAreaCode: fromAreaCode.value, // 来源库区
+    toAreaCode: toAreaCode.value, // 到库区
     itemCode: itemCode.value,
     creationTime: creationTime.value,
     status: status.value
@@ -162,13 +219,18 @@ const query = ()=> {
   closeScanPopup();
 }
 const reset = ()=>{
+  checkedTodayModel.value = false
+  checkedWaitModel.value = false
   productionLineCode.value = ''
   fromLocationCode.value = ''
+  toLocationCode.value = false
+  fromAreaCode.value = false
+  toAreaCode.value = false
   itemCode.value = ''
   creationTime.value = ''
-  status.value = ''
+  status.value = '1,2'
   query()
-},
+}
 // 生产线
 const productionLineCodeConfirm = (e) => {
   const lineCode = e
@@ -189,6 +251,20 @@ const maskClick = () => {
 const openFilter = () => {
   show.value = true
 }
+const openFilterParams = (params)=>{
+  popup.value.open('top')
+  if(params){
+    productionLineCode.value = params.productionLineCode
+    fromLocationCode.value = params.fromLocationCode
+    fromAreaCode.value = params.fromAreaCode
+    toAreaCode.value = params.toAreaCode
+    itemCode.value = params.itemCode
+    creationTime.value = params.creationTime
+    status.value = params.status
+    checkedTodayModel.value = !!creationTime
+    checkedWaitModel.value = this.status=="1"
+  }
+}
 const closeScanPopup = () => {
   show.value = false
 }