Browse Source

修改页面

dev
caoyizhong 2 years ago
parent
commit
397a78f0f2
  1. 14
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  2. 20
      src/views/merchandisenews/ProcessMerchandiseNewsList.vue

14
src/views/activiti/form/ProcessUdgetPlanForm.vue

@ -487,7 +487,7 @@
this.descriptionFetchDatas(); this.descriptionFetchDatas();
}, },
mounted() { mounted() {
console.log( this.$refs.processUdgetPlanMaterial); // console.log( this.$refs.processUdgetPlanMaterial);
// this.form.setFieldsValue("materialGroup",123123); // this.form.setFieldsValue("materialGroup",123123);
}, },
methods: { methods: {
@ -600,7 +600,7 @@
let isEr = true; let isEr = true;
if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined){ if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined){
if( record.row.id !== undefined && record.row.id !== '' && this.isBu !== record.row.materialGroup ){ if( record.row.id !== undefined && record.row.id !== '' && this.isBu !== record.row.materialGroup ){
// console.log("1",record.row); console.log("1出发了",record.row);
this.fetchMerchandiseNews(record.row.materialGroup); this.fetchMerchandiseNews(record.row.materialGroup);
this.isBu = record.row.materialGroup; this.isBu = record.row.materialGroup;
let values = [ let values = [
@ -620,10 +620,13 @@
this.$refs.processUdgetPlanMaterial.setValues(values); this.$refs.processUdgetPlanMaterial.setValues(values);
isEr = false; isEr = false;
} }
// if( record.row.id !== undefined && record.row.id !== '' || record.row.materialNumber === '' || record.row.materialNumber === undefined){
// console.log("11",record.row);
// }
} }
// console.log("5555",record.row); // console.log("5555",record.row);
if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber !== '' && record.row.materialNumber !== undefined && isEr){ if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber !== '' && record.row.materialNumber !== undefined && isEr){
// console.log("2",record.row); console.log("2出发了",record.row);
let materialName = { } let materialName = { }
// console.log("this.bigIdMerchandiseNewsList",this.bigIdMerchandiseNewsList) // console.log("this.bigIdMerchandiseNewsList",this.bigIdMerchandiseNewsList)
this.bigIdMerchandiseNewsList.forEach( item => { this.bigIdMerchandiseNewsList.forEach( item => {
@ -659,7 +662,7 @@
if(record.row.materialQuantity !== '' && record.row.materialPrice !== '' && record.row.materialQuantity !== undefined && record.row.materialPrice !== undefined){ if(record.row.materialQuantity !== '' && record.row.materialPrice !== '' && record.row.materialQuantity !== undefined && record.row.materialPrice !== undefined){
// record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice; // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
// console.log("3",record.row); console.log("3出发了",record.row);
//5 //5
if(record.row.materialPrice>50000){ if(record.row.materialPrice>50000){
this.materialPrice=record.row.materialPrice this.materialPrice=record.row.materialPrice
@ -707,7 +710,7 @@
}); });
}); });
getAction(this.url.merchandiseNewsList,par).then((res)=>{ getAction(this.url.merchandiseNewsList,par).then((res)=>{
console.log(res.result); console.log("12312",res.result);
if(res.success){ if(res.success){
let newList = res.result; let newList = res.result;
if(numberList.length > 0){ if(numberList.length > 0){
@ -820,6 +823,7 @@
}) })
} }
}); });
this.isBu = undefined;
}, },
/*回显数据*/ /*回显数据*/
init(){ init(){

20
src/views/merchandisenews/ProcessMerchandiseNewsList.vue

@ -237,16 +237,16 @@
align:"center", align:"center",
dataIndex: 'specification' dataIndex: 'specification'
}, },
{ // {
title:'简介概要', // title:'',
align:"center", // align:"center",
dataIndex: 'synopsis' // dataIndex: 'synopsis'
}, // },
{ // {
title:'分类', // title:'',
align:"center", // align:"center",
dataIndex: 'classify' // dataIndex: 'classify'
}, // },
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',

Loading…
Cancel
Save