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

修改流程页面

dev
caoyizhong 2 years ago
parent
7b543a7352
commit
b9f127e59e
1 changed files with 134 additions and 52 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

@ -119,6 +119,8 @@
data() { data() {
return { return {
bigId:[], bigId:[],
bigIdMerchandiseNews:[],
bigIdMerchandiseNewsList:[],
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 6 } sm: { span: 6 }
@ -156,7 +158,6 @@
width: '200px', width: '200px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
options: [], options: [],
props:{title: 'show title'}
// scopedSlots: { customRender: 'edit' },//引入的插槽 // scopedSlots: { customRender: 'edit' },//引入的插槽
// customRender:function (t,r,index) { // customRender:function (t,r,index) {
// console.log(t,r); // console.log(t,r);
@ -171,7 +172,7 @@
dictCode: '', dictCode: '',
width: '200px', width: '200px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue: '' options: [],
}, },
// { // {
// title: '物料描述', // title: '物料描述',
@ -240,7 +241,8 @@
{ {
title: '物料名称及规格型号', title: '物料名称及规格型号',
key: 'materialName', key: 'materialName',
type: FormTypes.sel_search, type: FormTypes.input,
// type: FormTypes.sel_search,
dictCode: '', dictCode: '',
width: '200px', width: '200px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
@ -249,7 +251,7 @@
{ {
title: '系列', title: '系列',
key: 'materialSeries', key: 'materialSeries',
type: FormTypes.sel_search, type: FormTypes.input,
dictCode: '', dictCode: '',
width: '200px', width: '200px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
@ -258,7 +260,8 @@
{ {
title: '单位', title: '单位',
key: 'materialUnit', key: 'materialUnit',
type: FormTypes.select, type: FormTypes.input,
// type: FormTypes.select,
dictCode: '', dictCode: '',
width: '200px', width: '200px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
@ -396,17 +399,55 @@
}, },
methods: { methods: {
onSelect(record) { onSelect(record) {
// this.$refs.processUdgetPlanMaterial.getValues((error, values) => { // console.log(record.row);
// if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber === ''){
// console.log(error, values) // console.log("执行materialGroup")
// })
console.log(record.row);
console.log(record.row.materialGroup);
if(record.row.materialGroup.length > 0){
console.log("执行l")
this.fetchMerchandiseNews(record.row.materialGroup); this.fetchMerchandiseNews(record.row.materialGroup);
} }
if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber !== ''){
// console.log("执行materialNumber")
let materialName = { }
this.bigIdMerchandiseNewsList.forEach( item => {
if( item.id === record.row.materialNumber ){
materialName ={
name: item.merchandiseName,
unit: item.materialsUnit,
}
}
})
let values = [
{
rowKey: record.row.id,
values: {
'materialNumber': record.row.materialNumber,
'materialGroup': record.row.materialGroup,
'materialSeries':"SM-JD36-BA",
'materialName': materialName.name,
'materialUnit': materialName.unit,
},
},
]
this.$refs.processUdgetPlanMaterial.setValues(values);
}
if(record.row.materialQuantity !== '' && record.row.materialPrice !== '' && record.row.materialQuantity !== undefined && record.row.materialPrice !== undefined){
// record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
let values = [
{
rowKey: record.row.id,
values: {
'materialNumber': record.row.materialNumber,
'materialGroup': record.row.materialGroup,
'materialSeries': record.row.materialSeries,
'materialName': record.row.materialName,
'materialUnit': record.row.materialUnit,
'materialAmount': record.row.materialQuantity * record.row.materialPrice
},
},
]
this.$refs.processUdgetPlanMaterial.setValues(values);
}
}, },
fetchMerchandiseNews(value){ //查询物料组 fetchMerchandiseNews(value){ //查询物料组
@ -415,16 +456,54 @@
delFlag: 0, delFlag: 0,
descriptionId:value, descriptionId:value,
} }
this.bigId = []; this.bigIdMerchandiseNews = [];
this.bigIdMerchandiseNewsList = [];
let qc = [];
let numberList = [];
if(this.processUdgetPlanMaterialTable.columns[1].options.length > 0){
this.processUdgetPlanMaterialTable.columns[1].options = [];
}
this.$refs.processUdgetPlanMaterial.getValues((a,b,c)=>{
// console.log(a,b,c)
b.forEach(item =>{
if(item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null){
numberList.push(item.materialNumber);
}
});
});
getAction(this.url.merchandiseNewsList,par).then((res)=>{ getAction(this.url.merchandiseNewsList,par).then((res)=>{
if(res.success){ if(res.success){
console.log(res.result); // console.log(res.result);
// res.result.forEach( item => { let newList = res.result;
// this.processUdgetPlanMaterialTable.columns[0].options.push({ // console.log("12312312:"+numberList.length);
// title : item.descriptionName, if(numberList.length > 0){
// value : item.id, newList.forEach( item => {
// }) qc.push({
// }) title : item.materialsNumber,
value : item.id,
disabled : false
})
})
numberList.forEach( num => {
qc.forEach( i => {
if(num === i.value){
console.log(num,i.value);
i.disabled = true;
}
});
})
this.processUdgetPlanMaterialTable.columns[1].options = qc;
}else{
newList.forEach( item => {
this.processUdgetPlanMaterialTable.columns[1].options.push({
title : item.materialsNumber,
value : item.id,
disabled : false
})
})
}
// console.log(this.processUdgetPlanMaterialTable.columns[1].options);
this.bigIdMerchandiseNewsList = res.result;
} }
}); });
}, },
@ -437,7 +516,10 @@
this.bigId = []; this.bigId = [];
getAction(this.url.descriptionRake,par).then((res)=>{ getAction(this.url.descriptionRake,par).then((res)=>{
if(res.success){ if(res.success){
console.log(res.result); // console.log(res.result);
if(this.processUdgetPlanMaterialTable.columns[0].options.length > 0){
this.processUdgetPlanMaterialTable.columns[0].options = [];
}
res.result.forEach( item => { res.result.forEach( item => {
this.processUdgetPlanMaterialTable.columns[0].options.push({ this.processUdgetPlanMaterialTable.columns[0].options.push({
title : item.descriptionName, title : item.descriptionName,
@ -555,35 +637,35 @@
throw this.throwNotFunction('classifyIntoFormData') throw this.throwNotFunction('classifyIntoFormData')
} }
let formData = this.classifyIntoFormData(allValues) let formData = this.classifyIntoFormData(allValues)
console.log('格式化后的数据',formData)
this.form.validateFields((err, values) => { // this.form.validateFields((err, values) => {
if (!err) { // if (!err) {
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;
if (!formData.tableName)formData.tableName = this.processData.businessTable; // if (!formData.tableName)formData.tableName = this.processData.businessTable;
console.log('格式化后的数据',formData) // console.log('格式化后的数据',formData)
var url = this.url.add; // var url = this.url.add;
let method='post'; // let method='post';
if (!this.isNew){ // if (!this.isNew){
url = this.url.edit; // url = this.url.edit;
method='put'; // method='put';
} // }
console.log('提交方法',method) // console.log('提交方法',method)
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