sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
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
e2a212e442 4853bc97c7
commit
1f5b93e8df
1 changed files with 83 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 115
      src/pages/productReceipt/job/fgProductReceiptDetail.vue

115
src/pages/productReceipt/job/fgProductReceiptDetail.vue
View File

@ -1,42 +1,44 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">车间</view>
<view>
{{jobContent.workShopCode}}
</view>
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">车间</view>
<view>
{{jobContent.workShopCode}}
</view>
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>
{{item.subList[0].productionLineCode}}
</view>
</view>
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>
{{productionLineCode}}
</view>
<view class="cell_info">
<view class="text_lightblue">班组</view>
<view>
{{jobContent.team}}
</view>
</view>
<view class="cell_info">
<view class="text_lightblue">班组</view>
<view>
{{jobContent.team}}
</view>
<view class="cell_info">
<view class="text_lightblue">班次</view>
<view>
{{jobContent.shift}}
</view>
</view>
<view class="cell_info">
<view class="text_lightblue">班次</view>
<view>
{{jobContent.shift}}
</view>
</view>
<view class="split_line"></view>
</view>
</view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<com-product-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
@ -70,7 +72,9 @@
import {
getManagementPrecisions
} from '@/common/balance.js';
import { getCurrDateTime} from '@/common/basic.js';
import {
getCurrDateTime
} from '@/common/basic.js';
import {
getProductReceiptJobDetail,
@ -143,15 +147,16 @@
jobToLocationCode: "",
fgList: [],
itemCode: "",
productionLineCode: "",
scanMessage: "",
};
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
this.scanMessage = option.scanMessage ;
this.scanMessage = option.scanMessage;
if (this.id != undefined) {
//新建的任务自动接收
if (option.status == "1") {
@ -226,7 +231,8 @@
that.subList = res.data.subList;
that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode
if(that.jobContent.allowModifyLocation=='FALSE'){
that.productionLineCode = that.subList[0].productionLineCode;
if (that.jobContent.allowModifyLocation == 'FALSE') {
that.toLocationCode = that.subList[0].toLocationCode
}
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
@ -243,11 +249,11 @@
},
getScanResult(result) {
let that = this;
let that = this;
//TODO缺少零件号的对应关系
//查询mes码是否完工
isCheckMesCode(result.content).then(res=>{
if(res.data){
isCheckMesCode(result.content).then(res => {
if (res.data) {
if (that.detailSource.length > 0) {
let item = that.detailSource[0]; //应该按零件号查找
result.uom = item.uom;
@ -270,10 +276,11 @@
subItem.fgList.push(result);
that.calcFgQty(this.detailSource);
} else {
this.showQuestionMessage("标签【" + result.content + '】已经扫描，是否移除', confirm => {
subItem.fgList.splice(itemIndex, 1)
that.calcFgQty(this.detailSource);
})
this.showQuestionMessage("标签【" + result.content + '】已经扫描，是否移除',
confirm => {
subItem.fgList.splice(itemIndex, 1)
that.calcFgQty(this.detailSource);
})
}
}
@ -283,7 +290,7 @@
}
}
}
}).catch(error=>{
}).catch(error => {
this.showErrorMessage(error)
})
@ -359,9 +366,9 @@
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
// detail.packingNumber, detail.batch);
// detail.toPackingNumber = info.packingNumber;
// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
// detail.packingNumber, detail.batch);
// detail.toPackingNumber = info.packingNumber;
packingNumber.push(detail.packingNumber)
}
})
@ -414,7 +421,7 @@
},
getH5BatchPrintingLable( number) {
getH5BatchPrintingLable(number) {
let _this = this
batchPrintingLable(number).then(resLable => {
console.log('batchPrintingLable', resLable)
@ -438,10 +445,10 @@
if (!this.checkLocation()) {
return
}
var valiDate =getSwitchInfoByCode("fgProductReceipCommitValidate")
var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
this.detailSource.forEach(item => {
item.subList.forEach(subitem => {
if(valiDate){
if (valiDate) {
if (subitem.handleQty == undefined) {
this.showMessage("还没扫码成品不能提交")
} else {
@ -455,9 +462,9 @@
this.submitJob();
}
}
}else {
if(!subitem.handleQty){
subitem.handleQty=subitem.qty
} else {
if (!subitem.handleQty) {
subitem.handleQty = subitem.qty
}
subitem.scaned = true
this.submitJob();
@ -517,11 +524,11 @@
detail.fgList.forEach(res => {
res.outsideItemCode = res.itemCode
// res.outsideProduceDate = res.productDate
res.outsideProduceDate = null
res.outsideProduceDate = null
res.outsideSerialNumber = res.order
})
}else {
detail.fgList=[]
} else {
detail.fgList = []
}
subList.push(detail)
}

Write Preview
Loading…
Cancel
Save