|
|
@@ -610,14 +610,14 @@ export default {
|
|
|
this.deptBudgetList1.binNumber = this.$route.query.binNumber
|
|
|
this.getList()
|
|
|
this.dataList.id = this.$route.query.id
|
|
|
- this.dataList.grossWeight = this.$route.query.grossWeight*1000
|
|
|
+ this.dataList.grossWeight = Math.round(this.$route.query.grossWeight*1000)
|
|
|
this.dataList.contractNo = this.$route.query.contractNo
|
|
|
this.dataList.baseId = this.$route.query.baseId
|
|
|
this.dataList.positionId = this.$route.query.positionId
|
|
|
this.dataList.warehouseName = this.$route.query.warehouseName
|
|
|
this.dataList.binNumber = this.$route.query.binNumber
|
|
|
- this.dataList.tare = this.$route.query.tare*1000
|
|
|
- this.dataList.netWeight = this.$route.query.netWeight*1000
|
|
|
+ this.dataList.tare = Math.round(this.$route.query.tare*1000)
|
|
|
+ this.dataList.netWeight = Math.round(this.$route.query.netWeight*1000)
|
|
|
this.dataList.grade = this.$route.query.grade
|
|
|
this.dataList.agent = this.$route.query.agent
|
|
|
this.dataList.carNo = this.$route.query.carNo
|
|
|
@@ -640,9 +640,9 @@ export default {
|
|
|
this.dataList.buckleWeightRatio=this.$route.query.buckleWeightRatio
|
|
|
this.dataList.tidalGrainWater=this.$route.query.tidalGrainWater
|
|
|
this.dataList.solidGrainWater=this.$route.query.solidGrainWater
|
|
|
- this.dataList.pureWeight=this.$route.query.pureWeight*1000
|
|
|
+ this.dataList.pureWeight=Math.round(this.$route.query.pureWeight*1000)
|
|
|
this.dataList.deductionAmount=this.$route.query.deductionAmount/1000
|
|
|
- this.dataList.deductionWeight=this.$route.query.deductionWeight*1000
|
|
|
+ this.dataList.deductionWeight=Math.round(this.$route.query.deductionWeight*1000)
|
|
|
this.dataList.inOutTypeFlag=1
|
|
|
this.dataList.inOutTaskNo = this.$route.query.inOutTaskNo
|
|
|
if(this.dataList.cost){
|
|
|
@@ -1371,24 +1371,31 @@ export default {
|
|
|
.then(() => {
|
|
|
this.$refs.dataList.validate((valid) => {
|
|
|
if (valid) {
|
|
|
+ debugger
|
|
|
this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
|
|
|
this.dataList.inOutFlag = 2
|
|
|
this.dataList.statusFlag = 3
|
|
|
- this.dataList.grossWeight /= 1000
|
|
|
- this.dataList.tare /= 1000
|
|
|
- this.dataList.netWeight /= 1000
|
|
|
- this.dataList.pureWeight /= 1000
|
|
|
+ this.dataList.grossWeight = (this.dataList.grossWeight/1000).toFixed(2)
|
|
|
+ this.dataList.tare = (this.dataList.tare/1000).toFixed(2)
|
|
|
+ this.dataList.netWeight = (this.dataList.netWeight/1000).toFixed(2)
|
|
|
+ this.dataList.pureWeight = (this.dataList.pureWeight/1000).toFixed(2)
|
|
|
if(!this.dataList.deductionWeight){
|
|
|
this.dataList.deductionWeight = 0
|
|
|
}
|
|
|
if(!this.dataList.deductionAmount){
|
|
|
this.dataList.deductionAmount = 0
|
|
|
}
|
|
|
- this.dataList.deductionWeight /= 1000
|
|
|
- this.dataList.deductionAmount *= 1000
|
|
|
+ this.dataList.deductionWeight = (this.dataList.deductionWeight/1000).toFixed(2)
|
|
|
+ this.dataList.deductionAmount = Math.round(this.dataList.deductionAmount*1000)
|
|
|
+
|
|
|
addstorageputList(this.dataList)
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
+ this.dataList.grossWeight = Math.round(this.dataList.grossWeight*1000)
|
|
|
+ this.dataList.tare = Math.round(this.dataList.tare*1000)
|
|
|
+ this.dataList.netWeight = Math.round(this.dataList.netWeight*1000)
|
|
|
+ this.dataList.pureWeight = Math.round(this.dataList.pureWeight*1000)
|
|
|
+ this.dataList.deductionWeight = Math.round(this.dataList.deductionWeight*1000)
|
|
|
this.$message.success('提交成功')
|
|
|
this.$confirm(`是否打印磅单`, {
|
|
|
cancelButtonText: '取消',
|
|
|
@@ -1403,8 +1410,9 @@ export default {
|
|
|
.then((response) => {
|
|
|
window.open( '../../../../static/weightCheckInOut.html?type=2&tableData=' +JSON.stringify(response))
|
|
|
})
|
|
|
- this.$router.push({ path: 'warehouseManagementList' })
|
|
|
+
|
|
|
})
|
|
|
+ this.$router.push({ path: 'warehouseManagementList' })
|
|
|
.catch(() => {
|
|
|
return false
|
|
|
})
|
