|
|
|
|
@ -38,7 +38,9 @@
|
|
|
|
|
</a-col> |
|
|
|
|
<a-col :span="8"> |
|
|
|
|
<a-form-item label="关联出库流程" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
|
|
|
|
<h-delivery v-decorator="['processOutflowId',validatorRules.processOutflowId]" code="demo" field="name" orgFields="name" @mounted="getPlanList" @callType="getcallType" destFields="name":multi="true"/> |
|
|
|
|
<h-delivery v-decorator="['processOutflowId',validatorRules.processOutflowId]" code="demo" field="name" |
|
|
|
|
orgFields="name" @mounted="getPlanList" @callType="getcallType" destFields="name" |
|
|
|
|
:multi="true"/> |
|
|
|
|
</a-form-item> |
|
|
|
|
</a-col> |
|
|
|
|
<a-col :span="8"> |
|
|
|
|
@ -64,11 +66,11 @@
|
|
|
|
|
:actionButton="true"/> |
|
|
|
|
</a-tab-pane> |
|
|
|
|
</a-tabs> |
|
|
|
|
<j-form-container > |
|
|
|
|
<j-form-container> |
|
|
|
|
<a-form :form="form"> |
|
|
|
|
<a-row> |
|
|
|
|
<a-col :span="24" > |
|
|
|
|
<a-form-item label="流程说明" > |
|
|
|
|
<a-col :span="24"> |
|
|
|
|
<a-form-item label="流程说明"> |
|
|
|
|
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor> |
|
|
|
|
<!--<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />--> |
|
|
|
|
</a-form-item> |
|
|
|
|
@ -79,7 +81,8 @@
|
|
|
|
|
<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"> |
|
|
|
|
@ -141,7 +144,7 @@
|
|
|
|
|
// 新增时子表默认添加几行空数据 |
|
|
|
|
addDefaultRowNum: 1, |
|
|
|
|
processOutflowId: '', |
|
|
|
|
describes:'', |
|
|
|
|
describes: '', |
|
|
|
|
refKeys: ['processSmaterialsScrapList'], |
|
|
|
|
tableKeys: ['processSmaterialsScrapList'], |
|
|
|
|
activeKey: 'processSmaterialsScrapList', |
|
|
|
|
@ -259,7 +262,7 @@
|
|
|
|
|
addScrapApply: '/hy/processSmaterialsScrap/addScrapApply', |
|
|
|
|
editScrapApply: '/hy/processSmaterialsScrap/editScrapApply', |
|
|
|
|
queryById: '/hy/processSmaterialsScrap/queryById', |
|
|
|
|
list:"/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId", |
|
|
|
|
list: '/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId', |
|
|
|
|
processSmaterialsScrapList: { |
|
|
|
|
list: '/hy/processSmaterialsScrap/queryProcessSmaterialsScrapListByMainId' |
|
|
|
|
} |
|
|
|
|
@ -267,10 +270,10 @@
|
|
|
|
|
btndisabled: false, |
|
|
|
|
validatorRules: { |
|
|
|
|
// 'blur'是鼠标失去焦点的时候会触发验证 |
|
|
|
|
processOutflowId: {rules: [{ required: true, message: '关联出库流程不能为空!' }]}, |
|
|
|
|
processReturnId: {rules:[{ required: true, message: '关联归还流程不能为空!' }]}, |
|
|
|
|
processPlan: {rules:[ { required: true, message: '请选择流程计划!'}]} |
|
|
|
|
}, |
|
|
|
|
processOutflowId: { rules: [{ required: true, message: '关联出库流程不能为空!' }] }, |
|
|
|
|
processReturnId: { rules: [{ required: true, message: '关联归还流程不能为空!' }] }, |
|
|
|
|
processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] } |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
props: { |
|
|
|
|
@ -338,8 +341,8 @@
|
|
|
|
|
console.log(userInfo) |
|
|
|
|
// userInfo.company=company; |
|
|
|
|
this.popupCallback(company, userInfo) |
|
|
|
|
if (!this.isNew){ |
|
|
|
|
this.init(); |
|
|
|
|
if (!this.isNew) { |
|
|
|
|
this.init() |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
@ -368,9 +371,9 @@
|
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
getPlanList(id){ |
|
|
|
|
let params={} |
|
|
|
|
params.id=id; |
|
|
|
|
getPlanList(id) { |
|
|
|
|
let params = {} |
|
|
|
|
params.id = id |
|
|
|
|
this.requestSubTableData(this.url.list, params, this.processSmaterialsScrapListTable) |
|
|
|
|
}, |
|
|
|
|
close() { |
|
|
|
|
@ -389,56 +392,47 @@
|
|
|
|
|
applySubmit(e) { |
|
|
|
|
this.getAllTable().then(tables => { |
|
|
|
|
return validateFormAndTables(this.form, tables) |
|
|
|
|
}).then(allValues=>{ |
|
|
|
|
}).then(allValues => { |
|
|
|
|
console.log('所有数据', allValues) |
|
|
|
|
if (typeof this.classifyIntoFormData !== 'function') { |
|
|
|
|
throw this.throwNotFunction('classifyIntoFormData') |
|
|
|
|
} |
|
|
|
|
let formData = this.classifyIntoFormData(allValues) |
|
|
|
|
//计算总价 |
|
|
|
|
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 |
|
|
|
|
for (let i = 0; i < formData.processSmaterialsScrapListList.length; i++) { |
|
|
|
|
if (i == 0) { |
|
|
|
|
this.describes = formData.processSmaterialsScrapListList[i].materialName |
|
|
|
|
} else { |
|
|
|
|
this.describes = this.describes + '---' + formData.processSmaterialsScrapListList[i].materialName |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
formData.describes = this.describes |
|
|
|
|
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; |
|
|
|
|
} |
|
|
|
|
console.log(this.materialAmount,'采购总价') |
|
|
|
|
|
|
|
|
|
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; |
|
|
|
|
var url = this.url.addScrapApply; |
|
|
|
|
let method='post'; |
|
|
|
|
if (!this.isNew){ |
|
|
|
|
url = this.url.editScrapApply; |
|
|
|
|
method='put'; |
|
|
|
|
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' |
|
|
|
|
} |
|
|
|
|
this.btndisabled = true; |
|
|
|
|
console.log(formData,'表单数据') |
|
|
|
|
httpAction(url,formData,method).then((res)=>{ |
|
|
|
|
if (res.success){ |
|
|
|
|
//this.$message.success("保存成功！") |
|
|
|
|
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.close(); |
|
|
|
|
} else { |
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
} |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
this.btndisabled = false; |
|
|
|
|
}).finally(() => { |
|
|
|
|
this.btndisabled = false |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
@ -455,13 +449,13 @@
|
|
|
|
|
} |
|
|
|
|
let formData = this.classifyIntoFormData(allValues) |
|
|
|
|
for (let i = 0; i < formData.processSmaterialsScrapListList.length; i++) { |
|
|
|
|
if (i==0){ |
|
|
|
|
this.describes=formData.processSmaterialsScrapListList[i].materialName |
|
|
|
|
}else { |
|
|
|
|
this.describes=this.describes+"---"+formData.processSmaterialsScrapListList[i].materialName |
|
|
|
|
if (i == 0) { |
|
|
|
|
this.describes = formData.processSmaterialsScrapListList[i].materialName |
|
|
|
|
} else { |
|
|
|
|
this.describes = this.describes + '---' + formData.processSmaterialsScrapListList[i].materialName |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
formData.describes=this.describes; |
|
|
|
|
formData.describes = this.describes |
|
|
|
|
formData.fileId = getStringArry(formData.fileId) |
|
|
|
|
|
|
|
|
|
this.form.validateFields((err, values) => { |
|
|
|
|
@ -495,10 +489,10 @@
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
getcallType(type){ |
|
|
|
|
this.data.materialType = type.materialType; |
|
|
|
|
this.data.processOutflowId=type.id |
|
|
|
|
let fieldval =pick(this.data,'materialType','processOutflowId') |
|
|
|
|
getcallType(type) { |
|
|
|
|
this.data.materialType = type.materialType |
|
|
|
|
this.data.processOutflowId = type.id |
|
|
|
|
let fieldval = pick(this.data, 'materialType', 'processOutflowId') |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.form.setFieldsValue(fieldval) |
|
|
|
|
}) |
|
|
|
|
@ -518,8 +512,8 @@
|
|
|
|
|
this.data = getRecord(this.data) |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
console.log('000000000000>',this.data) |
|
|
|
|
let fieldval = pick(this.data, 'id', 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processOutflowId', 'fileId','opinion') |
|
|
|
|
console.log('000000000000>', this.data) |
|
|
|
|
let fieldval = pick(this.data, 'id', 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processOutflowId', 'fileId', 'opinion') |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.form.setFieldsValue(fieldval) |
|
|
|
|
}) |
|
|
|
|
|
long
2 years ago