Skip to content

G
gavel-hafms-vue
Commit d7c0ee19 authored by 李苏's avatar 李苏 💬
Browse files
Options

凭证信息更改

parent 87171153
Show whitespace changes
Inline Side-by-side
Showing with 226 additions and 175 deletions
src/views/erpxmmxzgl/erpxmmxz/index.vue
View file @ d7c0ee19
...@@ -136,25 +136,25 @@ ...@@ -136,25 +136,25 @@
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{title: "项目包编码", field: "xmbcode", fieldType: "ftString",width:100}, // {title: "项目包编码", field: "xmbcode", fieldType: "ftString",width:100},
{title: "项目包名称", field: "xmbmc", fieldType: "ftString",width:192}, {title: "项目包名称", field: "xmbmc", fieldType: "ftString",width:192},
{title: "管理部门", field: "glbmname", width:140}, // {title: "管理部门", field: "glbmname", width:140},
{title: "一级包分类", field: "xmflName", width:120}, // {title: "一级包分类", field: "xmflName", width:120},
{title: "二级包分类", field: "ejxmflName", width:120}, // {title: "二级包分类", field: "ejxmflName", width:120},
{title: "项目编码", field: "xmcode", fieldType: "ftString",width:192}, // {title: "项目编码", field: "xmcode", fieldType: "ftString",width:192},
{title: "项目描述", field: "xmdesc", fieldType: "ftString",width:300}, // {title: "项目描述", field: "xmdesc", fieldType: "ftString",width:300},
{title: "基金中心", field: "xmbmcode", fieldType: "ftString",width:192}, // {title: "基金中心", field: "xmbmcode", fieldType: "ftString",width:192},
{title: "项目实施部门", field: "xmbmname", fieldType: "ftString",width:192}, // {title: "项目实施部门", field: "xmbmname", fieldType: "ftString",width:192},
{title: "预算金额", field: "xmysje", fieldType: "float",props:"decimal:6"}, // {title: "预算金额", field: "xmysje", fieldType: "float"},
{title: "立项日期", field: "xmlxrq", fieldType: "ftDate"}, // {title: "立项日期", field: "xmlxrq", fieldType: "ftDate"},
{title: "状态", field: "xmzt", fieldType: "ftString",align:"center",width:150, // {title: "状态", field: "xmzt", fieldType: "ftString",align:"center",width:150,
transform: { // transform: {
url: 'hafms/sggcxm/init/zt', // url: 'hafms/sggcxm/init/zt',
label: 'name', // label: 'name',
value: 'id' // value: 'id'
} // }
}, // },
{title: "年度", field: "year", fieldType: "int"}, {title: "年度", field: "year", fieldType: "int"},
{title: "月份", field: "month", fieldType: "int",}, {title: "月份", field: "month", fieldType: "int",},
{title: "日期", field: "day", fieldType: "int"}, {title: "日期", field: "day", fieldType: "int"},
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
{title: "挂接WBS编码", field: "gjwbs", fieldType: "ftString",width:150}, {title: "挂接WBS编码", field: "gjwbs", fieldType: "ftString",width:150},
{title: "WBS编码", field: "wbs", fieldType: "ftString",width:150}, {title: "WBS编码", field: "wbs", fieldType: "ftString",width:150},
{title: "费用明细", field: "fymxname", fieldType: "ftString",width:120}, {title: "费用明细", field: "fymxname", fieldType: "ftString",width:120},
{title: "往来款项性质ID", field: "wlxzid", fieldType: "ftString",width:150}, // {title: "往来款项性质ID", field: "wlxzid", fieldType: "ftString",width:150},
{title: "往来款项性质名称", field: "wlxzname", fieldType: "ftString",width:150}, {title: "往来款项性质名称", field: "wlxzname", fieldType: "ftString",width:150},
{title: "科目编码", field: "mkmid", fieldType: "ftString",width:192}, {title: "科目编码", field: "mkmid", fieldType: "ftString",width:192},
{title: "科目", field: "kmname", fieldType: "ftString",width:120}, {title: "科目", field: "kmname", fieldType: "ftString",width:120},
......
src/views/hzcxbb/szkb/index.vue
View file @ d7c0ee19
...@@ -339,7 +339,6 @@ ...@@ -339,7 +339,6 @@
fullScreen(document.getElementById("szkb")); fullScreen(document.getElementById("szkb"));
}, false); }, false);
/* 初始化地图*/ /* 初始化地图*/
debugger
this.szkbmapCharts = this.initSzkbmapCharts({ this.szkbmapCharts = this.initSzkbmapCharts({
habbList: habbList, habbList: habbList,
jhxList: jhxList, jhxList: jhxList,
......
src/views/sbysjsp/yszxfxzh/index.vue
View file @ d7c0ee19
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [{ tableTitle: [{
title: "单位", title: "单位",
field: "xmmc", field: "bmName",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
...@@ -72,31 +72,30 @@ ...@@ -72,31 +72,30 @@
width: 160, width: 160,
subtitle: [{ subtitle: [{
label: "目标值", label: "目标值",
prop: "ndysmb", prop: "mbz",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成值", label: "完成值",
prop: "ndysmb", prop: "wcz",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成率", label: "完成率",
prop: "ndysmb", prop: "wcl",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "排名", label: "排名",
prop: "ndysmb", prop: "pm",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
} }
] ]
}, }, ]
]
}, },
{ {
title: "成本预算", title: "成本预算",
...@@ -110,19 +109,19 @@ ...@@ -110,19 +109,19 @@
width: 160, width: 160,
subtitle: [{ subtitle: [{
label: "目标值", label: "目标值",
prop: "ndysmb", prop: "mbz2",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成值", label: "完成值",
prop: "ndysmb", prop: "wcz2",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成率", label: "完成率",
prop: "ndysmb", prop: "wcl2",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
...@@ -136,19 +135,19 @@ ...@@ -136,19 +135,19 @@
width: 160, width: 160,
subtitle: [{ subtitle: [{
label: "目标值", label: "目标值",
prop: "ndysmb", prop: "mbz3",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成值", label: "完成值",
prop: "ndysmb", prop: "wcl3",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成率", label: "完成率",
prop: "ndysmb", prop: "wcl3",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
...@@ -162,19 +161,19 @@ ...@@ -162,19 +161,19 @@
width: 160, width: 160,
subtitle: [{ subtitle: [{
label: "目标值", label: "目标值",
prop: "ndysmb", prop: "mbz4",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成值", label: "完成值",
prop: "ndysmb", prop: "wcz4",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成率", label: "完成率",
prop: "ndysmb", prop: "wcl4",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
...@@ -188,19 +187,19 @@ ...@@ -188,19 +187,19 @@
width: 160, width: 160,
subtitle: [{ subtitle: [{
label: "目标值", label: "目标值",
prop: "ndysmb", prop: "mbz5",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成值", label: "完成值",
prop: "ndysmb", prop: "wcl5",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成率", label: "完成率",
prop: "ndysmb", prop: "wcl5",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
...@@ -214,25 +213,25 @@ ...@@ -214,25 +213,25 @@
width: 160, width: 160,
subtitle: [{ subtitle: [{
label: "目标值", label: "目标值",
prop: "ndysmb", prop: "mbz6",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成值", label: "完成值",
prop: "ndysmb", prop: "wcl6",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成率", label: "完成率",
prop: "ndysmb", prop: "wcl6",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "排名", label: "排名",
prop: "ndysmb", prop: "pm6",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
...@@ -247,37 +246,31 @@ ...@@ -247,37 +246,31 @@
fieldType: "ftString", fieldType: "ftString",
subtitle: [{ subtitle: [{
label: "目标值", label: "目标值",
prop: "ndysmb", prop: "mbz7",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成值", label: "完成值",
prop: "ndysmb", prop: "wcl7",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "完成率", label: "完成率",
prop: "ndysmb", prop: "wcl7",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
{ {
label: "排名", label: "排名",
prop: "ndysmb", prop: "pm7",
fieldType: "ftString", fieldType: "ftString",
width: 160 width: 160
}, },
] ]
}, },
] ]
} }
}, },
...@@ -335,17 +328,38 @@ ...@@ -335,17 +328,38 @@
if (res.success) { if (res.success) {
let records = res.data.records || [] let records = res.data.records || []
/* 数据处理*/ /* 数据处理*/
let gs1 = ''
let gs2 = ''
let lxh1 = records.filter(item => { let lxh1 = records.filter(item => {
if (item.lxh == '1') { if (item.lxh == '1') {
gs1 = item.gsname
return true return true
} }
}) })
let lxh2 = records.filter(item => { let lxh2 = records.filter(item => {
if (item.lxh == '2') { if (item.lxh == '2') {
gs2 = item.gsname return true
}
})
let lxh3 = records.filter(item => {
if (item.lxh == '3') {
return true
}
})
let lxh4 = records.filter(item => {
if (item.lxh == '4') {
return true
}
})
let lxh5 = records.filter(item => {
if (item.lxh == '5') {
return true
}
})
let lxh6 = records.filter(item => {
if (item.lxh == '6') {
return true
}
})
let lxh7 = records.filter(item => {
if (item.lxh == '7') {
return true return true
} }
}) })
...@@ -360,6 +374,47 @@ ...@@ -360,6 +374,47 @@
}) })
} }
}) })
lxh3.forEach(item2 => {
if (item1.xh == item2.xh) {
Object.keys(item2).forEach(key => {
let keyName = key + '3'
newItem[keyName] = item2[key]
})
}
})
lxh4.forEach(item2 => {
if (item1.xh == item2.xh) {
Object.keys(item2).forEach(key => {
let keyName = key + '4'
newItem[keyName] = item2[key]
})
}
})
lxh5.forEach(item2 => {
if (item1.xh == item2.xh) {
Object.keys(item2).forEach(key => {
let keyName = key + '5'
newItem[keyName] = item2[key]
})
}
})
lxh6.forEach(item2 => {
if (item1.xh == item2.xh) {
Object.keys(item2).forEach(key => {
let keyName = key + '6'
newItem[keyName] = item2[key]
})
}
})
lxh7.forEach(item2 => {
if (item1.xh == item2.xh) {
Object.keys(item2).forEach(key => {
let keyName = key + '7'
newItem[keyName] = item2[key]
})
}
})
/* 最终合并*/ /* 最终合并*/
newItem = { newItem = {
...newItem, ...newItem,
...@@ -369,10 +424,7 @@ ...@@ -369,10 +424,7 @@
}) })
/* 手动操作表格*/ /* 手动操作表格*/
/* 替换标题*/ console.log(newList)
// this.$refs.TablePager['newGridList'][1]['label'] = gs1
// this.$refs.TablePager['newGridList'][2]['label'] = gs2
/* 替换数据*/
this.$refs.TablePager['tableData'] = newList this.$refs.TablePager['tableData'] = newList
} }
}).finally(e => { }).finally(e => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment