zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改半成品退库数量和发料承接

pda_nev
李俊城 11 months ago
parent
6e91fcff03
commit
b2d174e0c5
11 changed files with 508 additions and 348 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      fe/PDA/pages/return/productionReturnFg.vue
  2. 48
      fe/PDA/pages/task/assembleIssueJobDetail.vue
  3. 64
      fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
  4. 45
      fe/PDA/pages/task/coatingIssuleJobDetail.vue
  5. 44
      fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
  6. 52
      fe/PDA/pages/task/injectionIssueJobDetail.vue
  7. 63
      fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
  8. 53
      fe/PDA/pages/task/kittingIssueJobDetail.vue
  9. 71
      fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
  10. 49
      fe/PDA/pages/task/sparePartIssueJobDetail.vue
  11. 61
      fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue

18
fe/PDA/pages/return/productionReturnFg.vue
View File

@ -33,9 +33,9 @@
</view> </view>
<view class="ljh_right"> <view class="ljh_right">
<view class="uni-flex uni-row u-col-center"> <view class="uni-flex uni-row u-col-center">
<com-number-box :ref="'comNumberBox_'+index" v-model="item.qty" <com-number-box :ref="label.itemCode+'comNumberBox_'+index"
:max="99999" :min="0" v-model="item.qty" :max="99999" :min="0"
@change="qtyChanged($event,item,index)"> @change="qtyChanged($event,label,item,index)">
</com-number-box> </com-number-box>
<text class="" style="margin-left: 8rpx;">{{item.uom}}</text> <text class="" style="margin-left: 8rpx;">{{item.uom}}</text>
</view> </view>
@ -536,23 +536,29 @@
return item; return item;
}, },
qtyChanged(value, item, index) { qtyChanged(value, label, item, index) {
var test = label + 'comNumberBox_' + index
console.log(test);
if (value <= 0) { if (value <= 0) {
this.showMessage('退数量必须大于0') this.showMessage('退数量必须大于0')
item.qty = item.totalQty item.qty = item.totalQty
this.$refs['comNumberBox_' + index][0].setValue(item.qty); value=item.qty
this.$refs[label.itemCode + 'comNumberBox_' + index][0].setValue(item.qty);
} else { } else {
if (value > item.totalQty) { if (value > item.totalQty) {
this.showMessage("退货数量[" + value + "]不能大于库存数量[" + item.totalQty + "]"); this.showMessage("退货数量[" + value + "]不能大于库存数量[" + item.totalQty + "]");
item.qty = item.totalQty item.qty = item.totalQty
this.$refs['comNumberBox_' + index][0].setValue(item.qty); value=item.qty
this.$refs[label.itemCode + 'comNumberBox_' + index][0].setValue(item.qty);
} }
} }
this.itemList.forEach(res => { this.itemList.forEach(res => {
if (res.itemCode == label.itemCode) {
res.scanQty = 0 res.scanQty = 0
res.labelList.forEach(item => { res.labelList.forEach(item => {
res.scanQty = res.scanQty + value res.scanQty = res.scanQty + value
}) })
}
}) })
this.$forceUpdate() this.$forceUpdate()
}, },

48
fe/PDA/pages/task/assembleIssueJobDetail.vue
View File

@ -153,7 +153,7 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -231,7 +231,8 @@
titleArray: ['箱标签'], titleArray: ['箱标签'],
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
handleToPackingCodeLocationCode: "" handleToPackingCodeLocationCode: "",
showBtn: true
} }
}, },
props: { props: {
@ -239,22 +240,14 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail();
}));
} else {
this.getDetail(); this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
if (this.jobStatus == 2) { if (this.datacontent.isClaims &&this.datacontent.claimsUserId==localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeAssembleIssueJob(this.id).then(res => { cancelTakeAssembleIssueJob(this.id).then(res => {}).catch(error => {})
}).catch(error => {
})
} }
goHome(); goHome();
} else if (e.index === 1) { } else if (e.index === 1) {
@ -265,7 +258,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims &&this.datacontent.claimsUserId==localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeAssembleIssueJob(this.id).then(res => { cancelTakeAssembleIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -342,6 +335,7 @@
}; };
getAssembleIssueDetail(params) getAssembleIssueDetail(params)
.then(item => { .then(item => {
uni.hideLoading();
console.log('item', item); console.log('item', item);
that.datacontent = item; that.datacontent = item;
that.jobStatus = item.jobStatus; that.jobStatus = item.jobStatus;
@ -369,15 +363,37 @@
); );
that.ispending = item.jobStatus === 2; that.ispending = item.jobStatus === 2;
this.allCount = that.details.length; this.allCount = that.details.length;
this.setReceived();
} }
uni.hideLoading();
}) })
.catch(err => { .catch(err => {
this.showMessage('未查找到详细信息')
uni.hideLoading(); uni.hideLoading();
this.showMessage('未查找到详细信息')
}); });
}, },
setReceived(){
//是否承接
//已经承接
if(this.datacontent.isClaims){
//承接并且承接人是自己显示，不是自己隐藏
if(this.datacontent.claimsUserId==localStorage.getItem('userId')) {
this.showBtn=true
}else {
this.showBtn=false
}
}else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if(callback){
this.showBtn=true
}else {
this.showBtn=false
}
}));
}
},
getScanResultTo(result) { getScanResultTo(result) {
var fromData = result.data; var fromData = result.data;

64
fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
View File

@ -3,16 +3,8 @@
<page-meta root-font-size="16px"></page-meta> <page-meta root-font-size="16px"></page-meta>
<view class=""> <view class="">
<view class="top_card"> <view class="top_card">
<com-job-scan-detail <com-job-scan-detail :jobContent="datacontent" :allCount="allCount" :isShowScanHint="true" scanHint="已发数"
:jobContent="datacontent" :scanCount="scanCount" :isShowOther="true" :isShowShouRong="true" :shouRongCount="shouRongCount">
:allCount="allCount"
:isShowScanHint="true"
scanHint="已发数"
:scanCount="scanCount"
:isShowOther="true"
:isShowShouRong="true"
:shouRongCount="shouRongCount"
>
</com-job-scan-detail> </com-job-scan-detail>
</view> </view>
<scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" <scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
@ -82,9 +74,9 @@
<uni-td width="120" align="center"> <uni-td width="120" align="center">
<view <view
style="display: flex;flex-direction: row;justify-content:center;align-items: center;"> style="display: flex;flex-direction: row;justify-content:center;align-items: center;">
<com-number-box ref="comNumberBoxRef" v-model="item.tempHandledToQty" <com-number-box ref="comNumberBoxRef"
:max="999999" :min="0" style='width: 100px;' v-model="item.tempHandledToQty" :max="999999" :min="0"
@change="qtyChanged($event,item,index)"> style='width: 100px;' @change="qtyChanged($event,item,index)">
</com-number-box> </com-number-box>
</view> </view>
</uni-td> </uni-td>
@ -126,7 +118,7 @@
</view> </view>
</view> </view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -204,7 +196,8 @@
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
singCode: "", singCode: "",
shouRongCount:null shouRongCount: null,
showBtn: true
} }
}, },
props: { props: {
@ -212,17 +205,14 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail();
}));
} else {
this.getDetail(); this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
cancelTakeAssembleIssueJob(this.id).then(res => {}).catch(error => {})
}
goHome(); goHome();
} else if (e.index === 1) { } else if (e.index === 1) {
window.location.reload(); window.location.reload();
@ -232,7 +222,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeAssembleIssueJob(this.id).then(res => { cancelTakeAssembleIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -345,15 +335,39 @@
uni.hideLoading(); uni.hideLoading();
this.showMessage(error) this.showMessage(error)
}) })
this.setReceived();
} }
}) })
.catch(err => { .catch(err => {
uni.hideLoading();
this.showMessage('未查找到详细信息') this.showMessage('未查找到详细信息')
uni.hideLoading();
}); });
}, },
setReceived() {
//是否承接
//已经承接
if (this.datacontent.isClaims) {
//承接并且承接人是自己显示，不是自己隐藏
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if (callback) {
this.showBtn = true
} else {
this.showBtn = false
}
}));
}
},
getScanResult(result) { getScanResult(result) {
let item = this.details.find(r => { let item = this.details.find(r => {
return r.itemCode == result.itemCode return r.itemCode == result.itemCode
@ -395,9 +409,7 @@
item.value = item.SHIFT_CODE item.value = item.SHIFT_CODE
}) })
this.$refs.selectPopup.openScanPopup(list) this.$refs.selectPopup.openScanPopup(list)
} } else {
else {
this.showMessage("推荐列表为0") this.showMessage("推荐列表为0")
} }
}).catch(error => { }).catch(error => {

45
fe/PDA/pages/task/coatingIssuleJobDetail.vue
View File

@ -153,7 +153,7 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -231,7 +231,8 @@
titleArray: ['箱标签'], titleArray: ['箱标签'],
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
handleToPackingCodeLocationCode: "" handleToPackingCodeLocationCode: "",
showBtn:true
} }
}, },
props: { props: {
@ -239,18 +240,12 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail();
}));
} else {
this.getDetail(); this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
if (this.jobStatus == 2) { if (this.datacontent.isClaims &&this.datacontent.claimsUserId==localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeCoatingIssueJob(this.id).then(res => { cancelTakeCoatingIssueJob(this.id).then(res => {
}).catch(error => { }).catch(error => {
@ -265,7 +260,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims &&this.datacontent.claimsUserId==localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeCoatingIssueJob(this.id).then(res => { cancelTakeCoatingIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -342,6 +337,7 @@
}; };
getCoatingIssueDetail(params) getCoatingIssueDetail(params)
.then(item => { .then(item => {
uni.hideLoading();
console.log('item', item); console.log('item', item);
that.datacontent = item; that.datacontent = item;
that.jobStatus = item.jobStatus; that.jobStatus = item.jobStatus;
@ -369,15 +365,38 @@
); );
that.ispending = item.jobStatus === 2; that.ispending = item.jobStatus === 2;
this.allCount = that.details.length; this.allCount = that.details.length;
this.setReceived();
} }
uni.hideLoading();
}) })
.catch(err => { .catch(err => {
this.showMessage('未查找到详细信息')
uni.hideLoading(); uni.hideLoading();
this.showMessage('未查找到详细信息')
}); });
}, },
setReceived(){
//是否承接
//已经承接
if(this.datacontent.isClaims){
//承接并且承接人是自己显示，不是自己隐藏
if(this.datacontent.claimsUserId==localStorage.getItem('userId')) {
this.showBtn=true
}else {
this.showBtn=false
}
}else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if(callback){
this.showBtn=true
}else {
this.showBtn=false
}
}));
}
},
getScanResultTo(result) { getScanResultTo(result) {
var fromData = result.data; var fromData = result.data;

44
fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
View File

@ -126,7 +126,7 @@
</view> </view>
</view> </view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -207,7 +207,8 @@
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
singCode: "", singCode: "",
shouRongCount:null shouRongCount:null,
showBtn:true
} }
}, },
props: { props: {
@ -215,17 +216,16 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail();
}));
} else {
this.getDetail(); this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
if(this.datacontent.isClaims &&this.datacontent.claimsUserId==localStorage.getItem('userId')){
cancelTakeCoatingIssueJob(this.id).then(res => {
}).catch(error => {
})
}
goHome(); goHome();
} else if (e.index === 1) { } else if (e.index === 1) {
window.location.reload(); window.location.reload();
@ -235,7 +235,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims &&this.datacontent.claimsUserId==localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeCoatingIssueJob(this.id).then(res => { cancelTakeCoatingIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -348,15 +348,39 @@
uni.hideLoading(); uni.hideLoading();
this.showMessage(error) this.showMessage(error)
}) })
this.setReceived();
} }
}) })
.catch(err => { .catch(err => {
uni.hideLoading();
this.showMessage('未查找到详细信息') this.showMessage('未查找到详细信息')
uni.hideLoading();
}); });
}, },
setReceived(){
//是否承接
//已经承接
if(this.datacontent.isClaims){
//承接并且承接人是自己显示，不是自己隐藏
if(this.datacontent.claimsUserId==localStorage.getItem('userId')) {
this.showBtn=true
}else {
this.showBtn=false
}
}else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if(callback){
this.showBtn=true
}else {
this.showBtn=false
}
}));
}
},
getScanResult(result) { getScanResult(result) {
let item = this.details.find(r => { let item = this.details.find(r => {
return r.itemCode == result.itemCode return r.itemCode == result.itemCode

52
fe/PDA/pages/task/injectionIssueJobDetail.vue
View File

@ -6,6 +6,10 @@
<com-job-scan-detail :jobContent="datacontent" :allCount="allCount" :isShowScanHint="false" <com-job-scan-detail :jobContent="datacontent" :allCount="allCount" :isShowScanHint="false"
allCountHint="箱数"> allCountHint="箱数">
</com-job-scan-detail> </com-job-scan-detail>
<view class="" style="background-color: #fff; padding: 20rpx; font-size: 32rpx;">
承接人 : {{datacontent.claimsUserName}}
</view>
</view> </view>
<scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" <scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
class="scroll-detail"> class="scroll-detail">
@ -153,7 +157,7 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -231,7 +235,8 @@
titleArray: ['箱标签'], titleArray: ['箱标签'],
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
handleToPackingCodeLocationCode: "" handleToPackingCodeLocationCode: "",
showBtn: true
} }
}, },
props: { props: {
@ -239,20 +244,15 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail(); this.getDetail();
}));
} else {
this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
cancelTakeInjectionIssueJob(this.id).then(res => { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
}).catch(error => { cancelTakeInjectionIssueJob(this.id).then(res => {}).catch(error => {})
}) }
goHome(); goHome();
} else if (e.index === 1) { } else if (e.index === 1) {
window.location.reload(); window.location.reload();
@ -262,7 +262,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeInjectionIssueJob(this.id).then(res => { cancelTakeInjectionIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -339,6 +339,7 @@
}; };
getInjectionIssueDetail(params) getInjectionIssueDetail(params)
.then(item => { .then(item => {
uni.hideLoading();
console.log('item', item); console.log('item', item);
that.datacontent = item; that.datacontent = item;
that.jobStatus = item.jobStatus; that.jobStatus = item.jobStatus;
@ -366,9 +367,9 @@
); );
that.ispending = item.jobStatus === 2; that.ispending = item.jobStatus === 2;
this.allCount = that.details.length; this.allCount = that.details.length;
this.setReceived();
} }
uni.hideLoading();
}) })
.catch(err => { .catch(err => {
this.showMessage('未查找到详细信息') this.showMessage('未查找到详细信息')
@ -376,6 +377,29 @@
}); });
}, },
setReceived() {
//是否承接
//已经承接
if (this.datacontent.isClaims) {
//承接并且承接人是自己显示，不是自己隐藏
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if (callback) {
this.showBtn = true
} else {
this.showBtn = false
}
}));
}
},
getScanResultTo(result) { getScanResultTo(result) {
var fromData = result.data; var fromData = result.data;
var data = this.details.filter(r => r.itemCode == result.data.itemCode) var data = this.details.filter(r => r.itemCode == result.data.itemCode)

63
fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
View File

@ -3,16 +3,8 @@
<page-meta root-font-size="16px"></page-meta> <page-meta root-font-size="16px"></page-meta>
<view class=""> <view class="">
<view class="top_card"> <view class="top_card">
<com-job-scan-detail <com-job-scan-detail :jobContent="datacontent" :allCount="allCount" :isShowScanHint="true" scanHint="已发数"
:jobContent="datacontent" :scanCount="scanCount" :isShowOther="true" :isShowShouRong="true" :shouRongCount="shouRongCount">
:allCount="allCount"
:isShowScanHint="true"
scanHint="已发数"
:scanCount="scanCount"
:isShowOther="true"
:isShowShouRong="true"
:shouRongCount="shouRongCount"
>
</com-job-scan-detail> </com-job-scan-detail>
</view> </view>
<scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" <scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
@ -82,9 +74,9 @@
<uni-td width="120" align="center"> <uni-td width="120" align="center">
<view <view
style="display: flex;flex-direction: row;justify-content:center;align-items: center;"> style="display: flex;flex-direction: row;justify-content:center;align-items: center;">
<com-number-box ref="comNumberBoxRef" v-model="item.tempHandledToQty" <com-number-box ref="comNumberBoxRef"
:max="999999" :min="0" style='width: 100px;' v-model="item.tempHandledToQty" :max="999999" :min="0"
@change="qtyChanged($event,item,index)"> style='width: 100px;' @change="qtyChanged($event,item,index)">
</com-number-box> </com-number-box>
</view> </view>
</uni-td> </uni-td>
@ -126,7 +118,7 @@
</view> </view>
</view> </view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -201,7 +193,8 @@
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
singCode: "", singCode: "",
shouRongCount:null shouRongCount: null,
showBtn: true
} }
}, },
props: { props: {
@ -209,17 +202,14 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail();
}));
} else {
this.getDetail(); this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
cancelTakeKittingIssueJob(this.id).then(res => {}).catch(error => {})
}
goHome(); goHome();
} else if (e.index === 1) { } else if (e.index === 1) {
window.location.reload(); window.location.reload();
@ -229,7 +219,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeKittingIssueJob(this.id).then(res => { cancelTakeKittingIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -343,15 +333,36 @@
uni.hideLoading(); uni.hideLoading();
this.showMessage(error) this.showMessage(error)
}) })
this.setReceived()
} }
}) })
.catch(err => { .catch(err => {
uni.hideLoading();
this.showMessage('未查找到详细信息') this.showMessage('未查找到详细信息')
uni.hideLoading();
}); });
}, },
setReceived() {
//是否承接
//已经承接
if (this.datacontent.isClaims) {
//承接并且承接人是自己显示，不是自己隐藏
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if (callback) {
this.showBtn = true
} else {
this.showBtn = false
}
}));
}
},
getScanResult(result) { getScanResult(result) {
let item = this.details.find(r => { let item = this.details.find(r => {
return r.itemCode == result.itemCode return r.itemCode == result.itemCode
@ -393,9 +404,7 @@
item.value = item.SHIFT_CODE item.value = item.SHIFT_CODE
}) })
this.$refs.selectPopup.openScanPopup(list) this.$refs.selectPopup.openScanPopup(list)
} } else {
else {
this.showMessage("推荐列表为0") this.showMessage("推荐列表为0")
} }
}).catch(error => { }).catch(error => {

53
fe/PDA/pages/task/kittingIssueJobDetail.vue
View File

@ -153,7 +153,7 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -231,7 +231,8 @@
titleArray: ['箱标签'], titleArray: ['箱标签'],
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
handleToPackingCodeLocationCode: "" handleToPackingCodeLocationCode: "",
showBtn: true
} }
}, },
props: { props: {
@ -239,22 +240,13 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail();
}));
} else {
this.getDetail(); this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 cancelTakeKittingIssueJob(this.id).then(res => {}).catch(error => {})
cancelTakeKittingIssueJob(this.id).then(res => {
}).catch(error => {
})
} }
goHome(); goHome();
} else if (e.index === 1) { } else if (e.index === 1) {
@ -265,7 +257,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeKittingIssueJob(this.id).then(res => { cancelTakeKittingIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -342,6 +334,7 @@
}; };
getKittingIssueDetail(params) getKittingIssueDetail(params)
.then(item => { .then(item => {
uni.hideLoading();
console.log('item', item); console.log('item', item);
that.datacontent = item; that.datacontent = item;
that.jobStatus = item.jobStatus; that.jobStatus = item.jobStatus;
@ -369,15 +362,37 @@
); );
that.ispending = item.jobStatus === 2; that.ispending = item.jobStatus === 2;
this.allCount = that.details.length; this.allCount = that.details.length;
this.setReceived();
} }
uni.hideLoading();
}) })
.catch(err => { .catch(err => {
this.showMessage('未查找到详细信息') this.showMessage('未查找到详细信息')
uni.hideLoading(); uni.hideLoading();
}); });
}, },
setReceived() {
//是否承接
//已经承接
if (this.datacontent.isClaims) {
//承接并且承接人是自己显示，不是自己隐藏
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if (callback) {
this.showBtn = true
} else {
this.showBtn = false
}
}));
}
},
getScanResultTo(result) { getScanResultTo(result) {
var fromData = result.data; var fromData = result.data;
@ -435,7 +450,8 @@
item.handledFromQty = balancesItem.qty item.handledFromQty = balancesItem.qty
item.handleToPackingCodeLocationCode = balancesItem.locationCode item.handleToPackingCodeLocationCode = balancesItem.locationCode
} else { } else {
showConfirmMsg("箱码[" + fromData.code + "]的批次[" + balancesItem.lot + "]与推荐目标批次[" + item showConfirmMsg("箱码[" + fromData.code + "]的批次[" + balancesItem.lot +
"]与推荐目标批次[" + item
.recommendToLot + "]不一致,是否继续发料", res => { .recommendToLot + "]不一致,是否继续发料", res => {
if (res) { if (res) {
item.handledToContainerCode = balancesItem.containerCode item.handledToContainerCode = balancesItem.containerCode
@ -458,7 +474,8 @@
item.handledFromLot = balancesItem.lot item.handledFromLot = balancesItem.lot
item.handledFromWarehouseCode = balancesItem.warehouseCode item.handledFromWarehouseCode = balancesItem.warehouseCode
item.handledFromQty = balancesItem.qty item.handledFromQty = balancesItem.qty
item.handleToPackingCodeLocationCode = balancesItem.locationCode item.handleToPackingCodeLocationCode = balancesItem
.locationCode
} }
}) })
} }

71
fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
View File

@ -3,16 +3,8 @@
<page-meta root-font-size="16px"></page-meta> <page-meta root-font-size="16px"></page-meta>
<view class=""> <view class="">
<view class="top_card"> <view class="top_card">
<com-job-scan-detail <com-job-scan-detail :jobContent="datacontent" :allCount="allCount" :isShowScanHint="true" scanHint="已发数"
:jobContent="datacontent" :scanCount="scanCount" :isShowOther="true" :isShowShouRong="true" :shouRongCount="shouRongCount">
:allCount="allCount"
:isShowScanHint="true"
scanHint="已发数"
:scanCount="scanCount"
:isShowOther="true"
:isShowShouRong="true"
:shouRongCount="shouRongCount"
>
</com-job-scan-detail> </com-job-scan-detail>
</view> </view>
<scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" <scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
@ -82,9 +74,9 @@
<uni-td width="120" align="center"> <uni-td width="120" align="center">
<view <view
style="display: flex;flex-direction: row;justify-content:center;align-items: center;"> style="display: flex;flex-direction: row;justify-content:center;align-items: center;">
<com-number-box ref="comNumberBoxRef" v-model="item.tempHandledToQty" <com-number-box ref="comNumberBoxRef"
:max="999999" :min="0" style='width: 100px;' v-model="item.tempHandledToQty" :max="999999" :min="0"
@change="qtyChanged($event,item,index)"> style='width: 100px;' @change="qtyChanged($event,item,index)">
</com-number-box> </com-number-box>
</view> </view>
</uni-td> </uni-td>
@ -126,7 +118,7 @@
</view> </view>
</view> </view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -201,7 +193,8 @@
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
singCode: "", singCode: "",
shouRongCount:null shouRongCount: null,
showBtn: true
} }
}, },
props: { props: {
@ -209,22 +202,13 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail();
}));
} else {
this.getDetail(); this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 cancelTakeKittingIssueJob(this.id).then(res => {}).catch(error => {})
cancelTakeKittingIssueJob(this.id).then(res => {
}).catch(error => {
})
} }
goHome(); goHome();
@ -236,7 +220,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeKittingIssueJob(this.id).then(res => { cancelTakeKittingIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -248,6 +232,7 @@
} }
return true; return true;
} }
}, },
mounted() { mounted() {
uni.setNavigationBarColor({ uni.setNavigationBarColor({
@ -349,15 +334,39 @@
uni.hideLoading(); uni.hideLoading();
this.showMessage(error) this.showMessage(error)
}) })
this.setReceived();
} }
}) })
.catch(err => { .catch(err => {
this.showMessage('未查找到详细信息')
uni.hideLoading(); uni.hideLoading();
this.showMessage('未查找到详细信息')
}); });
}, },
setReceived() {
//是否承接
//已经承接
if (this.datacontent.isClaims) {
//承接并且承接人是自己显示，不是自己隐藏
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if (callback) {
this.showBtn = true
} else {
this.showBtn = false
}
}));
}
},
getScanResult(result) { getScanResult(result) {
let item = this.details.find(r => { let item = this.details.find(r => {
return r.itemCode == result.itemCode return r.itemCode == result.itemCode
@ -399,9 +408,7 @@
item.value = item.SHIFT_CODE item.value = item.SHIFT_CODE
}) })
this.$refs.selectPopup.openScanPopup(list) this.$refs.selectPopup.openScanPopup(list)
} } else {
else {
this.showMessage("推荐列表为0") this.showMessage("推荐列表为0")
} }
}).catch(error => { }).catch(error => {

49
fe/PDA/pages/task/sparePartIssueJobDetail.vue
View File

@ -153,7 +153,7 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -231,7 +231,8 @@
titleArray: ['箱标签'], titleArray: ['箱标签'],
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
handleToPackingCodeLocationCode: "" handleToPackingCodeLocationCode: "",
showBtn: true
} }
}, },
props: { props: {
@ -239,22 +240,13 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail();
}));
} else {
this.getDetail(); this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 cancelTakeSparePartIssueJob(this.id).then(res => {}).catch(error => {})
cancelTakeSparePartIssueJob(this.id).then(res => {
}).catch(error => {
})
} }
goHome(); goHome();
} else if (e.index === 1) { } else if (e.index === 1) {
@ -265,7 +257,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeSparePartIssueJob(this.id).then(res => { cancelTakeSparePartIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -342,6 +334,7 @@
}; };
getSparePartIssueDetail(params) getSparePartIssueDetail(params)
.then(item => { .then(item => {
uni.hideLoading();
console.log('item', item); console.log('item', item);
that.datacontent = item; that.datacontent = item;
that.jobStatus = item.jobStatus; that.jobStatus = item.jobStatus;
@ -369,15 +362,37 @@
); );
that.ispending = item.jobStatus === 2; that.ispending = item.jobStatus === 2;
this.allCount = that.details.length; this.allCount = that.details.length;
this.setReceived();
} }
uni.hideLoading();
}) })
.catch(err => { .catch(err => {
this.showMessage('未查找到详细信息')
uni.hideLoading(); uni.hideLoading();
this.showMessage('未查找到详细信息')
}); });
}, },
setReceived() {
//是否承接
//已经承接
if (this.datacontent.isClaims) {
//承接并且承接人是自己显示，不是自己隐藏
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if (callback) {
this.showBtn = true
} else {
this.showBtn = false
}
}));
}
},
getScanResultTo(result) { getScanResultTo(result) {
var fromData = result.data; var fromData = result.data;

61
fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
View File

@ -3,16 +3,8 @@
<page-meta root-font-size="16px"></page-meta> <page-meta root-font-size="16px"></page-meta>
<view class=""> <view class="">
<view class="top_card"> <view class="top_card">
<com-job-scan-detail <com-job-scan-detail :jobContent="datacontent" :allCount="allCount" :isShowScanHint="true" scanHint="已发数"
:jobContent="datacontent" :scanCount="scanCount" :isShowOther="true" :isShowShouRong="true" :shouRongCount="shouRongCount">
:allCount="allCount"
:isShowScanHint="true"
scanHint="已发数"
:scanCount="scanCount"
:isShowOther="true"
:isShowShouRong="true"
:shouRongCount="shouRongCount"
>
</com-job-scan-detail> </com-job-scan-detail>
</view> </view>
<scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" <scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
@ -82,9 +74,9 @@
<uni-td width="120" align="center"> <uni-td width="120" align="center">
<view <view
style="display: flex;flex-direction: row;justify-content:center;align-items: center;"> style="display: flex;flex-direction: row;justify-content:center;align-items: center;">
<com-number-box ref="comNumberBoxRef" v-model="item.tempHandledToQty" <com-number-box ref="comNumberBoxRef"
:max="999999" :min="0" style='width: 100px;' v-model="item.tempHandledToQty" :max="999999" :min="0"
@change="qtyChanged($event,item,index)"> style='width: 100px;' @change="qtyChanged($event,item,index)">
</com-number-box> </com-number-box>
</view> </view>
</uni-td> </uni-td>
@ -126,7 +118,7 @@
</view> </view>
</view> </view>
<view class="uni-flex uni-row new_btn_bot"> <view class="uni-flex uni-row new_btn_bot" v-if="showBtn">
<button class="new_clear_btn btn_double" @click="clear()">清空</button> <button class="new_clear_btn btn_double" @click="clear()">清空</button>
<button class="new_save_btn btn_double" @click="submit()">提交</button> <button class="new_save_btn btn_double" @click="submit()">提交</button>
</view> </view>
@ -201,7 +193,8 @@
jobStatus: "", jobStatus: "",
toLocationInfo: {}, toLocationInfo: {},
singCode: "", singCode: "",
shouRongCount:null shouRongCount: null,
showBtn: true
} }
}, },
props: { props: {
@ -209,17 +202,14 @@
}, },
onLoad(param) { onLoad(param) {
this.id = param.id; this.id = param.id;
if (param.jobStatus == 1) {
this.receive((callback => {
this.getDetail(); this.getDetail();
}));
} else {
this.getDetail();
}
}, },
//返回首页 //返回首页
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
cancelTakeSparePartIssueJob(this.id).then(res => {}).catch(error => {})
}
goHome(); goHome();
} else if (e.index === 1) { } else if (e.index === 1) {
window.location.reload(); window.location.reload();
@ -229,7 +219,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus == 2) { if (this.datacontent.isClaims && this.datacontent.claimsUserId == localStorage.getItem('userId')) {
//取消承接任务 //取消承接任务
cancelTakeSparePartIssueJob(this.id).then(res => { cancelTakeSparePartIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -343,6 +333,7 @@
uni.hideLoading(); uni.hideLoading();
this.showMessage(error) this.showMessage(error)
}) })
this.setReceived();
} }
}) })
@ -351,6 +342,28 @@
uni.hideLoading(); uni.hideLoading();
}); });
}, },
setReceived() {
//是否承接
//已经承接
if (this.datacontent.isClaims) {
//承接并且承接人是自己显示，不是自己隐藏
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
} else {
this.showBtn = false
}
} else {
//未承接，调用承接接口，承接成功后显示按钮
this.receive((callback => {
if (callback) {
this.showBtn = true
} else {
this.showBtn = false
}
}));
}
},
getScanResult(result) { getScanResult(result) {
let item = this.details.find(r => { let item = this.details.find(r => {
return r.itemCode == result.itemCode return r.itemCode == result.itemCode
@ -392,9 +405,7 @@
item.value = item.SHIFT_CODE item.value = item.SHIFT_CODE
}) })
this.$refs.selectPopup.openScanPopup(list) this.$refs.selectPopup.openScanPopup(list)
} } else {
else {
this.showMessage("推荐列表为0") this.showMessage("推荐列表为0")
} }
}).catch(error => { }).catch(error => {

Write Preview
Loading…
Cancel
Save