From a5e1e583a63877dbfb304805ae2daaa10ddd1c1b Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 9 Sep 2024 16:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD2024/7/20=2015:27:09?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           |   4 +
 src/common/style/new_style.css                |   9 +-
 .../package/PackageAndItemCard.vue            |   4 +-
 src/mycomponents/qty/countQtyEdit.vue         |  36 +-
 src/pages/count/job/countJob.vue              |  10 +-
 src/pages/count/job/fuzzyCountDetail.vue      | 317 +++++++++++-------
 src/pages/count/job/fuzzyCountJob.vue         |   8 +-
 .../productReceipt/job/productReceiptJob.vue  |  18 +-
 8 files changed, 249 insertions(+), 157 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 478889b6..411c89d3 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -1000,6 +1000,10 @@ export function inventoryMoveRecordSubmit(params) {
 export function getCountJobList(params) {
   return http.post("/wms/count-job-main/senior" ,params)
 }
+//获取盲盘任务列表
+export function getFuzzyCountJobList(data) {
+  return http.post("/wms/count-job-main/senior-pda",data)
+}
 /**
  * 盘点 获取任务明细
  * @param {*}   id 任务id
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 3348c592..a1104795 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2660,7 +2660,14 @@ button[disabled] {
 	border: 1px solid rgb(220, 211, 211);
 	padding: 5rpx;
 }
-
+.desc_input {
+	height: 100rpx;
+	font-size: 10rpx;
+	color: #000000;
+	text-align: left;
+	border: 1px solid rgb(220, 211, 211);
+	padding: 5rpx;
+}
 .qty_inspect_input {
 	width: 150rpx;
 	height: 60rpx;
diff --git a/src/mycomponents/package/PackageAndItemCard.vue b/src/mycomponents/package/PackageAndItemCard.vue
index 5fec15fa..e2893581 100644
--- a/src/mycomponents/package/PackageAndItemCard.vue
+++ b/src/mycomponents/package/PackageAndItemCard.vue
@@ -3,11 +3,11 @@
     <view class="uni-flex uni-row space-between" style="align-items: center">
       <view style="word-break: break-all">
         <item :dataContent="dataContent" style="margin-left: 4px; padding: 0px 5px 5px"></item>
-        <pack v-if="dataContent.number != null" :packingCode="dataContent.number"></pack>
+        <pack v-if="dataContent.packingNumber != null" :packingCode="dataContent.packingNumber"></pack>
         <batch v-if="dataContent.batch != null" :batch="dataContent.batch"></batch>
       </view>
       <view class="uni-flex uni-row" style="word-break: break-all">
-        <recommend-qty v-if="dataContent.handleQty == null || dataContent.handleQty == undefined" :dataContent="dataContent" :isShowStdPack="false" :isShowStatus="isShowStatus" :isShowPackCount="false"></recommend-qty>
+        <recommend-qty :dataContent="dataContent" :isShowStdPack="false" :isShowStatus="true" :isShowPackCount="false"></recommend-qty>
       </view>
     </view>
   </view>
diff --git a/src/mycomponents/qty/countQtyEdit.vue b/src/mycomponents/qty/countQtyEdit.vue
index 47ad3e7b..46dd8f56 100644
--- a/src/mycomponents/qty/countQtyEdit.vue
+++ b/src/mycomponents/qty/countQtyEdit.vue
@@ -40,19 +40,33 @@
                   <uom :uom="dataContent.uom"></uom>
                 </view>
               </view>
-              <view class="split_line"></view>
-              <view v-if="isShowBalance" class="uni-flex uni-row space-between padding title u-col-center">
-                <text>库存数量 : </text>
-                <view class="uni-flex uni-row uni-center" style="align-items: center">
-                  <text class="text_recommend">{{ Number(dataContent.balanceQty) }}</text>
-                  <uom :uom="dataContent.uom"></uom>
+              <view v-if="isShowBalance">
+                <view class="split_line"></view>
+                <view class="uni-flex uni-row space-between padding title u-col-center">
+                  <text>库存数量 : </text>
+                  <view class="uni-flex uni-row uni-center" style="align-items: center">
+                    <text class="text_recommend">{{ Number(dataContent.balanceQty) }}</text>
+                    <uom :uom="dataContent.uom"></uom>
+                  </view>
                 </view>
               </view>
-              <view class="split_line"></view>
-              <view v-if="isShowStatus" class="uni-flex uni-row space-between title" style="align-items: center; padding-left: 30rpx">
-                <text>库存状态 : </text>
-                <view class="uni-flex uni-row uni-center" style="align-items: center">
-                  <balanceStatus ref="balanceStatus" :status="inventoryStatus" :allowEdit="true" @updateStatus="updateStatus" @onOpen="clickState"> </balanceStatus>
+
+              <view v-if="isShowStatus">
+                <view class="split_line"></view>
+                <view class="uni-flex uni-row space-between padding title u-col-center" style="align-items: center; padding-left: 30rpx">
+                  <text>库存状态 : </text>
+                  <view class="uni-flex uni-row uni-center" style="align-items: center">
+                    <balanceStatus ref="balanceStatus" :status="inventoryStatus" :allowEdit="true" @updateStatus="updateStatus" @onOpen="clickState"> </balanceStatus>
+                  </view>
+                </view>
+              </view>
+              <view v-if="isShowStatus">
+                <view class="split_line"></view>
+                <view class="uni-flex uni-row space-between padding title u-col-center" style="align-items: center; padding-left: 30rpx">
+                  <text>描述 : </text>
+                  <view class="uni-flex uni-row uni-center" style="align-items: center">
+                    <input class="desc_input" v-model="description" :focus="true" />
+                  </view>
                 </view>
               </view>
               <view class="split_line"></view>
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index e93b6538..26001469 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -135,11 +135,11 @@ const getList = (type) => {
     action: '==',
     value: 'locationCode'
   })
-  filters.push({
-    column: 'accept_user_id',
-    action: '==',
-    value: store.id
-  })
+  // filters.push({
+  //   column: 'accept_user_id',
+  //   action: '==',
+  //   value: store.id
+  // })
   const params = {
     filters,
     pageNo: pageNo.value,
diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue
index e73d01a7..e13615dc 100644
--- a/src/pages/count/job/fuzzyCountDetail.vue
+++ b/src/pages/count/job/fuzzyCountDetail.vue
@@ -3,39 +3,42 @@
     <view class="page-header">
       <view class="header_job_top">
         <job-top :dataContent="jobContent"></job-top>
-        <view class="card_view">
-          <text class="card_packing_code">盘点计划</text>
-          <text class="card_content">{{ jobContent.planNumber }}</text>
-        </view>
-        <view v-for="(range, index) in dataContent.countRange" :key="index">
-          <view class="card_view">
-            <text class="card_packing_code">{{ getCountScopeName(range.type) }}</text>
-            <text class="card_content">{{ range.value }}</text>
-          </view>
-        </view>
+        <uni-collapse ref="collapse">
+          <uni-collapse-item :open="true">
+            <template v-slot:title>
+              <view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx"> 盘点范围 </view>
+            </template>
+            <view v-for="(range, index) in jobContent.countRange" :key="index">
+              <view class="card_view">
+                <text class="card_packing_code">{{ getCountScopeName(range.type) }}</text>
+                <text class="card_content">{{ range.value }}</text>
+              </view>
+            </view>
+          </uni-collapse-item>
+        </uni-collapse>
+      </view>
+      <view class="card_view" v-if="fromLocationCode != ''">
+        <text class="card_location">盘点库位</text>
+        <text class="card_content">{{ fromLocationCode }}</text>
       </view>
     </view>
-
+    <com-blank-view @goScan="showFromLocationPopup" v-if="detailSource.length == 0"></com-blank-view>
     <view class="page-main">
-      <view class="">
-        <com-blank-view @goScan="showFromLocationPopup" v-if="detailSource.length == 0"></com-blank-view>
-      </view>
       <scroll-view scroll-y="true" class="page-main-scroll">
         <uni-swipe-action ref="swipeAction">
-          <uni-swipe-action-item @click="swipeClick($event, item)" :right-options="editRemoveOption">
-            <!-- 	{{editRemoveOption}} -->
-            <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+          <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+            <uni-swipe-action-item @click="swipeClick($event, item, index)" :right-options="editRemoveOption">
               <view class="">
                 <package-and-item-card :dataContent="item"></package-and-item-card>
               </view>
               <view class="split_line"></view>
-            </view>
-          </uni-swipe-action-item>
+            </uni-swipe-action-item>
+          </view>
         </uni-swipe-action>
       </scroll-view>
     </view>
 
-    <view class="page-footer">
+    <view class="page-footer" v-if="detailSource.length > 0">
       <view class="uni-flex u-col-center space-between padding_10" style="background-color: ghostwhite; width: 100%">
         <view class=""> </view>
         <view class="uni-flex uni-row">
@@ -46,23 +49,23 @@
 
     <win-scan-button v-if="fromLocationCode != ''" @goScan="openScanPopup"></win-scan-button>
     <win-scan-pack ref="scanPopup" @getResult="getScanResult"></win-scan-pack>
-
     <win-scan-location ref="scanLocationCode" title="盘点库位" @getLocation="getLocation"></win-scan-location>
-
     <count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount == 'TRUE'"> </count-qty-edit>
     <comMessage ref="comMessage"></comMessage>
   </view>
 </template>
 
 <script>
-import { getCountJobDetail, takeCountJob, cancleTakeCountJob, countJobSubmit } from '@/api/request2.js'
-
-import { getCountScopeType } from '@/common/directory.js'
+import { Decimal } from 'decimal.js' // 引入
+import { getFuuzyCountJobDetail, takeCountJob, cancleTakeCountJob, countJobSubmit } from '@/api/request2.js'
+import { calc } from '@/common/calc.js'
 
 import { getEditRemoveOption } from '@/common/array.js'
 
 import { goHome, navigateBack, getPackingNumberAndBatch } from '@/common/basic.js'
 
+import { getCountScopeType } from '@/common/directory.js'
+
 import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 import winScanPack from '@/mycomponents/scan/winScanPack.vue'
 import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
@@ -74,7 +77,7 @@ import comBlankView from '@/mycomponents/common/comBlankView.vue'
 import PackageAndItemCard from '@/mycomponents/package/PackageAndItemCard.vue'
 
 export default {
-  name: 'receipt_detail',
+  name: 'fuzzycountdetail',
   components: {
     winScanButton,
     winScanPack,
@@ -101,7 +104,8 @@ export default {
       jobStatus: '',
       fromLocation: {},
       fromLocationCode: '',
-      editRemoveOption: []
+      editRemoveOption: [],
+      itemRangeValue: ''
     }
   },
   onLoad(option) {
@@ -110,13 +114,16 @@ export default {
       // 新建的任务自动接收
       if (option.status == '1') {
         this.receive((callback) => {
-          this.getDetail()
+          this.getDetail((r) => {
+            this.showFromLocationPopup()
+          })
         })
       } else {
-        this.getDetail()
+        this.getDetail((r) => {
+          this.showFromLocationPopup()
+        })
       }
     }
-    this.showFromLocationPopup()
     this.editRemoveOption = getEditRemoveOption()
   },
   // 返回首页
@@ -164,25 +171,32 @@ export default {
       }
     },
 
-    getDetail() {
+    getDetail(callback) {
       const that = this
       uni.showLoading({
         title: '加载中....',
         mask: true
       })
-      getCountJobDetail(that.id)
+      getFuuzyCountJobDetail(that.id)
         .then((res) => {
           uni.hideLoading()
           that.jobContent = res.data
           that.jobStatus = res.data.status
+          const range = that.jobContent.countRange.find((r) => r.type == 'ITEMS_CODE')
+          if (range != undefined) {
+            that.itemRangeValue = range.value
+          }
+          callback()
         })
         .catch((error) => {
           uni.hideLoading()
-          this.showErrorMessage(error)
+          that.showErrorMessage(error)
         })
     },
 
     showFromLocationPopup() {
+      const as = ''
+      // this.$refs.scanLocationCode.openScanPopup();
       this.$nextTick(() => {
         this.$refs.scanLocationCode.openScanPopup()
       })
@@ -191,33 +205,43 @@ export default {
     getLocation(location, code) {
       const { countRange } = this.jobContent
 
-      let range = countRange.find((r) => r.type == 'LOCATION_CODE')
-      if (range != undefined) {
-        if (!rang.value.includes(location.code)) {
-          this.showErrorMessage(`库位代码【${location.code}】,不在盘点库位范围【${rangeValue}】内`)
-          return
-        }
-      } else {
-        range = countRange.find((r) => r.type == 'LOCATIONGROUP_CODE')
+      if (countRange != null) {
+        let range = countRange.find((r) => r.type == 'LOCATION_CODE')
         if (range != undefined) {
-          if (!rang.value.includes(location.locationGroupCode)) {
-            this.showErrorMessage(`库位组代码【${location.locationGroupCode}】,不在盘点库位组范围【${rangeValue}】内`)
+          const rangeValue = range.value
+          const index = rangeValue.indexOf(location.code)
+          if (index < 0) {
+            this.afterScanLocation(`库位代码【${location.code}】,不在盘点库位范围【${rangeValue}】内`)
             return
           }
         } else {
-          range = countRange.find((r) => r.type == 'AREA_CODE')
+          range = countRange.find((r) => r.type == 'LOCATIONGROUP_CODE')
           if (range != undefined) {
-            if (!rang.value.includes(location.areaCode)) {
-              this.showErrorMessage(`库区代码【${location.areaCode}】,不在盘点库区范围【${rangeValue}】内`)
+            const rangeValue = range.value
+            const index = rangeValue.indexOf(location.locationGroupCode)
+            if (index < 0) {
+              this.afterScanLocation(`库位组代码【${location.locationGroupCode}】,不在盘点库位组范围【${rangeValue}】内`)
               return
             }
           } else {
-            range = countRange.find((r) => r.type == 'WAREHOUSE_CODE')
+            range = countRange.find((r) => r.type == 'AREABASIC_CODE')
             if (range != undefined) {
-              if (!rang.value.includes(location.warehouseCode)) {
-                this.showErrorMessage(`仓库代码【${location.warehouseCode}】,不在盘点仓库范围【${rangeValue}】内`)
+              const rangeValue = range.value
+              const index = rangeValue.indexOf(location.areaCode)
+              if (index < 0) {
+                this.afterScanLocation(`库区代码【${location.areaCode}】,不在盘点库区范围【${rangeValue}】内`)
                 return
               }
+            } else {
+              range = countRange.find((r) => r.type == 'WAREHOUSE_CODE')
+              if (range != undefined) {
+                const rangeValue = range.value
+                const index = rangeValue.indexOf(location.warehouseCode)
+                if (index < 0) {
+                  this.afterScanLocation(`仓库代码【${location.warehouseCode}】,不在盘点仓库范围【${rangeValue}】内`)
+                  return
+                }
+              }
             }
           }
         }
@@ -225,6 +249,11 @@ export default {
       this.getFromLocationCode(location, code)
     },
 
+    afterScanLocation(message) {
+      this.showErrorMessage(message)
+      this.showFromLocationPopup()
+    },
+
     getFromLocationCode(location, code) {
       this.fromLocation = location
       this.fromLocationCode = code
@@ -235,10 +264,6 @@ export default {
       this.$refs.scanPopup.openScanPopup()
     },
 
-    closeScanPopup() {
-      this.$refs.scanPopup.closeScanPopup()
-    },
-
     scanPopupGetFocus() {
       if (this.$refs.scanPopup != undefined) {
         this.$refs.scanPopup.getfocus()
@@ -251,35 +276,47 @@ export default {
       }
     },
 
-    scanPopupGetFocus() {
-      if (this.$refs.scanPopup != undefined) {
-        this.$refs.scanPopup.packGetFocus()
-      }
-    },
-
     scanPopupLoseFocus() {
       if (this.$refs.scanPopup != undefined) {
         this.$refs.scanPopup.packLoseFocus()
       }
     },
 
-    // 明盘
     getScanResult(result) {
       const that = this
-      const { package } = result
-      let detail = this.detailSource.find((r) => r.itemCode == package.itemCode && r.packingNumber == package.packingNumber && r.batch == package.batch && r.inventoryStatus == 'OK')
+      const packInfo = result.package
+      if (this.itemRangeValue != '') {
+        const index = this.itemRangeValue.indexOf(packInfo.itemCode)
+        if (index < 0) {
+          this.afterScanLocation(`物料代码【${packInfo.itemCode}】,不在盘点范围【${this.itemRangeValue}】内`)
+        } else {
+          this.onScan(packInfo)
+        }
+      } else {
+        this.onScan(packInfo)
+      }
+    },
+
+    onScan(packInfo) {
+      let detail = this.detailSource.find((r) => r.itemCode == packInfo.itemCode && r.packingNumber == packInfo.number && r.batch == packInfo.batch && r.inventoryStatus == 'OK')
       if (detail == undefined) {
-        detail = this.createDetailInfo(package)
-        this.detailSource.push(detail)
+        detail = this.createDetailInfo(packInfo)
+        this.detailSource.unshift(detail)
+        this.scanPopupGetFocus()
       } else {
-        const { index } = detail
-        list.unshift(list.splice(index, 1)[0]) // 置顶
-        // 提交
-        this.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', (res) => {
-          if (res) {
-            this.edit(detail)
-          }
-        })
+        const index = this.detailSource.findIndex((r) => r.itemCode == packInfo.itemCode && r.packingNumber == packInfo.number && r.batch == packInfo.batch && r.inventoryStatus == 'OK')
+        if (index >= 0) {
+          this.detailSource.unshift(this.detailSource.splice(index, 1)[0]) // 置顶
+          // 提交
+          this.$refs.comMessage.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', (res) => {
+            if (res) {
+              this.closeScanPopup()
+              this.edit(detail)
+            } else {
+              this.scanPopupGetFocus()
+            }
+          })
+        }
       }
     },
 
@@ -298,19 +335,30 @@ export default {
         itemDesc2: packInfo.itemDesc2,
         projectCode: '',
         qty: packInfo.qty,
-        countQty: packInfo.qty,
+        packUnit: packInfo.packUnit,
+        packQty: packInfo.packQty,
+        packUom: packInfo.packUom,
         uom: packInfo.uom,
         remark: '',
         locationCode: this.fromLocationCode,
         creator: this.$store.state.user.id,
         warehouseCode: this.fromLocation.warehouseCode,
         areaCode: this.fromLocation.areaCode,
-        locationGroupCode: this.fromLocation.locationGroupCode
+        locationGroupCode: this.fromLocation.locationGroupCode,
+        createTime: new Date().getTime(),
+        countTime: new Date().getTime(),
+        countUser: this.$store.state.user.id,
+        countDescription: 'a',
+        countQty: packInfo.qty
       }
       return detail
     },
 
-    swipeClick(e, item) {
+    editClose() {
+      this.$refs.countQtyEdit.closeEditPopup()
+    },
+
+    swipeClick(e, item, index) {
       if (e.content.text == '编辑') {
         this.edit(item)
       } else if (e.content.text == '移除') {
@@ -322,18 +370,16 @@ export default {
     edit(item) {
       const that = this
       this.currentEditItem = item
-      this.$refs.countQtyEdit.openEditPopup(item)
+      item.handleQty = item.qty
+      this.$refs.countQtyEdit.openEditPopup(item, null)
     },
 
     editConfirm(qty, inventoryStatus, mode) {
       const that = this
-      // 编辑
-      if (mode == 'edit') {
-        this.currentEditItem.countQty = qty
-        this.currentEditItem.qty = qty
-        this.currentEditItem.inventoryStatus = inventoryStatus
-      }
-      this.scanPopupGetFocus()
+      this.currentEditItem.countQty = qty
+      this.currentEditItem.qty = qty
+      this.currentEditItem.inventoryStatus = inventoryStatus
+      this.openScanPopup()
     },
 
     editClose() {
@@ -343,16 +389,29 @@ export default {
     remove(item, index) {
       this.showQuestionMessage('是否要移除扫描信息?', (res) => {
         if (res) {
-          this.dataContent.subList.splice(index, 1)
+          this.detailSource.splice(index, 1)
         }
       })
     },
 
+    detail(item) {
+      this.showItem = item
+      this.$refs.detailInfoPopup.openPopup(item)
+    },
+
     commit() {
-      // if(this.detailSource.length==0)
-      // {
+      if (this.detailSource.length == 0) {
+        this.$refs.comMessage.showMessage('还未扫描,是否要继续提交', (res) => {
+          if (res) {
+            this.commitJob()
+          }
+        })
+      } else {
+        this.commitJob()
+      }
+    },
 
-      // }
+    commitJob() {
       uni.showLoading({
         title: '提交中....',
         mask: true
@@ -375,7 +434,6 @@ export default {
     },
 
     setParams() {
-      const subList = []
       const creator = this.$store.state.user.id
       this.jobContent.subList = this.detailSource
       // this.jobContent.creator = creator;
@@ -389,7 +447,6 @@ export default {
         }
       })
     },
-
     showErrorMessage(message) {
       this.$refs.comMessage.showErrorMessage(message, (res) => {
         if (res) {
@@ -402,12 +459,6 @@ export default {
       this.$refs.comMessage.showScanMessage(message)
     },
 
-    showQuestionMessage(message, callback) {
-      this.$refs.comMessage.showQuestionMessage(message, (res) => {
-        callback(res)
-      })
-    },
-
     afterCloseMessage() {
       this.scanPopupGetFocus()
     },
@@ -416,21 +467,30 @@ export default {
       this.scanPopupGetFocus()
     },
 
-    editItem(item) {
-      this.currentEditItem = item
-      const detail = this.detailSource.find((r) => r.itemCode == item.itemCode)
-      this.$refs.countQtyEdit.openEditPopup(item, detail.subList)
-    },
-
     showCommitSuccessMessage(hint) {
       this.$refs.comMessage.showSuccessMessage(hint, (res) => {
-        navigateBack(1)
+        this.fromLocationCode = ''
+        this.fromLocation = {}
+        this.detailSource = []
+        this.showFromLocationPopup()
       })
     },
+    getCountStageName(value) {
+      return getCountStageName(value)
+    },
+    isOpenCount(value) {
+      return value == 'TRUE' ? '明盘' : '盲盘'
+    },
 
     getCountScopeName(value) {
       const item = getCountScopeType(value)
       return item.label
+    },
+
+    showQuestionMessage(message, callback) {
+      this.$refs.comMessage.showQuestionMessage(message, (res) => {
+        callback(res)
+      })
     }
   }
 }
@@ -443,30 +503,31 @@ page {
   background-color: #fff;
 }
 
-.page-wraper {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-}
-
-.page-main {
-  flex: 1;
-  position: relative;
-}
-
-.page-main-scroll {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-}
-
-.page-main-list {
-  /*  height: 80rpx;
-	    line-height: 80rpx; */
-  text-align: center;
-  background: #e0e0e0;
-}
+// .page-wraper {
+// 	display: flex;
+// 	flex-direction: column;
+// 	width: 100%;
+// 	height: 100%;
+// }
+
+// .page-main {
+// 	flex: 1;
+// 	position: relative;
+// }
+
+// .page-main-scroll {
+// 	position: absolute;
+// 	left: 0;
+// 	right: 0;
+// 	top: 0;
+// 	bottom: 0;
+// }
+
+// .page-main-list {
+// 	/*  height: 80rpx;
+//     line-height: 80rpx; */
+// 	text-align: center;
+// 	background: #e0e0e0;
+
+// }
 </style>
diff --git a/src/pages/count/job/fuzzyCountJob.vue b/src/pages/count/job/fuzzyCountJob.vue
index 690778a7..18c96ac6 100644
--- a/src/pages/count/job/fuzzyCountJob.vue
+++ b/src/pages/count/job/fuzzyCountJob.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import { cancleTakeCountJob, getCountJobList } from '@/api/request2.js'
+import { cancleTakeCountJob, getFuzzyCountJobList } from '@/api/request2.js'
 
 import { goHome, updateTitle } from '@/common/basic.js'
 
@@ -162,7 +162,7 @@ export default {
         by: 'DESC'
       }
 
-      getCountJobList(params)
+      getFuzzyCountJobList(params)
         .then((res) => {
           uni.hideLoading()
           if (type === 'refresh') {
@@ -335,7 +335,7 @@ export default {
         sort: 'number',
         by: 'DESC'
       }
-      getCountJobList(params)
+      getFuzzyCountJobList(params)
         .then((res) => {
           uni.hideLoading()
           if (res.data.list.length == 0) {
@@ -395,7 +395,7 @@ export default {
         sort: 'number',
         by: 'DESC'
       }
-      getCountJobList(params)
+      getFuzzyCountJobList(params)
         .then((res) => {
           uni.hideLoading()
           const resultList = res.data.list
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 192f44ff..02a290ef 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -64,6 +64,7 @@ const todayTime = ref('')
 const status = ref('1,2') // 待处理 、进行中
 const detailOptions = ref([])
 const detailGiveupOptions = ref([])
+const scanMessage = ref('')
 const filter = ref()
 const comMessageRef = ref()
 const jobInfoPopupRef = ref()
@@ -148,18 +149,18 @@ const getList = (type) => {
     })
 }
 
-const openJobDetail = (item, packingNumber = '') => {
+const openJobDetail = (item, scanMessage = '') => {
   if (props.type == 'predict') {
     uni.navigateTo({
-      url: `./productReceiptDetail?id=${item.masterId}&status=${item.status}&scaned=${packingNumber}&title=${title.value}`
+      url: `./productReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${title.value}`
     })
   } else if (props.type == 'assemble') {
     uni.navigateTo({
-      url: `./fgProductReceiptDetail?id=${item.masterId}&status=${item.status}&scaned=${packingNumber}&title=${title.value}`
+      url: `./fgProductReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${title.value}`
     })
   } else {
     uni.navigateTo({
-      url: `./scrapReceiptDetail?id=${item.masterId}&status=${item.status}&scaned=${packingNumber}&title=${title.value}`
+      url: `./scrapReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${title.value}`
     })
   }
 }
@@ -236,7 +237,11 @@ const getDataListByType = (code) => {
     action: '==',
     value: code
   })
-
+  filters.push({
+    column: 'accept_user_id',
+    action: '==',
+    value: store.id
+  })
   const params = {
     filters,
     pageNo: 1,
@@ -279,10 +284,11 @@ const openScanPopup = () => {
 }
 const selectItem = (item) => {
   scanPopup.value.closeScanPopup()
-  openJobDetail(item, item.packingNumber)
+  openJobDetail(item, scanMessage.value)
 }
 const getScanResult = (result) => {
   try {
+    scanMessage.value = ''
     const filters = [
       {
         column: 'packingNumber',