java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

分开保存并通过

dev
long 2 years ago
parent
2a7f611404
commit
1b8fed01f6
1 changed files with 93 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 186
      src/views/activiti/form/ProcessUdgetPlanForm.vue

186
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -103,7 +103,7 @@
:isabled="isabled" :isabled="isabled"
:rowSelection="true" :rowSelection="true"
:actionButton="true" :actionButton="true"
@shifu = "shifu" @shifu="shifu"
@descriptionFetch="fetchMerchandiseNews" @descriptionFetch="fetchMerchandiseNews"
> >
<template v-slot:action="props"> <template v-slot:action="props">
@ -148,7 +148,9 @@
</a-form-item> </a-form-item>
</div> </div>
<a-form-item v-if="isPlanType" :wrapperCol="{ span: 24 }" style="text-align: center"> <a-form-item v-if="isPlanType" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="saveAndpassTask">保存并通过</a-button>
<a-button type="primary" @click="handleSubmit">保存</a-button>
<a-button style="margin-left: 8px" type="primary" @click="saveAndpassTask">通过</a-button>
<!-- <a-button type="primary" @click="ewrold">下载</a-button>--> <!-- <a-button type="primary" @click="ewrold">下载</a-button>-->
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button> <a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item> </a-form-item>
@ -231,7 +233,7 @@
// columns, // columns,
// editingKey: '', // editingKey: '',
isabled: true, isabled: true,
isGetOneAndLast:false, isGetOneAndLast: false,
bigId: [], bigId: [],
opinion: '', opinion: '',
bigIdRake: [], bigIdRake: [],
@ -514,14 +516,15 @@
materialType: { rules: [{ required: true, message: '请选择物资类型!' }] }, materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
needTime: { rules: [{ required: true, message: '请选择需求时间!' }] }, needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }, processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] },
sort: { rules: [{ required: true, type:'number', max:999999999999, message: '请输入序号!(0 ~ 12个数字)'}, sort: {
// { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'} rules: [{ required: true, type: 'number', max: 999999999999, message: '请输入序号!(0 ~ 12个数字)' }
// {validator: this.lengthCheck} // { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'}
] // {validator: this.lengthCheck}
]
} }
}, },
isBu: undefined, isBu: undefined,
isShifu:false isShifu: false
} }
}, },
props: { props: {
@ -538,9 +541,9 @@
/*是否处理流程*/ /*是否处理流程*/
task: { type: Boolean, default: false, required: false }, task: { type: Boolean, default: false, required: false },
/*采购类型*/ /*采购类型*/
isPlanType: {type: Boolean, default: false, required: false}, isPlanType: { type: Boolean, default: false, required: false },
/*资金来源*/ /*资金来源*/
isSourceCapital:{type: Boolean, default: false, required: false}, isSourceCapital: { type: Boolean, default: false, required: false },
//流程表单data //流程表单data
formData: { formData: {
type: Object, type: Object,
@ -597,8 +600,8 @@
created() { created() {
//如果是流程中表单，则需要加载流程表单data //如果是流程中表单，则需要加载流程表单data
//this.showFlowData() //this.showFlowData()
if (!this.isPlanType){ if (!this.isPlanType) {
this.isGetOneAndLast=true; this.isGetOneAndLast = true
} }
this.getAllTable() this.getAllTable()
@ -609,7 +612,7 @@
this.init() this.init()
// this.isSourceCapital=true; // this.isSourceCapital=true;
// this.isPlanType=true; // this.isPlanType=true;
}else { } else {
this.popupCallback(company, userInfo) this.popupCallback(company, userInfo)
} }
// this.descriptionFetchDatas(); // this.descriptionFetchDatas();
@ -620,18 +623,18 @@
// this.form.setFieldsValue("materialGroup",123123); // this.form.setFieldsValue("materialGroup",123123);
}, },
methods: { methods: {
lengthCheck(rule, value, callback){ lengthCheck(rule, value, callback) {
if (value.toString().length >= 12 ){ if (value.toString().length >= 12) {
// console.log("长度太长了"); // console.log("长度太长了");
callback("长度应当在0 ~ 12 字符") callback('长度应当在0 ~ 12 字符')
} }
}, },
selectRowChange(a, b, c) { selectRowChange(a, b, c) {
// console.log("执行了",a,b,c); // console.log("执行了",a,b,c);
}, },
shifu(){ shifu() {
console.log("执行了"); console.log('执行了')
this.isShifu = true; this.isShifu = true
}, },
// handleChange(value, key, column) { // handleChange(value, key, column) {
@ -680,8 +683,8 @@
this.hiegs = false this.hiegs = false
// this.fetchData(); // this.fetchData();
// this.fetchDataRake() // this.fetchDataRake()
this.assigneesText = val; this.assigneesText = val
this.fetchMerchandiseNews(); this.fetchMerchandiseNews()
} }
}, },
//物料组选择触发 //物料组选择触发
@ -778,8 +781,8 @@
} }
}, },
//table 值改变触发 //table 值改变触发
async onSelect (record) { async onSelect(record) {
let isEr = true let isEr = true
// if (!!record.row.materialGroup) { // if (!!record.row.materialGroup) {
@ -811,22 +814,22 @@
// } // }
// console.log("5555出发了",record.row); // console.log("5555出发了",record.row);
// if ( !!record.row.materialNumber && isEr) { // if ( !!record.row.materialNumber && isEr) {
let b = false; let b = false
if(this.isShifu){ if (this.isShifu) {
// console.log("0出发了",record); // console.log("0出发了",record);
for (const res of this.bigIdMerchandiseNewsList) { for (const res of this.bigIdMerchandiseNewsList) {
if(res.id === record.row.materialNumber ){ if (res.id === record.row.materialNumber) {
b = true; b = true
} }
} }
if(!b){ if (!b) {
// console.log("进来了111"); // 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.column.key !== 'materialPrice' && record.column.key !== 'materialQuantity') {
if ( !!record.row.materialNumber && this.isBu !== record.row.materialNumber ) { if (!!record.row.materialNumber && this.isBu !== record.row.materialNumber) {
// console.log("2出发了"); // console.log("2出发了");
let materialName = {} let materialName = {}
this.bigIdMerchandiseNewsList.forEach(item => { this.bigIdMerchandiseNewsList.forEach(item => {
@ -839,12 +842,12 @@
descriptionId: item.descriptionId descriptionId: item.descriptionId
} }
this.form.setFieldsValue({ this.form.setFieldsValue({
putUnder: item.materialDepart, putUnder: item.materialDepart
}) })
} }
}) })
if (!!record.row.id && Object.keys(materialName).length > 0 ) { if (!!record.row.id && Object.keys(materialName).length > 0) {
await this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => { await this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
// console.log("bbbbbbbbbbbbbb",b) // console.log("bbbbbbbbbbbbbb",b)
b.forEach(item => { b.forEach(item => {
@ -866,14 +869,13 @@
] ]
// console.log("sadf1111") // console.log("sadf1111")
this.$refs.processUdgetPlanMaterial.setValues(values) this.$refs.processUdgetPlanMaterial.setValues(values)
return ; return
} }
}) })
}) })
this.processUdgetPlanMaterialTable.columns[0].options.push({ this.processUdgetPlanMaterialTable.columns[0].options.push({
title: materialName.materialClassify, title: materialName.materialClassify,
value: materialName.descriptionId value: materialName.descriptionId
@ -893,22 +895,18 @@
} }
] ]
this.$refs.processUdgetPlanMaterial.setValues(values) this.$refs.processUdgetPlanMaterial.setValues(values)
this.isBu = record.row.materialNumber; this.isBu = record.row.materialNumber
isEr = false isEr = false
} }
} }
} }
if (!!record.row.materialQuantity && !!record.row.materialPrice && isEr) {
if (!!record.row.materialQuantity && !!record.row.materialPrice && isEr ) {
// record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice; // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
// console.log("3出发了"); // console.log("3出发了");
//如果单价大于5万 //如果单价大于5万
if (record.row.materialPrice > 50000) { if (record.row.materialPrice > 50000) {
this.materialPrice = record.row.materialPrice this.materialPrice = record.row.materialPrice
console.log("record.row.materialPrice ",)
console.log(record.row.materialPrice)
} }
//回填数据 //回填数据
if (record.row.id !== undefined) { if (record.row.id !== undefined) {
@ -933,16 +931,16 @@
} }
}, },
fetchMerchandiseNews(value,id) { //查询物料清单信息 fetchMerchandiseNews(value, id) { //查询物料清单信息
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject) => {
//查询大品类数据 //查询大品类数据
let par = { let par = {
delFlag: 0, delFlag: 0,
descriptionId: value, descriptionId: value,
id:id id: id
} }
if(!!this.assigneesText){ if (!!this.assigneesText) {
par.materialType = this.assigneesText; par.materialType = this.assigneesText
} }
this.bigIdMerchandiseNews = [] this.bigIdMerchandiseNews = []
this.bigIdMerchandiseNewsList = [] this.bigIdMerchandiseNewsList = []
@ -951,14 +949,14 @@
if (this.processUdgetPlanMaterialTable.columns[1].options.length > 0) { if (this.processUdgetPlanMaterialTable.columns[1].options.length > 0) {
this.processUdgetPlanMaterialTable.columns[1].options = [] this.processUdgetPlanMaterialTable.columns[1].options = []
} }
this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => { this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
b.forEach(item => { b.forEach(item => {
if (item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null) { if (item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null) {
numberList.push(item.materialNumber) numberList.push(item.materialNumber)
} }
})
}) })
})
getAction(this.url.merchandiseNewsList, par).then((res) => { getAction(this.url.merchandiseNewsList, par).then((res) => {
// console.log('12312', res.result) // console.log('12312', res.result)
// console.log('12312') // console.log('12312')
@ -993,12 +991,12 @@
}) })
}) })
} }
this.bigIdMerchandiseNewsList = res.result; this.bigIdMerchandiseNewsList = res.result
// resolve( this.bigIdMerchandiseNewsList ); // resolve( this.bigIdMerchandiseNewsList );
} }
resolve( this.bigIdMerchandiseNewsList ); resolve(this.bigIdMerchandiseNewsList)
}) })
}); })
}, },
// fetchMerchandiseNews(value){ //查询物料清单信息 // fetchMerchandiseNews(value){ //查询物料清单信息
@ -1168,11 +1166,9 @@
} }
} }
formData.fileId = getStringArry(formData.fileId) formData.fileId = getStringArry(formData.fileId)
if (this.materialPrice!=0){ if (this.materialPrice != 0 && this.materialPrice != null) {
if (this.materialPrice!=0){ formData.materialPrice = this.materialPrice
formData.materialPrice = this.materialPrice }
}
}
formData.describes = this.describes formData.describes = this.describes
if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) { if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) {
this.$message.error('需求时间不能小于当前流程发起时间') this.$message.error('需求时间不能小于当前流程发起时间')
@ -1186,7 +1182,7 @@
formData.procDeTitle = this.processData.name formData.procDeTitle = this.processData.name
formData.title = this.processData.description formData.title = this.processData.description
//formData.sourceCapital //formData.sourceCapital
console.log("this.planType++",this.planType) console.log('this.planType++', this.planType)
if (!formData.tableName) formData.tableName = this.processData.businessTable if (!formData.tableName) formData.tableName = this.processData.businessTable
var url = this.url.addFromTableApply var url = this.url.addFromTableApply
let method = 'post' let method = 'post'
@ -1201,19 +1197,19 @@
formData.processInstanceId = this.processData.id formData.processInstanceId = this.processData.id
} }
console.log(formData, '表单数据') console.log(formData, '表单数据')
if(this.btndisabled === false){ if (this.btndisabled === false) {
this.btndisabled = true this.btndisabled = true
httpAction(url,formData,method).then((res)=>{ httpAction(url, formData, method).then((res) => {
if (res.success){ if (res.success) {
this.$message.success("提交申请成功！") this.$message.success('提交申请成功！')
//todo 将表单的数据传给父组件 //todo 将表单的数据传给父组件
this.$emit('loadData') this.$emit('loadData')
this.close(); this.close()
}else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }
}).finally(()=>{ }).finally(() => {
this.btndisabled = false; this.btndisabled = false
}) })
} }
} }
@ -1240,9 +1236,9 @@
} }
console.log(this.data, '数据回显') console.log(this.data, '数据回显')
let fieldval = pick(this.data, 'id','planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime','sort', 'orderNumber', 'fileId', 'opinion','sourceCapital') let fieldval = pick(this.data, 'id', 'planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime', 'sort', 'orderNumber', 'fileId', 'opinion', 'sourceCapital')
this.$nextTick(() => { this.$nextTick(() => {
this.assigneesText=this.data.materialType; this.assigneesText = this.data.materialType
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })
// 加载子表数据 // 加载子表数据
@ -1254,13 +1250,13 @@
} }
}, },
descriptionId(val){ descriptionId(val) {
let pam = { let pam = {
id: val id: val
} }
getAction(this.url.descriptionRakeUrlId,pam).then(res =>{ getAction(this.url.descriptionRakeUrlId, pam).then(res => {
if(res.success){ if (res.success) {
this.processUdgetPlanMaterialTable.columns[0].options.push({ this.processUdgetPlanMaterialTable.columns[0].options.push({
title: res.result.materialClassify, title: res.result.materialClassify,
value: res.result.id value: res.result.id
@ -1291,8 +1287,7 @@
for (let i = 0; i < this.listId.length; i++) { for (let i = 0; i < this.listId.length; i++) {
// console.log(this.listId[i])\ // console.log(this.listId[i])\
this.descriptionId(this.listId[i]); this.descriptionId(this.listId[i])
this.fetchMerchandiseNews(this.listId[i]) this.fetchMerchandiseNews(this.listId[i])
} }
@ -1344,21 +1339,20 @@
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })
}, },
saveAndpassTask(){ saveAndpassTask() {
this.getAllTable().then(tables => { this.getAllTable().then(tables => {
return validateFormAndTables(this.form, tables) return validateFormAndTables(this.form, tables)
}).then(allValues => { }).then(allValues => {
let formData = this.classifyIntoFormData(allValues) let formData = this.classifyIntoFormData(allValues)
if (this.isPlanType){ if (this.isPlanType) {
if (!formData.planType){ if (!formData.planType) {
this.$message.error('请选择采购类型') this.$message.error('请选择采购类型')
return return
}else { } else {
this.handleSubmit(); this.passTask()
this.passTask();
} }
} }
}); })
}, },
// handler // handler
handleSubmit(e) { handleSubmit(e) {
@ -1376,8 +1370,14 @@
this.describes = this.describes + '---' + formData.processUdgetPlanMaterialList[i].materialName this.describes = this.describes + '---' + formData.processUdgetPlanMaterialList[i].materialName
} }
} }
if (this.isPlanType) {
if (!formData.planType) {
this.$message.error('请选择采购类型')
return
}
}
formData.fileId = getStringArry(formData.fileId) formData.fileId = getStringArry(formData.fileId)
if (this.materialPrice!=0){ if (this.materialPrice != 0 && this.materialPrice != null) {
formData.materialPrice = this.materialPrice formData.materialPrice = this.materialPrice
} }
formData.describes = this.describes formData.describes = this.describes
@ -1407,18 +1407,18 @@
method = 'put' method = 'put'
} }
console.log(formData, '格式化的数据') console.log(formData, '格式化的数据')
if(this.btndisabled === false){ if (this.btndisabled === false) {
this.btndisabled = true this.btndisabled = true
httpAction(url,formData,method).then((res)=>{ httpAction(url, formData, method).then((res) => {
if (res.success){ if (res.success) {
//this.$message.success("保存成功！") //this.$message.success("保存成功！")
//todo 将表单的数据传给父组件 //todo 将表单的数据传给父组件
this.$emit('afterSubmit',formData) this.$emit('afterSubmit', formData)
}else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }
}).finally(()=>{ }).finally(() => {
this.btndisabled = false; this.btndisabled = false
}) })
} }
} }

Write Preview
Loading…
Cancel
Save