|
|
|
|
@ -84,8 +84,8 @@
|
|
|
|
|
<script> |
|
|
|
|
|
|
|
|
|
import pick from 'lodash.pick' |
|
|
|
|
import { getAction } from '@/api/manage' |
|
|
|
|
import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil' |
|
|
|
|
import { getAction,httpAction } from '@/api/manage' |
|
|
|
|
import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil' |
|
|
|
|
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' |
|
|
|
|
import { validateDuplicateValue } from '@/utils/util' |
|
|
|
|
import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany' |
|
|
|
|
@ -309,6 +309,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
|
|
|
|
|
] |
|
|
|
|
}, |
|
|
|
|
url: { |
|
|
|
|
getForm:'/actBusiness/getForm', |
|
|
|
|
add: "/hy/processMaterialWarehousing/add", |
|
|
|
|
edit: "/hy/processMaterialWarehousing/edit", |
|
|
|
|
queryById: "/hy/processMaterialWarehousing/queryById", |
|
|
|
|
@ -388,9 +389,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
|
|
|
|
|
formData.tableName = r.tableName; |
|
|
|
|
this.data = formData; |
|
|
|
|
console.log("表单回显数据",this.data) |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.form.setFieldsValue(pick(this.data,'name')) |
|
|
|
|
}); |
|
|
|
|
this.editAfter(); |
|
|
|
|
this.btndisabled = false; |
|
|
|
|
}else { |
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
@ -410,34 +409,44 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
|
|
|
|
|
this.$emit('backTask') |
|
|
|
|
}, |
|
|
|
|
handleSubmit (e) { |
|
|
|
|
e.preventDefault() |
|
|
|
|
this.form.validateFields((err, values) => { |
|
|
|
|
if (!err) { |
|
|
|
|
let formData = Object.assign(this.data||{}, values) |
|
|
|
|
formData.procDefId = this.processData.id; |
|
|
|
|
formData.procDeTitle = this.processData.name; |
|
|
|
|
if (!formData.tableName)formData.tableName = this.processData.businessTable; |
|
|
|
|
formData.filedNames = _.keys(values).join(","); |
|
|
|
|
console.log('formData', values) |
|
|
|
|
|
|
|
|
|
var url = this.url.addApply; |
|
|
|
|
if (!this.isNew){ |
|
|
|
|
url = this.url.editForm; |
|
|
|
|
} |
|
|
|
|
this.btndisabled = true; |
|
|
|
|
this.postFormAction(url,formData).then((res)=>{ |
|
|
|
|
if (res.success){ |
|
|
|
|
this.$message.success("保存成功！") |
|
|
|
|
//todo 将表单的数据传给父组件 |
|
|
|
|
this.$emit('afterSubmit',formData) |
|
|
|
|
}else { |
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
} |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
this.btndisabled = false; |
|
|
|
|
}) |
|
|
|
|
this.getAllTable().then(tables => { |
|
|
|
|
return validateFormAndTables(this.form, tables) |
|
|
|
|
}).then(allValues=>{ |
|
|
|
|
console.log('所有数据',allValues) |
|
|
|
|
if (typeof this.classifyIntoFormData !== 'function') { |
|
|
|
|
throw this.throwNotFunction('classifyIntoFormData') |
|
|
|
|
} |
|
|
|
|
let formData = this.classifyIntoFormData(allValues) |
|
|
|
|
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; |
|
|
|
|
console.log('格式化后的数据',formData) |
|
|
|
|
var url = this.url.add; |
|
|
|
|
let method='post'; |
|
|
|
|
if (!this.isNew){ |
|
|
|
|
url = this.url.edit; |
|
|
|
|
method='put'; |
|
|
|
|
} |
|
|
|
|
console.log('提交方法',method) |
|
|
|
|
this.btndisabled = true; |
|
|
|
|
httpAction(url,formData,method).then((res)=>{ |
|
|
|
|
if (res.success){ |
|
|
|
|
this.$message.success("保存成功！") |
|
|
|
|
//todo 将表单的数据传给父组件 |
|
|
|
|
this.$emit('afterSubmit',formData) |
|
|
|
|
}else { |
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
} |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
this.btndisabled = false; |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
addBefore(){ |
|
|
|
|
this.form.resetFields() |
|
|
|
|
@ -449,13 +458,13 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
|
|
|
|
|
}, |
|
|
|
|
/** 调用完edit()方法之后会自动调用此方法 */ |
|
|
|
|
editAfter() { |
|
|
|
|
let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId') |
|
|
|
|
let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId') |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.form.setFieldsValue(fieldval) |
|
|
|
|
}) |
|
|
|
|
// 加载子表数据 |
|
|
|
|
if (this.model.id) { |
|
|
|
|
let params = { id: this.model.id } |
|
|
|
|
if (this.data.id) { |
|
|
|
|
let params = { id: this.data.id } |
|
|
|
|
this.requestSubTableData(this.url.processMaterialWarehousingList.list, params, this.processMaterialWarehousingListTable) |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
long
2 years ago