|
|
|
|
@ -64,26 +64,26 @@
|
|
|
|
|
</a-col> |
|
|
|
|
<a-col :span="8" v-show="isPlanType"> |
|
|
|
|
<a-form-item label="采购类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
|
|
|
|
<j-dict-select-tag type="list" v-decorator="['planType']" |
|
|
|
|
<j-dict-select-tag type="list" v-decorator="['planType',validatorRules.planType]" |
|
|
|
|
:trigger-change="true" dictCode="plan_type" |
|
|
|
|
placeholder="请选择采购类型电商或非电商" @change="selectChangPlanType"/> |
|
|
|
|
</a-form-item> |
|
|
|
|
</a-col> |
|
|
|
|
<a-col :span="8" v-show="isSourceCapital"> |
|
|
|
|
<a-form-item label="资金来源" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
|
|
|
|
<j-dict-select-tag type="list" v-decorator="['sourceCapital']" |
|
|
|
|
<j-dict-select-tag type="list" v-decorator="['sourceCapital',validatorRules.sourceCapital]" |
|
|
|
|
:trigger-change="true" dictCode="source_capital" |
|
|
|
|
placeholder="请选择资金来源"/> |
|
|
|
|
</a-form-item> |
|
|
|
|
</a-col> |
|
|
|
|
<a-col :span="8" v-show="isIfDirect"> |
|
|
|
|
<a-col :span="8" v-if="isIfDirect"> |
|
|
|
|
<a-form-item label="是否属于直达物资" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
|
|
|
|
<j-dict-select-tag type="list" v-decorator="['ifDirect',validatorRules.ifDirect]" |
|
|
|
|
:trigger-change="true" dictCode="if_status" |
|
|
|
|
placeholder="请选择是否属于直达物资" @change="selectChang"/> |
|
|
|
|
</a-form-item> |
|
|
|
|
</a-col> |
|
|
|
|
<a-col :span="8" v-show="isIfInspection"> |
|
|
|
|
<a-col :span="8" v-if="isIfInspection"> |
|
|
|
|
<a-form-item label="是否需要送检" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
|
|
|
|
<j-dict-select-tag type="list" v-decorator="['ifInspection',validatorRules.ifInspection]" |
|
|
|
|
:trigger-change="true" dictCode="if_status" |
|
|
|
|
@ -593,6 +593,10 @@
|
|
|
|
|
// 'blur'是鼠标失去焦点的时候会触发验证 |
|
|
|
|
materialType: { rules: [{ required: true, message: '请选择物资类型!' }] }, |
|
|
|
|
needTime: { rules: [{ required: true, message: '请选择需求时间!' }] }, |
|
|
|
|
ifDirect: { rules: [{ required: true, message: '请选择物资到达类型!' }] }, |
|
|
|
|
sourceCapital: { rules: [{ required: true, message: '请选择资金来源!' }] }, |
|
|
|
|
planType: { rules: [{ required: true, message: '请选择采购类型!' }] }, |
|
|
|
|
ifInspection: { rules: [{ required: true, message: '请选择是否送检!' }] }, |
|
|
|
|
processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }, |
|
|
|
|
sort: { |
|
|
|
|
rules: [{ required: true, type: 'number', max: 999999999999, message: '请输入序号!(0 ~ 12个数字)' } |
|
|
|
|
@ -1686,7 +1690,7 @@
|
|
|
|
|
// }, |
|
|
|
|
//渲染流程表单数据 |
|
|
|
|
showFlowData() { |
|
|
|
|
console.log(this.formBpm, '----------****') |
|
|
|
|
// console.log(this.formBpm, '----------****') |
|
|
|
|
if (this.formBpm === true) { |
|
|
|
|
let params = { id: this.formData.dataId } |
|
|
|
|
getAction(this.url.queryById, params).then((res) => { |
|
|
|
|
@ -1721,7 +1725,7 @@
|
|
|
|
|
this.handleSubmit(true) |
|
|
|
|
}, |
|
|
|
|
// handler |
|
|
|
|
handleSubmit(e) { |
|
|
|
|
handleSubmit(e) { |
|
|
|
|
this.getAllTable().then(tables => { |
|
|
|
|
return validateFormAndTables(this.form, tables) |
|
|
|
|
}).then(allValues => { |
|
|
|
|
@ -1762,8 +1766,8 @@
|
|
|
|
|
this.$message.error('需求时间不能小于当前流程发起时间') |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
console.log(formData, '表单数据') |
|
|
|
|
console.log(this.opinion, '流程说明') |
|
|
|
|
// console.log(formData, '表单数据') |
|
|
|
|
// console.log(this.opinion, '流程说明') |
|
|
|
|
this.form.validateFields((err, values) => { |
|
|
|
|
if (!err) { |
|
|
|
|
formData.procDefId = this.processData.id |
|
|
|
|
@ -1778,7 +1782,7 @@
|
|
|
|
|
method = 'put' |
|
|
|
|
} |
|
|
|
|
if (formData.planType == 1 && formData.materialType != 6) { |
|
|
|
|
console.log('格式化后的数据', formData) |
|
|
|
|
// console.log('格式化后的数据', formData) |
|
|
|
|
if (formData.ifDirect == null && this.routePlanName == '采购员') { |
|
|
|
|
this.$message.error('请选择是否属于直达物资!') |
|
|
|
|
return |
|
|
|
|
@ -1794,6 +1798,9 @@
|
|
|
|
|
if (e==true){ |
|
|
|
|
this.passTask() |
|
|
|
|
} |
|
|
|
|
formData.ifDirect = parseInt(formData.ifDirect); |
|
|
|
|
formData.sourceCapital = parseInt(formData.sourceCapital); |
|
|
|
|
formData.planType = parseInt(formData.planType); |
|
|
|
|
console.log(formData, '格式化的数据') |
|
|
|
|
if (this.btndisabled === false) { |
|
|
|
|
this.btndisabled = true |
|
|
|
|
|
