diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue
index e51218f5..3de457b8 100644
--- a/src/pages/count/job/countBlindDetail.vue
+++ b/src/pages/count/job/countBlindDetail.vue
@@ -25,8 +25,8 @@
         </view>
       </view>
     </view>
-    <u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
-    <view style="margin-top: 170rpx; margin-bottom: 50rpx">
+    <u-line color="#D8D8D8" style="margin-bottom: 10rpx"></u-line>
+    <view style="margin-top: 160rpx; margin-bottom: 50rpx">
       <u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
       <scroll-view scroll-y="true" class="" style="margin-bottom: 50px">
         <view class="detail-list" v-for="(item, index) in showList" :key="item.id">
@@ -535,7 +535,9 @@ page {
 
 .header {
   position: fixed;
+  /* #ifdef H5 */
   top: 88rpx;
+  /* #endif */
   left: 0;
   width: 100%;
   background-color: #fff;
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index 3e63ca9f..a3b7710b 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -165,17 +165,9 @@ const getList = (type) => {
     })
 }
 const openJobDetail = (item) => {
-  // 明盘
-  if (item.isOpenCount == 'TRUE') {
-    uni.navigateTo({
-      url: `./countLightDetail?id=${item.id}&status=${item.status}`
-    })
-  } else {
-    // 盲盘
-    uni.navigateTo({
-      url: `./countBlindDetail?id=${item.id}&status=${item.status}`
-    })
-  }
+  uni.navigateTo({
+    url: `./countDetail?id=${item.id}&status=${item.status}`
+  })
 }
 const selectedItem = (item) => {
   openJobDetail(item)
diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index 1dd5dbe4..bc2ca030 100644
--- a/src/pages/count/job/countLightDetail.vue
+++ b/src/pages/count/job/countLightDetail.vue
@@ -8,7 +8,7 @@
         <view class="cell_box uni-flex uni-row" style="font-weight: bold">
           <view class="cell_info" style="color: #000">
             <view class="text_lightblue" style="color: #000">阶段</view>
-            <view style="color: #000">{{ getCountStageName(jobContent.stage) }}</view>
+            <view style="color: #000">{{ getCountStageNameValue(jobContent.stage) }}</view>
           </view>
           <view class="cell_info">
             <view class="text_lightblue" style="color: #000">策略</view>
@@ -29,8 +29,8 @@
         </view>
       </view>
     </view>
-    <u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
-    <view style="margin-top: 170rpx; padding-bottom: 130rpx">
+    <u-line color="#D8D8D8" style="margin-bottom: 10rpx"></u-line>
+    <view style="margin-top: 160rpx; padding-bottom: 130rpx">
       <u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
       <scroll-view scroll-y="true" class="" style="margin-bottom: 0px">
         <view class="detail-list" v-for="(item, index) in showList" :key="item.id">
@@ -59,471 +59,453 @@
 
     <win-scan-button @goScan="openScanPopup"></win-scan-button>
     <win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" @getCountScanResult="getScanResult"> </win-scan-pack-and-location>
-    <count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount == 'TRUE'"> </count-qty-edit>
-    <detail-info-popup ref="detailInfoPopup"></detail-info-popup>
-    <comMessage ref="comMessage"></comMessage>
+    <count-qty-edit ref="countQtyEditRef" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount == 'TRUE'"> </count-qty-edit>
+    <detail-info-popup ref="detailInfoPopupRef"></detail-info-popup>
+    <com-message ref="comMessageRef" />
   </view>
 </template>
 
-<script>
-import { Decimal } from 'decimal.js' // 引入
+<script setup lang="ts">
+import { ref, getCurrentInstance, onMounted, nextTick, watch } from 'vue'
+import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh, onLoad, onBackPress } from '@dcloudio/uni-app'
 import { getCountJobDetail, takeCountJob, cancleTakeCountJob, countJobSubmit } from '@/api/request2.js'
-import { calc } from '@/common/calc.js'
 
-import { goHome, navigateBack, getPackingNumberAndBatch, compare } from '@/common/basic.js'
-import { getCountStageName } from '@/common/directory.js'
+import { goHome, navigateBack, compare } from '@/common/basic.js'
 
-import { getDetailOption, getDetailEditRemoveOption, getClearOption } from '@/common/array.js'
+import { getDetailOption, getDetailEditRemoveOption } from '@/common/array.js'
+import { getCountStageName } from '@/common/directory.js'
 
 import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-import winScanPack from '@/mycomponents/scan/winScanPack.vue'
 import comCountDetailcards from '@/pages/count/coms/comCountDetailcards.vue'
 import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue'
 import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
 import jobTop from '@/mycomponents/job/jobTop.vue'
 import detailInfoPopup from '@/pages/count/coms/detailInfoPopup.vue'
-
-export default {
-  name: 'receipt_detail',
-  components: {
-    winScanButton,
-    winScanPack,
-    comCountDetailcards,
-    winScanPackAndLocation,
-    countQtyEdit,
-    jobTop,
-    detailInfoPopup
-  },
-  data() {
-    return {
-      id: '',
-      receiptJob: {},
-      fromLocationCode: '',
-      isShowPackingCode: true,
-      jobContent: {}, // 任务内容
-      subList: [], // 接口返回的任务subList
-      detailSource: [], // 绑定在页面上的数据源
-      balance: {}, // 库存余额
-      editInventoryStatus: false,
-      package: {}, // 包装
-      label: {}, // 标签
-      currentEditItem: {},
-      jobStatus: '',
-      allCount: 0,
-      scanCount: 0,
-      index: 0,
-      pageSize: 20,
-      showList: [],
-      loadingType: '',
-      allDetails: [],
-      scanOptions: [],
-      detailOptions: []
-    }
-  },
-  onLoad(option) {
-    this.id = option.id
-    if (this.id != undefined) {
-      // 新建的任务自动接收
-      if (option.status == '1') {
-        this.receive((callback) => {
-          this.getDetail()
-        })
-      } else {
-        this.getDetail()
-      }
-    }
-    this.detailOptions = getDetailOption()
-    this.scanOptions = getDetailEditRemoveOption()
-  },
-  // 返回首页
-  onNavigationBarButtonTap(e) {
-    if (e.index === 0) {
-      goHome()
-    }
-  },
-  // 拦截返回按钮事件
-  onBackPress(e) {
-    // 已经接收但是没提交任务
-    if (e.from === 'backbutton') {
-      if (this.jobStatus == '2') {
-        // 取消承接任务
-        cancleTakeCountJob(this.id)
-          .then((res) => {
-            uni.navigateBack()
-          })
-          .catch((error) => {
-            uni.navigateBack()
-          })
-      } else {
-        uni.navigateBack()
-      }
-      return true
-    }
-  },
-
-  onPullDownRefresh() {
-    this.initList()
-    uni.stopPullDownRefresh()
-  },
-
-  mounted() {},
-  onReachBottom() {
-    console.log('onReachBottom')
-    // 避免多次触发
-    if (this.loadingType == 'nomore') {
-      return
-    }
-    this.index++
-    const list = this.getDataPage(this.index, this.pageSize)
-    if (list.length > 0) {
-      // this.showList=list
-      this.showList = this.showList.concat(list)
+import { useCountStore } from '@/store'
+// 获取自定义的store
+const store = useCountStore()
+
+const { proxy } = getCurrentInstance()
+
+const id = ref('')
+const fromLocationCode = ref('')
+const jobContent = ref({}) // 任务内容
+const editInventoryStatus = ref(false)
+const currentEditItem = ref({})
+const jobStatus = ref('')
+const allCount = ref(0)
+const scanCount = ref(0)
+const index = ref(0)
+const pageSize = ref(20)
+const showList = ref([])
+const loadingType = ref('')
+const allDetails = ref([])
+const scanOptions = ref([])
+const detailOptions = ref([])
+const detailInfoPopupRef = ref()
+const showItem = ref()
+const comMessageRef = ref()
+const scanPopup = ref()
+const countQtyEditRef = ref()
+
+onLoad((option) => {
+  id.value = option.id
+  if (id.value != undefined) {
+    // 新建的任务自动接收
+    if (option.status == '1') {
+      receive((callback) => {
+        getDetail()
+      })
     } else {
-      // 没有更多了
-      this.loadingType = 'nomore'
+      getDetail()
     }
-  },
-  methods: {
-    // 接收
-    receive(callback) {
-      if (this.id != null) {
-        takeCountJob(this.id)
-          .then((res) => {
-            callback()
-          })
-          .catch((error) => {
-            this.showErrorMessage(error)
-          })
-      }
-    },
-
-    getDetail() {
-      const that = this
-      uni.showLoading({
-        title: '加载中....',
-        mask: true
-      })
-      getCountJobDetail(that.id)
+  }
+  detailOptions.value = getDetailOption()
+  scanOptions.value = getDetailEditRemoveOption()
+})
+// 返回首页
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    goHome()
+  }
+})
+// 拦截返回按钮事件
+onBackPress((e) => {
+  // 已经接收但是没提交任务
+  if (e.from === 'backbutton') {
+    if (jobStatus.value == '2') {
+      // 取消承接任务
+      cancleTakeCountJob(id.value)
         .then((res) => {
-          uni.hideLoading()
-          if (res.data == null) {
-            that.showMessage('未获取到详情')
-          } else {
-            that.jobContent = res.data
-            that.jobStatus = res.data.status
-            that.fromLocationCode = that.jobContent.locationCode
-            res.data.subList.forEach((item) => {
-              item.recommendQty = item.qty
-              item.handleQty = 0
-              item.countTime = new Date()
-              item.fromLocationCode = that.fromLocationCode
-            })
-            that.allDetails = res.data.subList
-            that.allCount = res.data.subList.length
-            that.initList()
-          }
+          uni.navigateBack()
         })
         .catch((error) => {
-          uni.hideLoading()
-          this.showErrorMessage(error)
+          uni.navigateBack()
         })
-    },
-
-    initList() {
-      this.index = 1
-      this.showList = []
-      this.loadingType = ''
-      this.showList = this.getDataPage(this.index, this.pageSize)
-    },
-
-    getDataPage(pageNo, pageSize) {
-      // 计算总页数
-      const totalPages = Math.ceil(this.allCount / pageSize)
-      // 当前页起始索引
-      const start = (pageNo - 1) * pageSize
-      const end = start + pageSize // 当前页结束索引
-      return this.allDetails.slice(start, end)
-    },
-
-    swipeClick(e, item) {
-      if (e.content.text == '详情') {
-        this.detail(item)
-      } else if (e.content.text == '编辑') {
-        this.editItem(item)
-      } else if (e.content.text == '移除') {
-        this.remove(item)
-      }
-    },
-    detail(item) {
-      this.showItem = item
-      this.$refs.detailInfoPopup.openPopup(item)
-    },
-
-    remove(item, index) {
-      this.$refs.comMessage.showQuestionMessage('确定移除扫描信息?', (res) => {
-        if (res) {
-          item.scaned = false
-          item.handleQty = 0
-          this.$emit('removePack')
-        }
+    } else {
+      uni.navigateBack()
+    }
+    return true
+  }
+})
+
+onPullDownRefresh(() => {
+  initList()
+  uni.stopPullDownRefresh()
+})
+
+onReachBottom(() => {
+  console.log('onReachBottom')
+  // 避免多次触发
+  if (loadingType.value == 'nomore') {
+    return
+  }
+  index.value++
+  const list = getDataPage(index.value, pageSize.value)
+  if (list.length > 0) {
+    showList.value = showList.value.concat(list)
+  } else {
+    // 没有更多了
+    loadingType.value = 'nomore'
+  }
+})
+
+// 接收
+const receive = (callback) => {
+  if (id.value != null) {
+    takeCountJob(id.value)
+      .then((res) => {
+        callback()
       })
-    },
+      .catch((error) => {
+        showErrorMessage(error)
+      })
+  }
+}
 
-    updateData() {},
+const getDetail = () => {
+  uni.showLoading({
+    title: '加载中....',
+    mask: true
+  })
+  getCountJobDetail(id.value)
+    .then((res) => {
+      uni.hideLoading()
+      if (res.data == null) {
+        showMessage('未获取到详情')
+      } else {
+        jobContent.value = res.data
+        jobStatus.value = res.data.status
+        fromLocationCode.value = jobContent.value.locationCode
+        res.data.subList.forEach((item) => {
+          item.recommendQty = item.qty
+          item.handleQty = 0
+          item.countTime = new Date()
+          item.fromLocationCode = fromLocationCode.value
+        })
+        allDetails.value = res.data.subList
+        allCount.value = res.data.subList.length
+        initList()
+      }
+    })
+    .catch((error) => {
+      uni.hideLoading()
+      showErrorMessage(error)
+    })
+}
 
-    openScanPopup() {
-      const fromlocationList = []
-      fromlocationList.push(this.fromLocationCode)
-      this.$refs.scanPopup.openScanPopupForJob(this.fromLocationCode, fromlocationList, this.jobContent)
-    },
+const initList = () => {
+  index.value = 1
+  showList.value = []
+  loadingType.value = ''
+  showList.value = getDataPage(index.value, pageSize.value)
+}
 
-    closeScanPopup() {
-      if (this.$refs.scanPopup != undefined) {
-        this.$refs.scanPopup.closeScanPopup()
-      }
-    },
+const getDataPage = (pageNo, pageSize) => {
+  // 计算总页数
+  const totalPages = Math.ceil(allCount.value / pageSize)
+  // 当前页起始索引
+  const start = (pageNo - 1) * pageSize
+  const end = start + pageSize // 当前页结束索引
+  return allDetails.value.slice(start, end)
+}
 
-    scanPopupGetFocus() {
-      if (this.$refs.scanPopup != undefined) {
-        this.$refs.scanPopup.packGetFocus()
-      }
-    },
+const swipeClick = (e, item) => {
+  if (e.content.text == '详情') {
+    detail(item)
+  } else if (e.content.text == '编辑') {
+    editItem(item)
+  } else if (e.content.text == '移除') {
+    remove(item)
+  }
+}
+const detail = (item) => {
+  showItem.value = item
+  detailInfoPopupRef.value.openPopup(item)
+}
 
-    scanPopupLoseFocus() {
-      if (this.$refs.scanPopup != undefined) {
-        this.$refs.scanPopup.packLoseFocus()
-      }
-    },
-
-    // 明盘
-    getScanResult(result) {
-      const { itemCode } = result.label
-      const { packingNumber } = result.label
-      const pack = result.package
-      const { batch } = result.label
-      const inventoryStatus = result.balance ? result.balance.inventoryStatus : 'OK'
-      const qty = result.balance ? result.balance.qty : 0
-
-      // 按物料、箱码、批次、状态匹配
-      const items = this.allDetails.filter((r) => r.itemCode === itemCode && r.packingNumber === packingNumber && r.batch === batch && r.inventoryStatus === inventoryStatus)
-      // 不在任务列表中,是否添加库存
-      if (items.length == 0) {
-        this.$refs.comMessage.showQuestionMessage(`包装【${result.label.packingNumber}】不在任务列表中,是否要添加到列表中?`, (res) => {
-          // 创建盘点信息，标记为已经扫描
-          if (res) {
-            const detail = this.createAddDetailInfo(pack, qty)
-            detail.countTime = new Date()
-            this.allDetails.push(detail)
-            this.updateList()
-            this.$refs.countQtyEdit.openEditPopupShowSeconds(detail, null)
-          } else {
-            this.scanPopupGetFocus()
-          }
-        })
+const remove = (item, index) => {
+  comMessageRef.value.showQuestionMessage('确定移除扫描信息?', (res) => {
+    if (res) {
+      item.scaned = false
+      item.handleQty = 0
+      emit('removePack')
+    }
+  })
+}
+
+const openScanPopup = () => {
+  const fromlocationList = []
+  fromlocationList.push(fromLocationCode.value)
+  scanPopup.value.openScanPopupForJob(fromLocationCode.value, fromlocationList, jobContent.value)
+}
+
+const closeScanPopup = () => {
+  if (scanPopup.value != undefined) {
+    scanPopup.value.closeScanPopup()
+  }
+}
+
+const scanPopupGetFocus = () => {
+  if (scanPopup.value != undefined) {
+    scanPopup.value.packGetFocus()
+  }
+}
+
+const scanPopupLoseFocus = () => {
+  if (scanPopup.value != undefined) {
+    scanPopup.value.packLoseFocus()
+  }
+}
+
+// 明盘
+const getScanResult = (result) => {
+  const { itemCode } = result.label
+  const { packingNumber } = result.label
+  const pack = result.package
+  const { batch } = result.label
+  const inventoryStatus = result.balance ? result.balance.inventoryStatus : 'OK'
+  const qty = result.balance ? result.balance.qty : 0
+
+  // 按物料、箱码、批次、状态匹配
+  const items = allDetails.value.filter((r) => r.itemCode === itemCode && r.packingNumber === packingNumber && r.batch === batch && r.inventoryStatus === inventoryStatus)
+  // 不在任务列表中,是否添加库存
+  if (items.length == 0) {
+    comMessageRef.value.showQuestionMessage(`包装【${result.label.packingNumber}】不在任务列表中,是否要添加到列表中?`, (res) => {
+      // 创建盘点信息，标记为已经扫描
+      if (res) {
+        const detail = createAddDetailInfo(pack, qty)
+        detail.countTime = new Date()
+        allDetails.value.push(detail)
+        updateList()
+        countQtyEditRef.value.openEditPopupShowSeconds(detail, null)
       } else {
-        const selectItem = items[0]
-        // 已经扫描
-        if (selectItem.scaned) {
-          this.$refs.comMessage.showQuestionMessage(`包装【${result.label.packingNumber}】已经完成盘点,是否要编辑盘点结果?`, (res) => {
-            if (res) {
-              this.currentEditItem = selectItem
-              this.$refs.countQtyEdit.openEditPopup(selectItem, null)
-            } else {
-              this.scanPopupGetFocus()
-            }
-          })
-        } else {
-          // 未扫描，赋值
-          selectItem.scaned = true
-          selectItem.handleQty = Number(qty)
-          selectItem.packQty = pack.packQty
-          selectItem.packUnit = pack.packUnit
-
-          this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem, null)
-          selectItem.countTime = new Date()
-          this.updateList()
-        }
-      }
-    },
-
-    editConfirm(qty, inventoryStatus, mode) {
-      const that = this
-      // 编辑
-      if (mode == 'edit') {
-        this.currentEditItem.handleQty = qty
-        this.currentEditItem.inventoryStatus = inventoryStatus
-      }
-      // 重新排序
-      this.currentEditItem.countTime = new Date()
-      this.updateList()
-      this.scanPopupGetFocus()
-    },
-
-    updateList() {
-      this.allDetails.sort(compare('countTime')) // 按扫描信息排序
-      this.initList()
-      this.scanPopupLoseFocus()
-      this.calcAllCount()
-      this.calcScanCount()
-    },
-
-    calcAllCount() {
-      this.allCount = this.allDetails.length
-    },
-
-    calcScanCount() {
-      this.scanCount = this.allDetails.filter((r) => r.scaned === true).length
-    },
-
-    editClose() {
-      this.scanPopupGetFocus()
-    },
-
-    // 创建盘盈的明细
-    createAddDetailInfo(pack, qty) {
-      const detail = {
-        id: this.jobContent.masterId, // 新增的明细
-        scaned: true,
-        countDetailNumber: '',
-        ownerCode: '',
-        packingNumber: pack.number,
-        containerNumber: '',
-        batch: pack.batch,
-        inventoryStatus: 'OK',
-        itemCode: pack.itemCode,
-        itemName: pack.itemName,
-        itemDesc1: pack.itemDesc1,
-        itemDesc2: pack.itemDesc2,
-        packQty: pack.packQty,
-        packUnit: pack.packUnit,
-        projectCode: '',
-        recommendQty: Number(qty),
-        qty: Number(qty),
-        handleQty: Number(qty),
-        uom: pack.uom,
-        number: pack.number,
-        remark: '',
-        countQty: 0,
-        balanceQty: Number(qty),
-        fromLocationCode: this.fromLocationCode,
-        creator: this.$store.state.user.id,
-        countTime: new Date()
+        scanPopupGetFocus()
       }
-      return detail
-    },
-
-    commit() {
-      this.calcAllCount()
-      this.calcScanCount()
-
-      if (this.scanCount == this.allCount) {
-        this.submitJob()
-      } else if (this.scanCount < this.allCount) {
-        // 扫描数量小于任务数量，判断是否允许部分提交
-        if (this.jobContent.allowPartialComplete == 'TRUE') {
-          // 提交
-          this.$refs.comMessage.showQuestionMessage(`已经扫描[${this.scanCount}]总共[${this.allCount}],是否把未扫描的盘点数量设置为0?`, (res) => {
-            if (res) {
-              this.allDetails.forEach((item) => {
-                if (!item.scaned) {
-                  item.scaned = true
-                  item.handleQty = 0
-                }
-              })
-              this.submitJob()
-            }
-          })
+    })
+  } else {
+    const selectItem = items[0]
+    // 已经扫描
+    if (selectItem.scaned) {
+      comMessageRef.value.showQuestionMessage(`包装【${result.label.packingNumber}】已经完成盘点,是否要编辑盘点结果?`, (res) => {
+        if (res) {
+          currentEditItem.value = selectItem
+          countQtyEditRef.value.openEditPopup(selectItem, null)
         } else {
-          // 不允许部分提交，提示
-          this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + `已经扫描[${this.scanCount}]总共[${this.getTotalCount()}]`, (res) => {
-            if (res) {
-              this.openScanPopup()
-            }
-          })
+          scanPopupGetFocus()
         }
-      }
-    },
-
-    submitJob() {
-      uni.showLoading({
-        title: '提交中....',
-        mask: true
-      })
-      const params = this.setParams()
-      console.log('提交参数', JSON.stringify(params))
-      // countJobSubmit(params).then(res => {
-      // 	uni.hideLoading()
-      // 	if (res.data) {
-      // 		this.showCommitSuccessMessage("提交成功<br>生成盘点记录<br>" + res.data)
-      // 	} else {
-      // 		this.showErrorMessage("提交失败[" + res.msg + "]")
-      // 	}
-      // }).catch(error => {
-      // 	uni.hideLoading()
-      // 	this.showErrorMessage(error)
-      // })
-    },
-
-    setParams() {
-      const subList = []
-      const creator = this.$store.state.user.id
-
-      this.allDetails.forEach((item) => {
-        if (item.scaned) {
-          item.countQty = item.handleQty
-        }
-        subList.push(item)
       })
+    } else {
+      // 未扫描，赋值
+      selectItem.scaned = true
+      selectItem.balanceQty = Number(qty)
+      selectItem.handleQty = Number(qty)
+      selectItem.packQty = pack.packQty
+      selectItem.packUnit = pack.packUnit
+
+      countQtyEditRef.value.openEditPopupShowSeconds(selectItem, null)
+      selectItem.countTime = new Date()
+      updateList()
+    }
+  }
+}
+
+const editConfirm = (qty, inventoryStatus, mode) => {
+  // 编辑
+  if (mode == 'edit') {
+    currentEditItem.value.handleQty = qty
+    currentEditItem.value.inventoryStatus = inventoryStatus
+  }
+  // 重新排序
+  currentEditItem.value.countTime = new Date()
+  updateList()
+  scanPopupGetFocus()
+}
+
+const updateList = () => {
+  allDetails.value.sort(compare('countTime')) // 按扫描信息排序
+  initList()
+  scanPopupLoseFocus()
+  calcAllCount()
+  calcScanCount()
+}
+
+const calcAllCount = () => {
+  allCount.value = allDetails.value.length
+}
+
+const calcScanCount = () => {
+  scanCount.value = allDetails.value.filter((r) => r.scaned === true).length
+}
+
+const editClose = () => {
+  scanPopupGetFocus()
+}
 
-      this.jobContent.subList = subList
-      this.jobContent.creator = creator
-      return this.jobContent
-    },
+// 创建盘盈的明细
+const createAddDetailInfo = (pack, qty) => {
+  const detail = {
+    id: jobContent.value.masterId, // 新增的明细
+    scaned: true,
+    countDetailNumber: '',
+    ownerCode: '',
+    packingNumber: pack.number,
+    containerNumber: '',
+    batch: pack.batch,
+    inventoryStatus: 'OK',
+    itemCode: pack.itemCode,
+    itemName: pack.itemName,
+    itemDesc1: pack.itemDesc1,
+    itemDesc2: pack.itemDesc2,
+    packQty: pack.packQty,
+    packUnit: pack.packUnit,
+    projectCode: '',
+    recommendQty: Number(qty),
+    qty: Number(qty),
+    handleQty: Number(qty),
+    uom: pack.uom,
+    number: pack.number,
+    remark: '',
+    countQty: 0,
+    balanceQty: Number(qty),
+    fromLocationCode: fromLocationCode.value,
+    creator: store.id,
+    countTime: new Date()
+  }
+  return detail
+}
 
-    showMessage(message) {
-      this.$refs.comMessage.showMessage(message, (res) => {
+const commit = () => {
+  calcAllCount()
+  calcScanCount()
+
+  if (scanCount.value == allCount.value) {
+    submitJob()
+  } else if (scanCount.value < allCount.value) {
+    // 扫描数量小于任务数量，判断是否允许部分提交
+    if (jobContent.value.allowPartialComplete == 'TRUE') {
+      // 提交
+      comMessageRef.value.showQuestionMessage(`已经扫描[${scanCount.value}]总共[${allCount.value}],是否把未扫描的盘点数量设置为0?`, (res) => {
         if (res) {
-          this.afterCloseMessage()
+          allDetails.value.forEach((item) => {
+            if (!item.scaned) {
+              item.scaned = true
+              item.handleQty = 0
+            }
+          })
+          submitJob()
         }
       })
-    },
-    showErrorMessage(message) {
-      this.$refs.comMessage.showErrorMessage(message, (res) => {
+    } else {
+      // 不允许部分提交，提示
+      comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交<br>' + `已经扫描[${scanCount.value}]总共[${getTotalCount()}]`, (res) => {
         if (res) {
-          this.afterCloseMessage()
+          openScanPopup()
         }
       })
-    },
+    }
+  }
+}
 
-    showScanMessage(message) {
-      this.$refs.comMessage.showScanMessage(message)
-    },
+const submitJob = () => {
+  uni.showLoading({
+    title: '提交中....',
+    mask: true
+  })
+  const params = setParams()
+  countJobSubmit(params)
+    .then((res) => {
+      uni.hideLoading()
+      if (res.data) {
+        showCommitSuccessMessage(`提交成功<br>生成盘点记录<br>${res.data}`)
+      } else {
+        showErrorMessage(`提交失败[${res.msg}]`)
+      }
+    })
+    .catch((error) => {
+      uni.hideLoading()
+      showErrorMessage(error)
+    })
+}
 
-    afterCloseMessage() {
-      this.scanPopupGetFocus()
-    },
+const setParams = () => {
+  const subList = []
+  const creator = store.id
 
-    closeScanMessage() {
-      this.scanPopupGetFocus()
-    },
+  allDetails.value.forEach((item) => {
+    if (item.scaned) {
+      item.countQty = item.handleQty
+    }
+    subList.push(item)
+  })
 
-    editItem(item) {
-      this.currentEditItem = item
-      this.$refs.countQtyEdit.openEditPopup(this.currentEditItem, null)
-    },
+  jobContent.value.subList = subList
+  jobContent.value.creator = creator
+  return jobContent.value
+}
 
-    showCommitSuccessMessage(hint) {
-      this.$refs.comMessage.showSuccessMessage(hint, (res) => {
-        navigateBack(1)
-      })
-    },
-    getCountStageName(value) {
-      return getCountStageName(value)
-    },
-    isOpenCount(value) {
-      return value == 'TRUE' ? '明盘' : '盲盘'
+const showMessage = (message) => {
+  comMessageRef.value.showMessage(message, (res) => {
+    if (res) {
+      afterCloseMessage()
     }
-  }
+  })
+}
+const showErrorMessage = (message) => {
+  comMessageRef.value.showErrorMessage(message, (res) => {
+    if (res) {
+      afterCloseMessage()
+    }
+  })
+}
+
+const showScanMessage = (message) => {
+  comMessageRef.value.showScanMessage(message)
+}
+
+const afterCloseMessage = () => {
+  scanPopupGetFocus()
+}
+
+const closeScanMessage = () => {
+  scanPopupGetFocus()
+}
+
+const editItem = (item) => {
+  currentEditItem.value = item
+  countQtyEditRef.value.openEditPopup(this.currentEditItem, null)
+}
+
+const showCommitSuccessMessage = (hint) => {
+  comMessageRef.value.showSuccessMessage(hint, (res) => {
+    navigateBack(1)
+  })
+}
+const getCountStageNameValue = (value) => {
+  return getCountStageName(value)
+}
+const isOpenCount = (value) => {
+  return value == 'TRUE' ? '明盘' : '盲盘'
 }
 </script>
 
@@ -543,7 +525,9 @@ page {
 
 .header {
   position: fixed;
+  /* #ifdef H5 */
   top: 88rpx;
+  /* #endif */
   left: 0;
   width: 100%;
   background-color: #fff;