Browse Source

修改盘点2024/7/1 16:09:10

hella_vue3
zhang_li 3 months ago
parent
commit
1cdec1142b
  1. 6
      src/pages/count/job/countBlindDetail.vue
  2. 10
      src/pages/count/job/countJob.vue
  3. 500
      src/pages/count/job/countLightDetail.vue

6
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;

10
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}`
url: `./countDetail?id=${item.id}&status=${item.status}`
})
} else {
//
uni.navigateTo({
url: `./countBlindDetail?id=${item.id}&status=${item.status}`
})
}
}
const selectedItem = (item) => {
openJobDetail(item)

500
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,95 +59,83 @@
<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) {
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') {
this.receive((callback) => {
this.getDetail()
receive((callback) => {
getDetail()
})
} else {
this.getDetail()
getDetail()
}
}
this.detailOptions = getDetailOption()
this.scanOptions = getDetailEditRemoveOption()
},
//
onNavigationBarButtonTap(e) {
detailOptions.value = getDetailOption()
scanOptions.value = getDetailEditRemoveOption()
})
//
onNavigationBarButtonTap((e) => {
if (e.index === 0) {
goHome()
}
},
//
onBackPress(e) {
})
//
onBackPress((e) => {
//
if (e.from === 'backbutton') {
if (this.jobStatus == '2') {
if (jobStatus.value == '2') {
//
cancleTakeCountJob(this.id)
cancleTakeCountJob(id.value)
.then((res) => {
uni.navigateBack()
})
@ -159,144 +147,139 @@ export default {
}
return true
}
},
})
onPullDownRefresh() {
this.initList()
onPullDownRefresh(() => {
initList()
uni.stopPullDownRefresh()
},
})
mounted() {},
onReachBottom() {
onReachBottom(() => {
console.log('onReachBottom')
//
if (this.loadingType == 'nomore') {
if (loadingType.value == 'nomore') {
return
}
this.index++
const list = this.getDataPage(this.index, this.pageSize)
index.value++
const list = getDataPage(index.value, pageSize.value)
if (list.length > 0) {
// this.showList=list
this.showList = this.showList.concat(list)
showList.value = showList.value.concat(list)
} else {
//
this.loadingType = 'nomore'
loadingType.value = 'nomore'
}
},
methods: {
//
receive(callback) {
if (this.id != null) {
takeCountJob(this.id)
})
//
const receive = (callback) => {
if (id.value != null) {
takeCountJob(id.value)
.then((res) => {
callback()
})
.catch((error) => {
this.showErrorMessage(error)
showErrorMessage(error)
})
}
},
}
getDetail() {
const that = this
const getDetail = () => {
uni.showLoading({
title: '加载中....',
mask: true
})
getCountJobDetail(that.id)
getCountJobDetail(id.value)
.then((res) => {
uni.hideLoading()
if (res.data == null) {
that.showMessage('未获取到详情')
showMessage('未获取到详情')
} else {
that.jobContent = res.data
that.jobStatus = res.data.status
that.fromLocationCode = that.jobContent.locationCode
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 = that.fromLocationCode
item.fromLocationCode = fromLocationCode.value
})
that.allDetails = res.data.subList
that.allCount = res.data.subList.length
that.initList()
allDetails.value = res.data.subList
allCount.value = res.data.subList.length
initList()
}
})
.catch((error) => {
uni.hideLoading()
this.showErrorMessage(error)
showErrorMessage(error)
})
},
}
initList() {
this.index = 1
this.showList = []
this.loadingType = ''
this.showList = this.getDataPage(this.index, this.pageSize)
},
const initList = () => {
index.value = 1
showList.value = []
loadingType.value = ''
showList.value = getDataPage(index.value, pageSize.value)
}
getDataPage(pageNo, pageSize) {
const getDataPage = (pageNo, pageSize) => {
//
const totalPages = Math.ceil(this.allCount / pageSize)
const totalPages = Math.ceil(allCount.value / pageSize)
//
const start = (pageNo - 1) * pageSize
const end = start + pageSize //
return this.allDetails.slice(start, end)
},
return allDetails.value.slice(start, end)
}
swipeClick(e, item) {
const swipeClick = (e, item) => {
if (e.content.text == '详情') {
this.detail(item)
detail(item)
} else if (e.content.text == '编辑') {
this.editItem(item)
editItem(item)
} else if (e.content.text == '移除') {
this.remove(item)
remove(item)
}
},
detail(item) {
this.showItem = item
this.$refs.detailInfoPopup.openPopup(item)
},
remove(item, index) {
this.$refs.comMessage.showQuestionMessage('确定移除扫描信息?', (res) => {
}
const detail = (item) => {
showItem.value = item
detailInfoPopupRef.value.openPopup(item)
}
const remove = (item, index) => {
comMessageRef.value.showQuestionMessage('确定移除扫描信息?', (res) => {
if (res) {
item.scaned = false
item.handleQty = 0
this.$emit('removePack')
emit('removePack')
}
})
},
updateData() {},
}
openScanPopup() {
const openScanPopup = () => {
const fromlocationList = []
fromlocationList.push(this.fromLocationCode)
this.$refs.scanPopup.openScanPopupForJob(this.fromLocationCode, fromlocationList, this.jobContent)
},
fromlocationList.push(fromLocationCode.value)
scanPopup.value.openScanPopupForJob(fromLocationCode.value, fromlocationList, jobContent.value)
}
closeScanPopup() {
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup()
const closeScanPopup = () => {
if (scanPopup.value != undefined) {
scanPopup.value.closeScanPopup()
}
},
}
scanPopupGetFocus() {
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.packGetFocus()
const scanPopupGetFocus = () => {
if (scanPopup.value != undefined) {
scanPopup.value.packGetFocus()
}
},
}
scanPopupLoseFocus() {
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.packLoseFocus()
const scanPopupLoseFocus = () => {
if (scanPopup.value != undefined) {
scanPopup.value.packLoseFocus()
}
},
}
//
getScanResult(result) {
//
const getScanResult = (result) => {
const { itemCode } = result.label
const { packingNumber } = result.label
const pack = result.package
@ -305,84 +288,84 @@ export default {
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)
const items = allDetails.value.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) => {
comMessageRef.value.showQuestionMessage(`包装【${result.label.packingNumber}】不在任务列表中,是否要添加到列表中?`, (res) => {
//
if (res) {
const detail = this.createAddDetailInfo(pack, qty)
const detail = createAddDetailInfo(pack, qty)
detail.countTime = new Date()
this.allDetails.push(detail)
this.updateList()
this.$refs.countQtyEdit.openEditPopupShowSeconds(detail, null)
allDetails.value.push(detail)
updateList()
countQtyEditRef.value.openEditPopupShowSeconds(detail, null)
} else {
this.scanPopupGetFocus()
scanPopupGetFocus()
}
})
} else {
const selectItem = items[0]
//
if (selectItem.scaned) {
this.$refs.comMessage.showQuestionMessage(`包装【${result.label.packingNumber}】已经完成盘点,是否要编辑盘点结果?`, (res) => {
comMessageRef.value.showQuestionMessage(`包装【${result.label.packingNumber}】已经完成盘点,是否要编辑盘点结果?`, (res) => {
if (res) {
this.currentEditItem = selectItem
this.$refs.countQtyEdit.openEditPopup(selectItem, null)
currentEditItem.value = selectItem
countQtyEditRef.value.openEditPopup(selectItem, null)
} else {
this.scanPopupGetFocus()
scanPopupGetFocus()
}
})
} else {
//
selectItem.scaned = true
selectItem.balanceQty = Number(qty)
selectItem.handleQty = Number(qty)
selectItem.packQty = pack.packQty
selectItem.packUnit = pack.packUnit
this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem, null)
countQtyEditRef.value.openEditPopupShowSeconds(selectItem, null)
selectItem.countTime = new Date()
this.updateList()
updateList()
}
}
},
}
editConfirm(qty, inventoryStatus, mode) {
const that = this
const editConfirm = (qty, inventoryStatus, mode) => {
//
if (mode == 'edit') {
this.currentEditItem.handleQty = qty
this.currentEditItem.inventoryStatus = inventoryStatus
currentEditItem.value.handleQty = qty
currentEditItem.value.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) {
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()
}
//
const createAddDetailInfo = (pack, qty) => {
const detail = {
id: this.jobContent.masterId, //
id: jobContent.value.masterId, //
scaned: true,
countDetailNumber: '',
ownerCode: '',
@ -405,125 +388,124 @@ export default {
remark: '',
countQty: 0,
balanceQty: Number(qty),
fromLocationCode: this.fromLocationCode,
creator: this.$store.state.user.id,
fromLocationCode: fromLocationCode.value,
creator: store.id,
countTime: new Date()
}
return detail
},
}
commit() {
this.calcAllCount()
this.calcScanCount()
const commit = () => {
calcAllCount()
calcScanCount()
if (this.scanCount == this.allCount) {
this.submitJob()
} else if (this.scanCount < this.allCount) {
if (scanCount.value == allCount.value) {
submitJob()
} else if (scanCount.value < allCount.value) {
//
if (this.jobContent.allowPartialComplete == 'TRUE') {
if (jobContent.value.allowPartialComplete == 'TRUE') {
//
this.$refs.comMessage.showQuestionMessage(`已经扫描[${this.scanCount}]总共[${this.allCount}],是否把未扫描的盘点数量设置为0?`, (res) => {
comMessageRef.value.showQuestionMessage(`已经扫描[${scanCount.value}]总共[${allCount.value}],是否把未扫描的盘点数量设置为0?`, (res) => {
if (res) {
this.allDetails.forEach((item) => {
allDetails.value.forEach((item) => {
if (!item.scaned) {
item.scaned = true
item.handleQty = 0
}
})
this.submitJob()
submitJob()
}
})
} else {
//
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + `已经扫描[${this.scanCount}]总共[${this.getTotalCount()}]`, (res) => {
comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交<br>' + `已经扫描[${scanCount.value}]总共[${getTotalCount()}]`, (res) => {
if (res) {
this.openScanPopup()
openScanPopup()
}
})
}
}
},
}
submitJob() {
const 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 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)
})
}
const setParams = () => {
const subList = []
const creator = this.$store.state.user.id
const creator = store.id
this.allDetails.forEach((item) => {
allDetails.value.forEach((item) => {
if (item.scaned) {
item.countQty = item.handleQty
}
subList.push(item)
})
this.jobContent.subList = subList
this.jobContent.creator = creator
return this.jobContent
},
jobContent.value.subList = subList
jobContent.value.creator = creator
return jobContent.value
}
showMessage(message) {
this.$refs.comMessage.showMessage(message, (res) => {
const showMessage = (message) => {
comMessageRef.value.showMessage(message, (res) => {
if (res) {
this.afterCloseMessage()
afterCloseMessage()
}
})
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, (res) => {
}
const showErrorMessage = (message) => {
comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
this.afterCloseMessage()
afterCloseMessage()
}
})
},
}
showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message)
},
const showScanMessage = (message) => {
comMessageRef.value.showScanMessage(message)
}
afterCloseMessage() {
this.scanPopupGetFocus()
},
const afterCloseMessage = () => {
scanPopupGetFocus()
}
closeScanMessage() {
this.scanPopupGetFocus()
},
const closeScanMessage = () => {
scanPopupGetFocus()
}
editItem(item) {
this.currentEditItem = item
this.$refs.countQtyEdit.openEditPopup(this.currentEditItem, null)
},
const editItem = (item) => {
currentEditItem.value = item
countQtyEditRef.value.openEditPopup(this.currentEditItem, null)
}
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, (res) => {
const showCommitSuccessMessage = (hint) => {
comMessageRef.value.showSuccessMessage(hint, (res) => {
navigateBack(1)
})
},
getCountStageName(value) {
}
const getCountStageNameValue = (value) => {
return getCountStageName(value)
},
isOpenCount(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;

Loading…
Cancel
Save