|
@@ -480,9 +480,9 @@
|
|
|
// this.getDept()
|
|
// this.getDept()
|
|
|
// this.getSupplier()
|
|
// this.getSupplier()
|
|
|
const userInfo = uni.getStorageSync('userInfo')
|
|
const userInfo = uni.getStorageSync('userInfo')
|
|
|
- console.log()
|
|
|
|
|
|
|
+ console.log('userInfo~~~', userInfo)
|
|
|
this.formData.extInfo.createUserName = userInfo.name
|
|
this.formData.extInfo.createUserName = userInfo.name
|
|
|
- this.formData.createUserId = userInfo.name
|
|
|
|
|
|
|
+ this.formData.createUserId = userInfo.userId
|
|
|
this.storageTime = Number(new Date())
|
|
this.storageTime = Number(new Date())
|
|
|
this.formData.storageTime = this.formatter(this.storageTime)
|
|
this.formData.storageTime = this.formatter(this.storageTime)
|
|
|
// this.formData.registerId = userInfo.id
|
|
// this.formData.registerId = userInfo.id
|
|
@@ -1086,7 +1086,7 @@
|
|
|
console.log('!!this.getDict(item.measureUnit).dictValue--------', this.getDict(item.measureUnit))
|
|
console.log('!!this.getDict(item.measureUnit).dictValue--------', this.getDict(item.measureUnit))
|
|
|
if (outBoolen) {
|
|
if (outBoolen) {
|
|
|
// 计量单位为KG类,直接替换
|
|
// 计量单位为KG类,直接替换
|
|
|
- item.weight = item.measureQuantity
|
|
|
|
|
|
|
+ item.weight = item.measureQuantity || 0
|
|
|
} else {
|
|
} else {
|
|
|
// 计量单位为不为KG类,重新统计计算
|
|
// 计量单位为不为KG类,重新统计计算
|
|
|
let inBoolen = !!this.getDict(item.packingSpecificationOption[0].packageUnit).dictValue
|
|
let inBoolen = !!this.getDict(item.packingSpecificationOption[0].packageUnit).dictValue
|
|
@@ -1104,11 +1104,11 @@
|
|
|
}
|
|
}
|
|
|
if (inBoolen) {
|
|
if (inBoolen) {
|
|
|
// 第二层为KG类
|
|
// 第二层为KG类
|
|
|
- item.weight = total
|
|
|
|
|
|
|
+ item.weight = total || 0
|
|
|
} else {
|
|
} else {
|
|
|
// 第二层不为KG类
|
|
// 第二层不为KG类
|
|
|
// item.weight = this.$math.format(total * item.netWeight, 14)
|
|
// item.weight = this.$math.format(total * item.netWeight, 14)
|
|
|
- item.weight = total * item.netWeight
|
|
|
|
|
|
|
+ item.weight = total * item.netWeight || 0
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
row.outInDetailRecordRequestList.push(item)
|
|
row.outInDetailRecordRequestList.push(item)
|