|
|
|
|
@ -502,8 +502,7 @@
|
|
|
|
|
materialType: { rules: [{ required: true, message: '请选择物资类型!' }] }, |
|
|
|
|
needTime: { rules: [{ required: true, message: '请选择需求时间!' }] }, |
|
|
|
|
processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }, |
|
|
|
|
sort: { |
|
|
|
|
rules: [{ required: true, type: 'number', max: 999999999999, message: '请输入序号!(0 ~ 12个字符)' } |
|
|
|
|
sort: { rules: [{ required: true, type:'number', max:999999999999, message: '请输入序号!(0 ~ 12个字符)'}, |
|
|
|
|
// { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'} |
|
|
|
|
// {validator: this.lengthCheck} |
|
|
|
|
] |
|
|
|
|
@ -585,7 +584,7 @@
|
|
|
|
|
immediate: true, |
|
|
|
|
handler: function(val) { |
|
|
|
|
this.planType = val |
|
|
|
|
console.log('this.planType---', this.planType) |
|
|
|
|
console.log("this.planType---",this.planType) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
@ -613,15 +612,15 @@
|
|
|
|
|
lengthCheck(rule, value, callback){ |
|
|
|
|
if (value.toString().length >= 12 ){ |
|
|
|
|
// console.log("长度太长了"); |
|
|
|
|
callback('长度应当在0 ~ 12 字符') |
|
|
|
|
callback("长度应当在0 ~ 12 字符") |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
selectRowChange(a, b, c) { |
|
|
|
|
// console.log("执行了",a,b,c); |
|
|
|
|
}, |
|
|
|
|
shifu(){ |
|
|
|
|
console.log('执行了') |
|
|
|
|
this.isShifu = true |
|
|
|
|
console.log("执行了"); |
|
|
|
|
this.isShifu = true; |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// handleChange(value, key, column) { |
|
|
|
|
@ -670,7 +669,7 @@
|
|
|
|
|
this.hiegs = false |
|
|
|
|
// this.fetchData(); |
|
|
|
|
// this.fetchDataRake() |
|
|
|
|
this.fetchMerchandiseNews() |
|
|
|
|
this.fetchMerchandiseNews(); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
//物料组选择触发 |
|
|
|
|
@ -800,20 +799,20 @@
|
|
|
|
|
// } |
|
|
|
|
// console.log("5555出发了",record.row); |
|
|
|
|
// if ( !!record.row.materialNumber && isEr) { |
|
|
|
|
let b = false |
|
|
|
|
let b = false; |
|
|
|
|
if(this.isShifu){ |
|
|
|
|
// console.log("0出发了",record); |
|
|
|
|
for (const res of this.bigIdMerchandiseNewsList) { |
|
|
|
|
if(res.id === record.row.materialNumber ){ |
|
|
|
|
b = true |
|
|
|
|
b = true; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if(!b){ |
|
|
|
|
// console.log("进来了111"); |
|
|
|
|
await this.fetchMerchandiseNews(null, record.row.materialNumber) |
|
|
|
|
await this.fetchMerchandiseNews(null,record.row.materialNumber ); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
this.isShifu = false |
|
|
|
|
this.isShifu = false; |
|
|
|
|
if(record.column.key !== 'materialPrice' && record.column.key !== 'materialQuantity'){ |
|
|
|
|
if ( !!record.row.materialNumber && this.isBu !== record.row.materialNumber ) { |
|
|
|
|
// console.log("2出发了"); |
|
|
|
|
@ -853,13 +852,14 @@
|
|
|
|
|
] |
|
|
|
|
// console.log("sadf1111") |
|
|
|
|
this.$refs.processUdgetPlanMaterial.setValues(values) |
|
|
|
|
return |
|
|
|
|
return ; |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.processUdgetPlanMaterialTable.columns[0].options.push({ |
|
|
|
|
title: materialName.materialClassify, |
|
|
|
|
value: materialName.descriptionId |
|
|
|
|
@ -879,12 +879,14 @@
|
|
|
|
|
} |
|
|
|
|
] |
|
|
|
|
this.$refs.processUdgetPlanMaterial.setValues(values) |
|
|
|
|
this.isBu = record.row.materialNumber |
|
|
|
|
this.isBu = record.row.materialNumber; |
|
|
|
|
isEr = false |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!!record.row.materialQuantity && !!record.row.materialPrice && isEr ) { |
|
|
|
|
// record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice; |
|
|
|
|
// console.log("3出发了"); |
|
|
|
|
@ -972,12 +974,12 @@
|
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
this.bigIdMerchandiseNewsList = res.result |
|
|
|
|
this.bigIdMerchandiseNewsList = res.result; |
|
|
|
|
// resolve( this.bigIdMerchandiseNewsList ); |
|
|
|
|
} |
|
|
|
|
resolve(this.bigIdMerchandiseNewsList) |
|
|
|
|
}) |
|
|
|
|
resolve( this.bigIdMerchandiseNewsList ); |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
// fetchMerchandiseNews(value){ //查询物料清单信息 |
|
|
|
|
@ -1076,7 +1078,7 @@
|
|
|
|
|
id: r.tableId |
|
|
|
|
}).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
console.log('res.result.planType--', res.result.planType) |
|
|
|
|
console.log("res.result.planType--",res.result.planType) |
|
|
|
|
this.$emit('planType',res.result.planType) |
|
|
|
|
this.planType = res.result.planType |
|
|
|
|
let formData = res.result |
|
|
|
|
@ -1162,8 +1164,8 @@
|
|
|
|
|
formData.procDefId = this.processData.id |
|
|
|
|
formData.procDeTitle = this.processData.name |
|
|
|
|
formData.title = this.processData.description |
|
|
|
|
formData.planType = this.planType |
|
|
|
|
console.log('this.planType++', this.planType) |
|
|
|
|
formData.planType=this.planType; |
|
|
|
|
console.log("this.planType++",this.planType) |
|
|
|
|
if (!formData.tableName) formData.tableName = this.processData.businessTable |
|
|
|
|
var url = this.url.addFromTableApply |
|
|
|
|
let method = 'post' |
|
|
|
|
@ -1177,21 +1179,23 @@
|
|
|
|
|
formData.title = this.processData.title |
|
|
|
|
formData.processInstanceId = this.processData.id |
|
|
|
|
} |
|
|
|
|
this.btndisabled = true |
|
|
|
|
console.log(formData, '表单数据') |
|
|
|
|
if(this.btndisabled === false){ |
|
|
|
|
this.btndisabled = true |
|
|
|
|
httpAction(url,formData,method).then((res)=>{ |
|
|
|
|
if (res.success){ |
|
|
|
|
this.$message.success('提交申请成功！') |
|
|
|
|
this.$message.success("提交申请成功！") |
|
|
|
|
//todo 将表单的数据传给父组件 |
|
|
|
|
this.$emit('loadData') |
|
|
|
|
this.close() |
|
|
|
|
this.close(); |
|
|
|
|
}else { |
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
} |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
this.btndisabled = false |
|
|
|
|
this.btndisabled = false; |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
@ -1265,7 +1269,8 @@
|
|
|
|
|
|
|
|
|
|
for (let i = 0; i < this.listId.length; i++) { |
|
|
|
|
// console.log(this.listId[i])\ |
|
|
|
|
this.descriptionId(this.listId[i]) |
|
|
|
|
this.descriptionId(this.listId[i]); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.fetchMerchandiseNews(this.listId[i]) |
|
|
|
|
} |
|
|
|
|
@ -1347,7 +1352,7 @@
|
|
|
|
|
formData.procDefId = this.processData.id |
|
|
|
|
formData.procDeTitle = this.processData.name |
|
|
|
|
formData.title = this.processData.description |
|
|
|
|
formData.planType = this.planType |
|
|
|
|
formData.planType=this.planType; |
|
|
|
|
if (!formData.tableName) formData.tableName = this.processData.businessTable |
|
|
|
|
var url = this.url.add |
|
|
|
|
let method = 'post' |
|
|
|
|
@ -1355,8 +1360,9 @@
|
|
|
|
|
url = this.url.edit |
|
|
|
|
method = 'put' |
|
|
|
|
} |
|
|
|
|
this.btndisabled = true |
|
|
|
|
console.log(formData, '格式化的数据') |
|
|
|
|
if(this.btndisabled === false){ |
|
|
|
|
this.btndisabled = true |
|
|
|
|
httpAction(url,formData,method).then((res)=>{ |
|
|
|
|
if (res.success){ |
|
|
|
|
//this.$message.success("保存成功！") |
|
|
|
|
@ -1366,9 +1372,10 @@
|
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
} |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
this.btndisabled = false |
|
|
|
|
this.btndisabled = false; |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
kilo
2 years ago