|
|
|
|
@ -512,6 +512,7 @@ import { accMul } from '../../../../../common/common'
|
|
|
|
|
queryById: "/burst/processIndustrial/queryById", |
|
|
|
|
queryPurchaseById: "/burst/processIndustrialPurchase/queryById", |
|
|
|
|
list: "/burst/processIndustrial/list", |
|
|
|
|
ownList: "/burst/processIndustrial/ownList", |
|
|
|
|
edit: "/burst/processIndustrialPurchase/edit", |
|
|
|
|
addFromTableApply: "/burst/processIndustrialPurchase/addFromTableApply", |
|
|
|
|
getFirstNode: '/actProcessIns/getFirstNode', |
|
|
|
|
@ -559,7 +560,6 @@ import { accMul } from '../../../../../common/common'
|
|
|
|
|
let company = sessionStorage.getItem('PARENT_ID') |
|
|
|
|
let puwwcid = sessionStorage.getItem('PUWWC_Id') |
|
|
|
|
let userInfo = sessionStorage.getItem('USER_INFORMATION'); |
|
|
|
|
|
|
|
|
|
if (!this.isNew) { |
|
|
|
|
this.init(); |
|
|
|
|
}else{ |
|
|
|
|
@ -580,8 +580,8 @@ import { accMul } from '../../../../../common/common'
|
|
|
|
|
rowKey: id, |
|
|
|
|
values: { |
|
|
|
|
'materialNumber': v.id, |
|
|
|
|
'materialGroup': null, |
|
|
|
|
'materialSeries': !!v.series ? v.series : undefined , |
|
|
|
|
'materialGroup': v.materialClassify, |
|
|
|
|
'materialSeries': !!v.series ? v.series : null , |
|
|
|
|
'materialName': v.name, |
|
|
|
|
'materialUnit': v.unit, |
|
|
|
|
'supplierId': v.manufacturer, |
|
|
|
|
@ -685,9 +685,9 @@ import { accMul } from '../../../../../common/common'
|
|
|
|
|
let url = ''; |
|
|
|
|
if(!!v){ |
|
|
|
|
par.id = v; |
|
|
|
|
url = this.url.queryById |
|
|
|
|
url = this.url.queryById; |
|
|
|
|
} else { |
|
|
|
|
url = this.url.list |
|
|
|
|
url = this.url.ownList; |
|
|
|
|
} |
|
|
|
|
par.materialType = this.assigneesText; |
|
|
|
|
await getAction(url,par).then(res => { |
|
|
|
|
@ -704,6 +704,7 @@ import { accMul } from '../../../../../common/common'
|
|
|
|
|
}, |
|
|
|
|
//初始列表数据 |
|
|
|
|
async initialData(newList){ |
|
|
|
|
console.log("-=-=-=",newList); |
|
|
|
|
await this.getSurface(); |
|
|
|
|
if (this.processIndustrialPurchaseMaterialTable.columns[1].options.length > 0) { |
|
|
|
|
this.processIndustrialPurchaseMaterialTable.columns[1].options = []; |
|
|
|
|
@ -741,11 +742,13 @@ import { accMul } from '../../../../../common/common'
|
|
|
|
|
saveAndpassTask() { |
|
|
|
|
this.handleSubmit(true) |
|
|
|
|
}, |
|
|
|
|
//驳回 |
|
|
|
|
backTask(){}, |
|
|
|
|
/*驳回审批*/ |
|
|
|
|
backTask() { |
|
|
|
|
this.$emit('backTask') |
|
|
|
|
}, |
|
|
|
|
//通过 |
|
|
|
|
passTask(){ |
|
|
|
|
|
|
|
|
|
this.$emit('passTask'); |
|
|
|
|
}, |
|
|
|
|
//提交申请 |
|
|
|
|
applySubmit(e) { |
|
|
|
|
@ -761,7 +764,13 @@ import { accMul } from '../../../../../common/common'
|
|
|
|
|
this.$message.error('请填写清单内容') |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
let pr = false; |
|
|
|
|
for (let i = 0; i < formData.processIndustrialPurchaseMaterialList.length; i++) { |
|
|
|
|
// console.log("-=-=-=",formData.processIndustrialPurchaseMaterialList[i]); |
|
|
|
|
if(parseInt( formData.processIndustrialPurchaseMaterialList[i].materialPrice ) > 50000){ |
|
|
|
|
formData.materialPrice = formData.processIndustrialPurchaseMaterialList[i].materialPrice; |
|
|
|
|
pr = true; |
|
|
|
|
} |
|
|
|
|
if (i == 0) { |
|
|
|
|
this.describes = formData.processIndustrialPurchaseMaterialList[i].materialName |
|
|
|
|
} else { |
|
|
|
|
@ -769,11 +778,9 @@ import { accMul } from '../../../../../common/common'
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
formData.fileId = getStringArry(formData.fileId) |
|
|
|
|
// if (this.materialPrice != 0 && this.materialPrice != null) { |
|
|
|
|
// formData.materialPrice = this.materialPrice; |
|
|
|
|
// }else{ |
|
|
|
|
// formData.materialPrice = 0; |
|
|
|
|
// } |
|
|
|
|
if (!pr) { |
|
|
|
|
formData.materialPrice = 0; |
|
|
|
|
} |
|
|
|
|
formData.describes = this.describes |
|
|
|
|
if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) { |
|
|
|
|
this.$message.error('需求时间不能小于当前流程发起时间') |
|
|
|
|
|
