|
@@ -315,7 +315,7 @@ export default {
|
|
|
if (record.surplusNumber && record.spec) {
|
|
if (record.surplusNumber && record.spec) {
|
|
|
record.kc = this.formatNumber(Number(record.surplusNumber) * Number(record.spec))
|
|
record.kc = this.formatNumber(Number(record.surplusNumber) * Number(record.spec))
|
|
|
}
|
|
}
|
|
|
- record.fpDate = `${record.goodsName}(生产日期:${record.produceDate})`
|
|
|
|
|
|
|
+ record.fpDate = `${record.goodsName}(生产日期:${record.produceDate ?? '--'})`
|
|
|
})
|
|
})
|
|
|
this.fillUserInfo()
|
|
this.fillUserInfo()
|
|
|
this.nodeFlag = await this.resolveNodeFlag(data)
|
|
this.nodeFlag = await this.resolveNodeFlag(data)
|
|
@@ -743,7 +743,7 @@ export default {
|
|
|
const submitData = this.toSubmitData()
|
|
const submitData = this.toSubmitData()
|
|
|
try {
|
|
try {
|
|
|
const taskName = await this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId)
|
|
const taskName = await this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId)
|
|
|
- if (this.isNotEmpty(taskName) && taskName === '仓库管理员审核') {
|
|
|
|
|
|
|
+ if (this.isNotEmpty(taskName) && taskName === '老板审核') {
|
|
|
submitData.status = '5'
|
|
submitData.status = '5'
|
|
|
this.inputForm.status = '5'
|
|
this.inputForm.status = '5'
|
|
|
}
|
|
}
|