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

防止重复

dev
kilo 2 years ago
parent
8b7613675e
commit
3f4b0f096e
6 changed files with 229 additions and 202 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. 54
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  2. 54
      src/views/activiti/form/ProcessMaterialsAllotForm.vue
  3. 56
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
  4. 46
      src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
  5. 54
      src/views/activiti/form/ProcessSmaterialsScrapForm.vue
  6. 167
      src/views/activiti/form/ProcessUdgetPlanForm.vue

54
src/views/activiti/form/ProcessMaterialWarehousingForm.vue
Unescape View File

@ -504,19 +504,21 @@
formData.title = this.processData.title formData.title = this.processData.title
formData.processInstanceId = this.processData.id formData.processInstanceId = this.processData.id
} }
this.btndisabled = true if(this.btndisabled === false){
httpAction(url, formData, method).then((res) => { this.btndisabled = true
if (res.success) { httpAction(url, formData, method).then((res) => {
this.$message.success('提交申请成功！') if (res.success) {
//todo 将表单的数据传给父组件 this.$message.success('提交申请成功！')
this.$emit('loadData') //todo 将表单的数据传给父组件
this.close() this.$emit('loadData')
} else { this.close()
this.$message.error(res.message) } else {
} this.$message.error(res.message)
}).finally(() => { }
this.btndisabled = false }).finally(() => {
}) this.btndisabled = false
})
}
} }
}) })
}) })
@ -562,18 +564,20 @@
method = 'put' method = 'put'
} }
console.log('格式化后的数据', formData) console.log('格式化后的数据', formData)
this.btndisabled = true if(this.btndisabled === false){
httpAction(url, formData, method).then((res) => { this.btndisabled = true
if (res.success) { httpAction(url, formData, method).then((res) => {
//this.$message.success('保存成功！') if (res.success) {
//todo 将表单的数据传给父组件 //this.$message.success('保存成功！')
this.$emit('afterSubmit', formData) //todo 将表单的数据传给父组件
} else { this.$emit('afterSubmit', formData)
this.$message.error(res.message) } else {
} this.$message.error(res.message)
}).finally(() => { }
this.btndisabled = false }).finally(() => {
}) this.btndisabled = false
})
}
} }
}) })
}) })

54
src/views/activiti/form/ProcessMaterialsAllotForm.vue
Unescape View File

@ -811,19 +811,21 @@
} }
} }
console.log('提交方法', method) console.log('提交方法', method)
this.btndisabled = true if(this.btndisabled === false){
httpAction(url, formData, method).then((res) => { this.btndisabled = true
if (res.success) { httpAction(url, formData, method).then((res) => {
this.$message.success('提交申请成功！') if (res.success) {
//todo 将表单的数据传给父组件 this.$message.success('提交申请成功！')
this.$emit('loadData') //todo 将表单的数据传给父组件
this.close() this.$emit('loadData')
} else { this.close()
this.$message.error(res.message) } else {
} this.$message.error(res.message)
}).finally(() => { }
this.btndisabled = false }).finally(() => {
}) this.btndisabled = false
})
}
} }
}) })
}) })
@ -870,18 +872,20 @@
method = 'put' method = 'put'
} }
console.log('提交方法', method) console.log('提交方法', method)
this.btndisabled = true if (this.btndisabled === false){
httpAction(url, formData, method).then((res) => { this.btndisabled = true
if (res.success) { httpAction(url, formData, method).then((res) => {
this.$message.success('保存成功！') if (res.success) {
//todo 将表单的数据传给父组件 this.$message.success('保存成功！')
this.$emit('afterSubmit', formData) //todo 将表单的数据传给父组件
} else { this.$emit('afterSubmit', formData)
this.$message.error(res.message) } else {
} this.$message.error(res.message)
}).finally(() => { }
this.btndisabled = false }).finally(() => {
}) this.btndisabled = false
})
}
} }
}) })
}) })

56
src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
Unescape View File

@ -1312,7 +1312,7 @@
}, },
/*提交申请*/ /*提交申请*/
applySubmit(e) { applySubmit(e) {
this.getAllTable().then(tables => { this.getAllTable().then(tables => {
return validateFormAndTables(this.form, tables) return validateFormAndTables(this.form, tables)
}).then(allValues => { }).then(allValues => {
@ -1364,19 +1364,21 @@
formData.processInstanceId = this.processData.id formData.processInstanceId = this.processData.id
} }
console.log('提交方法', method) console.log('提交方法', method)
this.btndisabled = true if(this.btndisabled === false){
httpAction(url, formData, method).then((res) => { this.btndisabled = true
if (res.success) { httpAction(url, formData, method).then((res) => {
this.$message.success('提交申请成功！') if (res.success) {
//todo 将表单的数据传给父组件 this.$message.success('提交申请成功！')
this.$emit('loadData') //todo 将表单的数据传给父组件
this.close() this.$emit('loadData')
} else { this.close()
this.$message.error(res.message) } else {
} this.$message.error(res.message)
}).finally(() => { }
this.btndisabled = false }).finally(() => {
}) this.btndisabled = false
})
}
} }
}) })
}) })
@ -1429,18 +1431,20 @@
method = 'put' method = 'put'
} }
console.log('提交方法', method) console.log('提交方法', method)
this.btndisabled = true if (this.btndisabled === false){
httpAction(url, formData, method).then((res) => { this.btndisabled = true
if (res.success) { httpAction(url, formData, method).then((res) => {
//this.$message.success("保存成功！") if (res.success) {
//todo 将表单的数据传给父组件 //this.$message.success("保存成功！")
this.$emit('afterSubmit', formData) //todo 将表单的数据传给父组件
} else { this.$emit('afterSubmit', formData)
this.$message.error(res.message) } else {
} this.$message.error(res.message)
}).finally(() => { }
this.btndisabled = false }).finally(() => {
}) this.btndisabled = false
})
}
} }
}) })
}) })

46
src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
Unescape View File

@ -322,17 +322,19 @@
this.$message.error("授权开始时间不能大于授权结束时间") this.$message.error("授权开始时间不能大于授权结束时间")
return; return;
} }
this.btndisabled = true; if(this.btndisabled === false){
httpAction(httpurl,formData,method).then((res)=>{ this.btndisabled = true;
if(res.success){ httpAction(httpurl,formData,method).then((res)=>{
this.$emit('loadData') if(res.success){
this.close(); this.$emit('loadData')
}else{ this.close();
that.$message.warning(res.message); }else{
} that.$message.warning(res.message);
}).finally(() => { }
this.btndisabled = false; }).finally(() => {
}) this.btndisabled = false;
})
}
} }
}) })
@ -365,16 +367,18 @@
this.$message.error("授权开始时间不能大于授权结束时间") this.$message.error("授权开始时间不能大于授权结束时间")
return; return;
} }
this.btndisabled = true; if (this.btndisabled === false){
httpAction(httpurl,formData,method).then((res)=>{ this.btndisabled = true;
if(res.success){ httpAction(httpurl,formData,method).then((res)=>{
this.$emit('afterSubmit',formData) if(res.success){
}else{ this.$emit('afterSubmit',formData)
that.$message.warning(res.message); }else{
} that.$message.warning(res.message);
}).finally(() => { }
this.btndisabled = false; }).finally(() => {
}) this.btndisabled = false;
})
}
} }
}) })

54
src/views/activiti/form/ProcessSmaterialsScrapForm.vue
Unescape View File

@ -580,19 +580,21 @@
} }
} }
console.log('提交方法', method) console.log('提交方法', method)
this.btndisabled = true if(this.btndisabled === false){
httpAction(url, formData, method).then((res) => { this.btndisabled = true
if (res.success) { httpAction(url, formData, method).then((res) => {
this.$message.success('提交申请成功！') if (res.success) {
//todo 将表单的数据传给父组件 this.$message.success('提交申请成功！')
this.$emit('loadData') //todo 将表单的数据传给父组件
this.close(); this.$emit('loadData')
} else { this.close();
this.$message.error(res.message) } else {
} this.$message.error(res.message)
}).finally(() => { }
this.btndisabled = false }).finally(() => {
}) this.btndisabled = false
})
}
} }
}) })
}) })
@ -632,18 +634,20 @@
method = 'put' method = 'put'
} }
console.log('提交方法', method) console.log('提交方法', method)
this.btndisabled = true if(this.btndisabled === false){
httpAction(url, formData, method).then((res) => { this.btndisabled = true
if (res.success) { httpAction(url, formData, method).then((res) => {
this.$message.success('保存成功！') if (res.success) {
//todo 将表单的数据传给父组件 this.$message.success('保存成功！')
this.$emit('afterSubmit', formData) //todo 将表单的数据传给父组件
} else { this.$emit('afterSubmit', formData)
this.$message.error(res.message) } else {
} this.$message.error(res.message)
}).finally(() => { }
this.btndisabled = false }).finally(() => {
}) this.btndisabled = false
})
}
} }
}) })
}) })

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

@ -98,7 +98,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">
@ -137,7 +137,7 @@
</a-form-item> </a-form-item>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center"> <a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="passTask">通过</a-button> <a-button type="primary" @click="passTask">通过</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>
</div> </div>
@ -502,16 +502,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: { sort: { rules: [{ required: true, type:'number', max:999999999999, message: '请输入序号!(0 ~ 12个字符)'},
rules: [{ required: true, type: 'number', max: 999999999999, message: '请输入序号!(0 ~ 12个字符)' } // { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'}
// { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'} // {validator: this.lengthCheck}
// {validator: this.lengthCheck} ]
]
} }
}, },
isBu: undefined, isBu: undefined,
planType: '', planType: '',
isShifu: false isShifu:false
} }
}, },
props: { props: {
@ -585,7 +584,7 @@
immediate: true, immediate: true,
handler: function(val) { handler: function(val) {
this.planType = val this.planType = val
console.log('this.planType---', this.planType) console.log("this.planType---",this.planType)
} }
} }
}, },
@ -599,7 +598,7 @@
// userInfo.company=company; // userInfo.company=company;
if (!this.isNew) { if (!this.isNew) {
this.init() this.init()
} else { }else {
this.popupCallback(company, userInfo) this.popupCallback(company, userInfo)
} }
// this.descriptionFetchDatas(); // this.descriptionFetchDatas();
@ -610,18 +609,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) {
@ -670,7 +669,7 @@
this.hiegs = false this.hiegs = false
// this.fetchData(); // this.fetchData();
// this.fetchDataRake() // this.fetchDataRake()
this.fetchMerchandiseNews() this.fetchMerchandiseNews();
} }
}, },
//物料组选择触发 //物料组选择触发
@ -767,8 +766,8 @@
} }
}, },
//table 值改变触发 //table 值改变触发
async onSelect(record) { async onSelect (record) {
let isEr = true let isEr = true
// if (!!record.row.materialGroup) { // if (!!record.row.materialGroup) {
@ -800,22 +799,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 => {
@ -831,7 +830,7 @@
} }
}) })
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 => {
@ -853,13 +852,14 @@
] ]
// 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
@ -879,13 +879,15 @@
} }
] ]
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万
@ -915,13 +917,13 @@
} }
}, },
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
} }
this.bigIdMerchandiseNews = [] this.bigIdMerchandiseNews = []
this.bigIdMerchandiseNewsList = [] this.bigIdMerchandiseNewsList = []
@ -930,14 +932,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')
@ -972,12 +974,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){ //查询物料清单信息
@ -1076,8 +1078,8 @@
id: r.tableId id: r.tableId
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
console.log('res.result.planType--', res.result.planType) console.log("res.result.planType--",res.result.planType)
this.$emit('planType', res.result.planType) this.$emit('planType',res.result.planType)
this.planType = res.result.planType this.planType = res.result.planType
let formData = res.result let formData = res.result
formData.tableName = r.tableName formData.tableName = r.tableName
@ -1162,8 +1164,8 @@
formData.procDefId = this.processData.id formData.procDefId = this.processData.id
formData.procDeTitle = this.processData.name formData.procDeTitle = this.processData.name
formData.title = this.processData.description formData.title = this.processData.description
formData.planType = this.planType formData.planType=this.planType;
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'
@ -1177,20 +1179,22 @@
formData.title = this.processData.title formData.title = this.processData.title
formData.processInstanceId = this.processData.id formData.processInstanceId = this.processData.id
} }
this.btndisabled = true
console.log(formData, '表单数据') console.log(formData, '表单数据')
httpAction(url, formData, method).then((res) => { if(this.btndisabled === false){
if (res.success) { this.btndisabled = true
this.$message.success('提交申请成功！') httpAction(url,formData,method).then((res)=>{
//todo 将表单的数据传给父组件 if (res.success){
this.$emit('loadData') this.$message.success("提交申请成功！")
this.close() //todo 将表单的数据传给父组件
} else { this.$emit('loadData')
this.$message.error(res.message) this.close();
} }else {
}).finally(() => { this.$message.error(res.message)
this.btndisabled = false }
}) }).finally(()=>{
this.btndisabled = false;
})
}
} }
}) })
}) })
@ -1215,7 +1219,7 @@
} }
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') let fieldval = pick(this.data, 'id','planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime','sort', 'orderNumber', 'fileId', 'opinion')
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })
@ -1228,13 +1232,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
@ -1265,7 +1269,8 @@
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])
} }
@ -1347,7 +1352,7 @@
formData.procDefId = this.processData.id formData.procDefId = this.processData.id
formData.procDeTitle = this.processData.name formData.procDeTitle = this.processData.name
formData.title = this.processData.description formData.title = this.processData.description
formData.planType = this.planType formData.planType=this.planType;
if (!formData.tableName) formData.tableName = this.processData.businessTable if (!formData.tableName) formData.tableName = this.processData.businessTable
var url = this.url.add var url = this.url.add
let method = 'post' let method = 'post'
@ -1355,19 +1360,21 @@
url = this.url.edit url = this.url.edit
method = 'put' method = 'put'
} }
this.btndisabled = true
console.log(formData, '格式化的数据') console.log(formData, '格式化的数据')
httpAction(url, formData, method).then((res) => { if(this.btndisabled === false){
if (res.success) { this.btndisabled = true
//this.$message.success("保存成功！") httpAction(url,formData,method).then((res)=>{
//todo 将表单的数据传给父组件 if (res.success){
this.$emit('afterSubmit', formData) //this.$message.success("保存成功！")
} else { //todo 将表单的数据传给父组件
this.$message.error(res.message) this.$emit('afterSubmit',formData)
} }else {
}).finally(() => { this.$message.error(res.message)
this.btndisabled = false }
}) }).finally(()=>{
this.btndisabled = false;
})
}
} }
}) })
}) })

Write Preview
Loading…
Cancel
Save