|
|
|
|
@ -120,7 +120,7 @@
|
|
|
|
|
<div class="div_process"> |
|
|
|
|
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center"> |
|
|
|
|
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button> |
|
|
|
|
<!-- <a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请</a-button>--> |
|
|
|
|
<!--<a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请</a-button>--> |
|
|
|
|
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button> |
|
|
|
|
</a-form-item> |
|
|
|
|
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center"> |
|
|
|
|
@ -172,6 +172,7 @@
|
|
|
|
|
bigIdRakeList:[], |
|
|
|
|
materialPrice:0, |
|
|
|
|
materialAmount:0, |
|
|
|
|
describes:'', |
|
|
|
|
hieg:true, |
|
|
|
|
historyBigId:[], |
|
|
|
|
isHistoryBigId:false, |
|
|
|
|
@ -398,7 +399,7 @@
|
|
|
|
|
url: { |
|
|
|
|
add: '/hy/processUdgetPlan/add', |
|
|
|
|
edit: '/hy/processUdgetPlan/edit', |
|
|
|
|
applyBusiness:'/actBusiness/apply', |
|
|
|
|
fromTableApply:'/actBusiness/fromTableApply', |
|
|
|
|
queryById: '/hy/processUdgetPlan/queryById', |
|
|
|
|
selectdeparment:'/sys/selectByUser', |
|
|
|
|
descriptionRakeUrl: "/description/processDescription/list", |
|
|
|
|
@ -857,29 +858,49 @@
|
|
|
|
|
}, |
|
|
|
|
/*提交申请*/ |
|
|
|
|
applySubmit(e) { |
|
|
|
|
this.handleSubmit (e) |
|
|
|
|
this.getAllTable().then(tables => { |
|
|
|
|
return validateFormAndTables(this.form, tables) |
|
|
|
|
}).then(allValues=> { |
|
|
|
|
}).then(allValues=>{ |
|
|
|
|
if (typeof this.classifyIntoFormData !== 'function') { |
|
|
|
|
throw this.throwNotFunction('classifyIntoFormData') |
|
|
|
|
} |
|
|
|
|
let formData = this.classifyIntoFormData(allValues) |
|
|
|
|
if(!formData.processUdgetPlanMaterialList.length>0){ |
|
|
|
|
this.$message.error('填写数据不完整，禁止提交申请！') |
|
|
|
|
//计算总价 |
|
|
|
|
for (let i = 0; i < formData.processUdgetPlanMaterialList.length; i++) { |
|
|
|
|
this.materialAmount=this.materialAmount+ formData.processUdgetPlanMaterialList[i].materialAmount; |
|
|
|
|
} |
|
|
|
|
formData.fileId = getStringArry(formData.fileId) |
|
|
|
|
formData.materialPrice=this.materialPrice; |
|
|
|
|
formData.materialAmount=this.materialAmount; |
|
|
|
|
|
|
|
|
|
if (new Date(formData.createTime).getTime()/100>new Date(formData.needTime).getTime()/100){ |
|
|
|
|
this.$message.error("需求时间不能小于当前流程发起时间") |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
var params = {} |
|
|
|
|
params.priority = 1; |
|
|
|
|
this.postFormAction(this.url.applyBusiness,params).then(res => { |
|
|
|
|
if (res.success) { |
|
|
|
|
this.$message.success("操作成功"); |
|
|
|
|
this.loadData(); |
|
|
|
|
this.modalVisible = false; |
|
|
|
|
}else { |
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
console.log(this.materialAmount,'采购总价') |
|
|
|
|
console.log(formData,'表单数据') |
|
|
|
|
console.log(this.opinion,'流程说明') |
|
|
|
|
this.form.validateFields((err, values) => { |
|
|
|
|
if (!err) { |
|
|
|
|
formData.procDefId = this.processData.id; |
|
|
|
|
formData.procDeTitle = this.processData.name; |
|
|
|
|
formData.title=this.processData.description; |
|
|
|
|
if (!formData.tableName)formData.tableName = this.processData.businessTable; |
|
|
|
|
this.btndisabled = true; |
|
|
|
|
console.log(formData,'申请数据') |
|
|
|
|
httpAction(this.url.fromTableApply,formData,'post').then((res)=>{ |
|
|
|
|
if (res.success){ |
|
|
|
|
this.$message.success("申请成功！") |
|
|
|
|
//todo 将表单的数据传给父组件 |
|
|
|
|
this.$emit('close',formData) |
|
|
|
|
}else { |
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
} |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
this.btndisabled = false; |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}).finally(()=>this.submitLoading = false); |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
@ -966,11 +987,17 @@
|
|
|
|
|
//计算总价 |
|
|
|
|
for (let i = 0; i < formData.processUdgetPlanMaterialList.length; i++) { |
|
|
|
|
this.materialAmount=this.materialAmount+ formData.processUdgetPlanMaterialList[i].materialAmount; |
|
|
|
|
if (i==0){ |
|
|
|
|
this.describes=formData.processUdgetPlanMaterialList[i].materialName |
|
|
|
|
}else { |
|
|
|
|
this.describes=this.describes+"---"+formData.processUdgetPlanMaterialList[i].materialName |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
formData.fileId = getStringArry(formData.fileId) |
|
|
|
|
formData.materialPrice=this.materialPrice; |
|
|
|
|
formData.materialAmount=this.materialAmount; |
|
|
|
|
|
|
|
|
|
formData.describes=this.describes; |
|
|
|
|
if (new Date(formData.createTime).getTime()/100>new Date(formData.needTime).getTime()/100){ |
|
|
|
|
this.$message.error("需求时间不能小于当前流程发起时间") |
|
|
|
|
return; |
|
|
|
|
|
long
2 years ago