Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

hella_online_20240829
lijuncheng 4 months ago
parent
commit
2ca84a5ac3
  1. 30
      src/common/directory.js
  2. 14
      src/mycomponents/detail/comDetailCard.vue
  3. 53
      src/mycomponents/package/PackageAndItemCard.vue
  4. 8
      src/mycomponents/qty/recommendQty.vue
  5. 37
      src/pages.json
  6. 53
      src/pages/count/coms/comFuzzyCountJobCard.vue
  7. 495
      src/pages/count/job/fuzzyCountDetail.vue
  8. 448
      src/pages/count/job/fuzzyCountJob.vue
  9. 2
      src/pages/index/index.vue
  10. 1
      src/pages/putaway/record/putawayRecord.vue

30
src/common/directory.js

@ -1,6 +1,6 @@
let jobStatusList = [];
let itemStatusList = [];
let itemTypeList =[];
let itemTypeList = [];
let locationTypeList = [];
let uomList = [];
let inventoryStatusList = [];
@ -20,7 +20,8 @@ let sampleMethodList = [];
let transferModeList = [];
let countStageList = [];
let locationAreaTypeList = [];
let businessList=[]
let businessList = [];
let countScopeTypeList = [];
@ -41,7 +42,7 @@ export function getBusinessTypeDesc(type) {
export function clearCacheData() {
jobStatusList = [];
itemStatusList = [];
itemTypeList =[];
itemTypeList = [];
locationTypeList = [];
uomList = [];
inventoryStatusList = [];
@ -60,8 +61,9 @@ export function clearCacheData() {
sampleMethodList = [];
transferModeList = [];
countStageList = [];
locationAreaTypeList=[]
businessList=[]
locationAreaTypeList = []
businessList = []
countScopeTypeList = []
}
//获取字典信息
@ -319,6 +321,24 @@ export function getUomInfo(value) {
return resultInfo
}
//获取盘点范围类型
export function getCountScopeType(value) {
var resultInfo = "";
if (countStageList.length == 0) {
countStageList = getDirectoryInfo("count_scope_type")
}
if (countStageList.length > 0) {
for (let item of countStageList) {
if (item.value == value) {
resultInfo = item
break;
}
}
}
return resultInfo
}
//获取包装单位
export function getPackUnitInfo(value) {
var resultInfo = "";

14
src/mycomponents/detail/comDetailCard.vue

@ -107,12 +107,14 @@
},
mounted() {
if (this.detailOptions.length == 0) {
this.detailOptions = getDetailOption();
}
if (this.scanOptions.length == 0) {
this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
}
// if (this.detailOptions.length == 0) {
// this.detailOptions = getDetailOption();
// }
// if (this.scanOptions.length == 0) {
// this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
// }
this.showLocation();
},
methods: {

53
src/mycomponents/package/PackageAndItemCard.vue

@ -0,0 +1,53 @@
<template>
<view :class="dataContent.scaned?'scan_view':''" style="background-color: #fff; ">
<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>
<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>
</view>
</view>
</view>
</template>
<script>
import item from '@/mycomponents/item/item.vue'
import pack from '@/mycomponents/balance/pack.vue'
import batch from '@/mycomponents/balance/batch.vue'
import recommendQty from '@/mycomponents/qty/recommendQty.vue'
export default {
components: {
pack,
batch,
recommendQty,
item
},
data() {
return {
}
},
props: {
dataContent: {
type: Object,
default: null
},
},
watch: {
},
methods: {
}
}
</script>
<style>
</style>

8
src/mycomponents/qty/recommendQty.vue

@ -9,8 +9,8 @@
<!-- /{{Number(dataContent.packQty)}} -->
<!-- v-show="!isShowStdPack" -->
<uom :uom="dataContent.uom"></uom>
<view v-if="dataContent.packQty!=undefined" class="uni-flex uni-row ">
<view class="uom">/</view>
<view v-if="isShowPackCount && dataContent.packQty!=undefined" class="uni-flex uni-row ">
<view class="uom">/</view>
<view class="text_packQty">{{ calc(dataContent.qty,dataContent.packQty)}}
</view>
</view>
@ -73,6 +73,10 @@
objTextStyle: {
type: Object,
default: null
},
isShowPackCount: {
type: Boolean,
default: true
}
},
watch: {

37
src/pages.json

@ -1887,6 +1887,43 @@
}
},
{
"path": "pages/count/job/fuzzyCountJob",
"style": {
"navigationBarTitleText": "盲盘任务",
"enablePullDownRefresh": true,
"titleNView": {
// "autoBackButton": "true",
"buttons": [
//
{
"float": "right",
"fontSize": "58rpx", //
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "52rpx", //
"text": "\ue6e2",
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
}
},
{
"path": "pages/count/job/fuzzyCountDetail",
"style": {
"navigationBarTitleText": "盲盘明细",
"enablePullDownRefresh": false
}
},
{
"path": "pages/count/record/countRecord",
"style": {

53
src/pages/count/coms/comFuzzyCountJobCard.vue

@ -0,0 +1,53 @@
<template>
<job-com-main-card :dataContent="dataContent">
<view class="card_view">
<text class="card_packing_code ">盘点计划</text>
<text class="card_content ">{{dataContent.planNumber}}</text>
</view>
<view v-if="dataContent.countRange!=undefined" class="">
<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>
</view>
</job-com-main-card>
</template>
<script>
import {
getCountScopeType
} from '@/common/directory.js';
import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
import toLocation from '@/mycomponents/balance/toLocation.vue'
export default {
components: {
jobComMainCard,
jobComMainDetailCard,
toLocation
},
data() {
return {};
},
props: {
dataContent: {
type: Object,
default: {}
},
},
methods: {
getCountScopeName(value) {
let item = getCountScopeType(value);
return item.label;
},
}
}
</script>
<style lang="scss">
</style>

495
src/pages/count/job/fuzzyCountDetail.vue

@ -0,0 +1,495 @@
<template>
<view class="page-wraper">
<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>
</view>
</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="">
<package-and-item-card :dataContent="item"></package-and-item-card>
</view>
<view class='split_line'></view>
</view>
</uni-swipe-action-item>
</uni-swipe-action>
</scroll-view>
</view>
<view class="page-footer">
<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">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
</view>
</view>
</view>
<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 {
getEditRemoveOption
} from '@/common/array.js';
import {
goHome,
navigateBack,
getPackingNumberAndBatch
} from '@/common/basic.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
// import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue'
import PackageAndItemCard from '@/mycomponents/package/PackageAndItemCard.vue'
export default {
name: 'receipt_detail',
components: {
winScanButton,
winScanPack,
comCountDetailCard,
// winScanPackAndLocation,
winScanLocation,
countQtyEdit,
jobTop,
comBlankView,
PackageAndItemCard
},
data() {
return {
id: '',
scanCount: 0,
jobContent: {}, //
subList: [], //subList
detailSource: [], //
balance: {}, //
editInventoryStatus: false,
package: {}, //
label: {}, //
currentEditItem: {},
jobStatus: "",
fromLocation: {},
fromLocationCode: '',
editRemoveOption: []
};
},
onLoad(option) {
this.id = option.id;
if (this.id != undefined) {
//
if (option.status == "1") {
this.receive((callback => {
this.getDetail();
}));
} else {
this.getDetail();
}
}
this.showFromLocationPopup();
this.editRemoveOption = getEditRemoveOption();
},
//
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() {
// uni.stopPullDownRefresh();
},
mounted() {
},
methods: {
//
receive(callback) {
if (this.id != null) {
takeCountJob(this.id).then(res => {
callback();
}).catch(error => {
this.showErrorMessage(error)
})
}
},
getDetail() {
var that = this;
uni.showLoading({
title: "加载中....",
mask: true
});
getCountJobDetail(that.id).then(res => {
uni.hideLoading();
that.jobContent = res.data;
that.jobStatus = res.data.status;
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
},
showFromLocationPopup() {
this.$nextTick(() => {
this.$refs.scanLocationCode.openScanPopup();
})
},
getLocation(location, code) {
let countRange = this.jobContent.countRange;
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 (range != undefined) {
if (!rang.value.includes(location.locationGroupCode)) {
this.showErrorMessage("库位组代码【" + location.locationGroupCode + "】,不在盘点库位组范围【" + rangeValue +
"】内")
return;
}
} else {
range = countRange.find(r => r.type == "AREA_CODE");
if (range != undefined) {
if (!rang.value.includes(location.areaCode)) {
this.showErrorMessage("库区代码【" + location.areaCode + "】,不在盘点库区范围【" + rangeValue + "】内")
return;
}
} else {
range = countRange.find(r => r.type == "WAREHOUSE_CODE");
if (range != undefined) {
if (!rang.value.includes(location.warehouseCode)) {
this.showErrorMessage("仓库代码【" + location.warehouseCode + "】,不在盘点仓库范围【" + rangeValue +
"】内")
return;
}
}
}
}
}
this.getFromLocationCode(location, code)
},
getFromLocationCode(location, code) {
this.fromLocation = location;
this.fromLocationCode = code;
this.openScanPopup();
},
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
closeScanPopup() {
this.$refs.scanPopup.closeScanPopup();
},
scanPopupGetFocus() {
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
},
closeScanPopup() {
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
},
scanPopupGetFocus() {
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.packGetFocus();
}
},
scanPopupLoseFocus() {
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.packLoseFocus();
}
},
//
getScanResult(result) {
let that = this;
let package = result.package;
let detail = this.detailSource.find(r => r.itemCode == package.itemCode && r.packingNumber == package
.packingNumber && r.batch == package.batch && r.inventoryStatus == "OK");
if (detail == undefined) {
detail = this.createDetailInfo(package);
this.detailSource.push(detail)
} else {
let index = detail.index;
list.unshift(list.splice(index, 1)[0]); //
//
this.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', res => {
if (res) {
this.edit(detail);
}
});
}
},
//
createDetailInfo(packInfo) {
var detail = {
scaned: true,
// countDetailNumber: "",
number: this.jobContent.number,
packingNumber: packInfo.number,
batch: packInfo.batch,
inventoryStatus: "OK",
itemCode: packInfo.itemCode,
itemName: packInfo.itemName,
itemDesc1: packInfo.itemDesc1,
itemDesc2: packInfo.itemDesc2,
projectCode: "",
qty: packInfo.qty,
countQty: packInfo.qty,
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
}
return detail;
},
swipeClick(e, item) {
if (e.content.text == "编辑") {
this.edit(item)
} else if (e.content.text == "移除") {
this.remove(item)
}
},
//
edit(item) {
let that = this;
this.currentEditItem = item;
this.$refs.countQtyEdit.openEditPopup(item);
},
editConfirm(qty, inventoryStatus, mode) {
let that = this;
//
if (mode == 'edit') {
this.currentEditItem.countQty = qty;
this.currentEditItem.qty = qty;
this.currentEditItem.inventoryStatus = inventoryStatus;
}
this.scanPopupGetFocus();
},
editClose() {
this.scanPopupGetFocus();
},
remove(item, index) {
this.showQuestionMessage("是否要移除扫描信息?", res => {
if (res) {
this.dataContent.subList.splice(index, 1)
}
});
},
commit() {
// if(this.detailSource.length==0)
// {
// }
uni.showLoading({
title: "提交中....",
mask: true
});
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
countJobSubmit(params).then(res => {
uni.hideLoading()
if (res.data == null) {
this.showCommitSuccessMessage("提交成功")
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
},
setParams() {
var subList = []
var creator = this.$store.state.user.id
this.jobContent.subList = this.detailSource
// this.jobContent.creator = creator;
return this.jobContent;
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {
this.afterCloseMessage()
}
});
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
this.afterCloseMessage()
}
});
},
showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message);
},
showQuestionMessage(message, callback) {
this.$refs.comMessage.showQuestionMessage(message, res => {
callback(res);
});
},
afterCloseMessage() {
this.scanPopupGetFocus();
},
closeScanMessage() {
this.scanPopupGetFocus();
},
editItem(item) {
this.currentEditItem = item;
var 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);
})
},
getCountScopeName(value) {
let item = getCountScopeType(value);
return item.label;
},
}
}
</script>
<style scoped lang="scss">
page {
width: 100%;
height: 100%;
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;
}
</style>

448
src/pages/count/job/fuzzyCountJob.vue

@ -0,0 +1,448 @@
<template>
<view class="">
<com-empty-view v-if="jobList.length==0"></com-empty-view>
<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
:checkedWaitTask="checkedWaitTask">
</job-filter>
<view v-if="jobList.length>0">
<uni-swipe-action ref="swipeAction">
<view v-for="(item, index) in jobList" :key="index">
<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
@click="swipeClick($event,item)">
<com-fuzzy-count-job-card :dataContent="item"
@click='openJobDetail(item)'></com-fuzzy-count-job-card>
</uni-swipe-action-item>
</view>
</uni-swipe-action>
<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
<job-info-popup ref='jobInfoPopup'></job-info-popup>
<uni-load-more :status="loadingType" />
</view>
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
<winScanPackJob title="库位" ref="scanPopup" @getResult='getScanResult'>
</winScanPackJob>
<jobList ref="jobList" @selectItem="selectItem"></jobList>
<comMessage ref="comMessage"></comMessage>
</view>
</template>
<script>
import {
cancleTakeCountJob,
getCountJobList
} from '@/api/request2.js';
import {
goHome,
updateTitle
} from '@/common/basic.js';
import {
getDetailOption,
getDetailGiveupOption
} from '@/common/array.js';
import {
getCountScopeType,
} from '@/common/directory.js';
import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
import jobFilter from '@/mycomponents/job/jobFilter.vue'
import comFuzzyCountJobCard from '@/pages/count/coms/comFuzzyCountJobCard.vue'
import jobListPopup from '@/pages/count/coms/jobListPopup.vue'
import jobInfoPopup from '@/pages/count/coms/jobInfoPopup.vue'
import jobList from '@/mycomponents/jobList/jobList.vue'
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
export default {
name: 'receipt',
components: {
comEmptyView,
jobFilter,
comFuzzyCountJobCard,
jobListPopup,
jobInfoPopup,
winScanPackJob,
jobList,
winScanButton
},
data() {
return {
jobList: [],
pageNo: 1,
pageSize: 10,
totalCount: 0,
loadingType: "nomore",
checkedToday: false,
checkedWaitTask: false,
todayTime: "",
status: '1,2', //
detailOptions: [],
detailGiveupOptions: [],
title: '',
countScopeTypeDic: []
};
},
onLoad(option) {
this.title = option.title
},
onShow() {
this.getList('refresh');
},
onReady() {
this.detailOptions = getDetailOption();
this.detailGiveupOptions = getDetailGiveupOption();
this.countScopeTypeDic = getCountScopeType();
},
onReachBottom() {
//
if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return;
}
this.getList("more");
},
onPullDownRefresh() {
this.getList('refresh');
},
//退
onBackPress(options) {
if (options.from === 'navigateBack') {
uni.navigateBack({
delta: 1
})
return false;
}
},
//
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
} else if (e.index == 1) {
this.$refs.filter.openFilter();
}
},
methods: {
getList(type) {
let that = this;
uni.showLoading({
title: "加载中­....",
mask: true
});
this.loadingType = "loading";
if (type === "refresh") {
this.pageNo = 1;
this.jobList = [];
}
var filters = []
if (this.checkedToday) {
filters.push({
column: "create_time",
action: "betweeen",
value: this.todayTime
})
}
filters.push({
column: "status",
action: "in",
value: this.status
})
filters.push({
column: "isOpenCount",
action: "==",
value: "FALSE"
})
// filters.push({
// column: "accept_user_id",
// action: "==",
// value: this.$store.state.user.id
// })
var params = {
filters: filters,
pageNo: this.pageNo,
pageSize: this.pageSize,
sort: "number",
by: "DESC"
}
getCountJobList(params).then(res => {
uni.hideLoading();
if (type === "refresh") {
uni.stopPullDownRefresh();
}
var list = res.data.list;
this.totalCount = res.data.total
updateTitle(this.title + "(" + this.totalCount + ")");
this.loadingType = "loadmore";
if (list == null || list.length == 0) {
this.loadingType = "nomore";
return;
}
this.jobList = type === "refresh" ? list : this.jobList.concat(list);
// this.jobList[0].countRange = [{
// type: "LOCATION_CODE",
// value: "902,903"
// }, {
// type: "ITEMS_CODE",
// value: "123"
// }]
// this.jobList[1].countRange = [{
// type: "AREABASIC_CODE",
// value: "101"
// }, {
// type: "ITEMS_CODE",
// value: "123"
// }];
this.pageNo++;
}).catch(error => {
if (type === "refresh") {
uni.stopPullDownRefresh();
}
updateTitle(this.title);
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
})
},
getCountRange(value) {
if (value == undefined || value == null)
return "";
var rangeList = [];
value.forEach(r => {
let item = rangeList.find(l => l.type == r.type);
if (item != undefined) {
item.value = item.value + "," + r.value
} else {
let data = {
typeCode: r.type,
typeName: getDescFromDic(r.type),
value: r.value
};
rangeList.push(r)
}
})
return rangeList;
},
openJobDetail(item) {
uni.navigateTo({
url: './fuzzyCountDetail?id=' + item.id + '&status=' + item.status + '&title=' + this.title
});
},
showItemList(itemList) {
this.$refs.jobListPopup.openPopup(itemList);
},
selectedItem(item) {
this.openJobDetail(item);
},
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
selectItem(item) {
this.$refs.scanPopup.closeScanPopup();
this.openJobDetail(item)
},
swipeClick(e, dataContent) {
if (e.content.text == "详情") {
this.openjobInfoPopup(dataContent);
} else if (e.content.text == "放弃") {
this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
res => {
if (res) {
this.cancleJob(dataContent.id);
}
});
}
},
openjobInfoPopup(item) {
this.$refs.jobInfoPopup.openPopup(item)
},
cancleJob(id) {
cancleTakeCountJob(id).then(res => {
if (res.data) {
this.getList("refresh")
uni.showToast({
title: "放弃任务成功"
})
} else {
this.showMessage("放弃任务失败")
}
}).catch(error => {
this.showMessage(error)
})
},
switchChangeToday(state, creationTime) {
this.checkedToday = state;
this.todayTime = creationTime;
this.getList("refresh");
},
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
this.getList("refresh");
},
getScanNumber(code) {
this.getDataListByType(code)
},
getDataListByType(code) {
let that = this;
uni.showLoading({
title: "加载中....",
mask: true
});
var filters = []
filters.push({
column: "status",
action: "in",
value: '1,2'
})
filters.push({
column: "number",
action: "==",
value: code
})
filters.push({
column: "countSplitType",
action: "==",
value: "locationCode"
})
filters.push({
column: "accept_user_id",
action: "==",
value: this.$store.state.user.id
})
var params = {
filters: filters,
pageNo: 1,
pageSize: 100,
sort: "number",
by: "DESC"
}
getCountJobList(params).then(res => {
uni.hideLoading();
if (res.data.list.length == 0) {
that.showMessage('未查找到' + '【' + code + '】的收货任务');
} else if (res.data.list.length == 1) {
that.openJobDetail(res.data.list[0]);
}
}).catch(error => {
uni.hideLoading();
that.showMessage(error);
})
},
showMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
}
});
},
getScanResult(result) {
let that = this;
uni.showLoading({
title: "加载中....",
mask: true
});
var filters = []
filters.push({
column: "status",
action: "in",
value: '1,2'
})
filters.push({
column: "countSplitType",
action: "==",
value: "locationCode"
})
filters.push({
column: "countSplitCode",
action: "==",
value: result.label.code
})
filters.push({
column: "accept_user_id",
action: "==",
value: this.$store.state.user.id
})
var params = {
filters: filters,
pageNo: 1,
pageSize: 1000,
sort: "number",
by: "DESC"
}
getCountJobList(params).then(res => {
uni.hideLoading();
let resultList = res.data.list;
resultList.forEach(item => {
item.title = item.number;
item.selected = false
})
let list = []
resultList.forEach(item => {
if (!list.find(subItem => subItem.title == item.title)) {
list.push(item)
}
})
if (list.length == 0) {
that.showMessage('未查找到库位' + '【' + result.label.code + '】的盘点任务');
} else if (list.length == 1) {
that.selectItem(list[0]);
} else {
that.$refs.jobList.openList(list)
}
}).catch(error => {
uni.hideLoading();
that.showMessage(error);
})
}
},
}
</script>
<style scoped lang="scss">
</style>

2
src/pages/index/index.vue

@ -362,7 +362,7 @@
"inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason",
"unplanned_issue_reason", "scrap_reason", "inspect_failed_reason",
"request_status", "inspect_type", "next_action", "sample_method", "transfer_mode",
"count_stage", "inspect_result", "area_type"
"count_stage", "inspect_result", "area_type","count_scope_type"
]
}
getDictionaryItem(params).then(res => {

1
src/pages/putaway/record/putawayRecord.vue

@ -1,6 +1,5 @@
<template>
<view class="page-wraper">
<view class="">
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view>

Loading…
Cancel
Save