diff --git a/src/views/sjzx/ydjhzzCX.vue b/src/views/sjzx/ydjhzzCX.vue index 77d6828..53f8397 100644 --- a/src/views/sjzx/ydjhzzCX.vue +++ b/src/views/sjzx/ydjhzzCX.vue @@ -63,6 +63,7 @@ border resizable :scroll-y="{enabled: true}" + :align="'center'" :height="height" :columns="tableColumn" @@ -72,7 +73,6 @@ :cell-style="cellClassName" highlight-hover-row show-overflow - show-header-overflow show-footer :footer-cell-style="{'text-align':'center','color':'red'}" :footer-method="footerMethod" @@ -404,19 +404,19 @@ export default { {field: '手中大3零件重量', title: '零件重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - // {field: 'xzxc', title: '小组型材', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, }, - // {field: 'xzds', title: '小组吨位', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, }, - {field: 'xzgs', title: '小组型材根数', width: 100, + {field: 'xzxcgs', title: '小组型材根数', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: '小组型材领取米数', title: '小组型材领取米数', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: '小组型材实耗米数', title: '小组型材实耗米数', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: 'bclqzl_xz', title: '领取重量', width: 100, + {field: 'lqzl_xzxc', title: '领取重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: 'bcshzl_xz', title: '实耗重量', width: 100, + {field: 'shzl_xzxc', title: '实耗重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, {field: '小组型材余料重量', title: '余料重量', width: 100, @@ -428,19 +428,20 @@ export default { {field: '小组型材零件重量', title: '零件重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - // {field: 'dzxc', title: '大组型材', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, }, - // {field: 'dzds', title: '大组吨位', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, }, - {field: 'dzgs', title: '大组型材根数', width: 100, + + {field: 'dzxcgs', title: '大组型材根数', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: '大组型材领取米数', title: '大组型材领取米数', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: '大组型材实耗米数', title: '大组型材实耗米数', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: 'bclqzl_dz', title: '领取重量', width: 100, + {field: 'lqzl_dzxc', title: '领取重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: 'bcshzl_dz', title: '实耗重量', width: 100, + {field: 'shzl_dzxc', title: '实耗重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, {field: '大组型材余料重量', title: '余料重量', width: 100, @@ -452,24 +453,36 @@ export default { {field: '大组型材零件重量', title: '零件重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: 'fg', title: '方钢', width: 100, + {field: 'fggs', title: '方钢根数', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: 'fgdw', title: '方钢吨位', width: 100, + {field: '方钢领取米数', title: '方钢领取米数', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: '', title: '型材根数合计', width: 100, + {field: '方钢实耗米数', title: '方钢实耗米数', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: '', title: '型材总米数（不含方钢）', width: 100, + {field: 'lqzl_fg', title: '领取重量', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: 'shzl_fg', title: '实耗重量', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: '方钢余料重量', title: '余料重量', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: '方钢前批余料代', title: '前批余料代', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: '方钢零件重量', title: '零件重量', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: 'xcgs_hj', title: '型材根数合计', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, + {field: 'xcms_hj', title: '型材总米数（不含方钢）', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - // {field: 'xchdw', title: '吨位', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, }, - // {field: 'hdw', title: '合吨位', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, }, {field: 'lqhj_xz', title: '小组领取合计', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, @@ -631,15 +644,16 @@ export default { } if (["lm1","s1","sx2","szd2","xf","df","xzhb","dzhb","sx4","jz4","xm","dm","sx3","sj3","szd3","xzxc","xzgs","dzxc","dzgs","fg","szd4","sq2x","sq2d","xq3","dq3","gd","xflj","dflj", "bclqzl_lm1","bclqzl_s1","bclqzl_sx2","bclqzl_szd2","bclqzl_xf","bclqzl_df","bclqzl_xzhb","bclqzl_dzhb","bclqzl_sx4","bclqzl_jz4","bclqzl_xm","bclqzl_dm","bclqzl_sx3","bclqzl_sj3", - "bclqzl_szd3","bclqzl_xz","bclqzl_dz","bclqzl_szd4","bclqzl_sq2x","bclqzl_sq2d","bclqzl_xq3","bclqzl_dq3","bclqzl_gd","bclqzl_xflj","bclqzl_dflj","bcshzl_lm1","bcshzl_s1","bcshzl_sx2", - "bcshzl_szd2","bcshzl_xf","bcshzl_df","bcshzl_xzhb","bcshzl_dzhb","bcshzl_sx4","bcshzl_jz4","bcshzl_xm","bcshzl_dm","bcshzl_sx3","bcshzl_sj3","bcshzl_szd3","bcshzl_xzxc","bcshzl_xz", - "bcshzl_dzxc","bcshzl_dz","bcshzl_fg","bcshzl_szd4","bcshzl_sq2x","bcshzl_sq2d","bcshzl_xq3","bcshzl_dq3","bcshzl_gd","bcshzl_xflj","bcshzl_dflj","lqhj_xz","lqhj_dz","shhj_xz","shhj_dz", + "bclqzl_szd3","lqzl_xzxc","lqzl_dzxc","lqzl_fg","bclqzl_szd4","bclqzl_sq2x","bclqzl_sq2d","bclqzl_xq3","bclqzl_dq3","bclqzl_gd","bclqzl_xflj","bclqzl_dflj","bcshzl_lm1","bcshzl_s1","bcshzl_sx2", + "bcshzl_szd2","bcshzl_xf","bcshzl_df","bcshzl_xzhb","bcshzl_dzhb","bcshzl_sx4","bcshzl_jz4","bcshzl_xm","bcshzl_dm","bcshzl_sx3","bcshzl_sj3","bcshzl_szd3","bcshzl_xzxc","shzl_xzxc", + "shzl_dzxc","shzl_fg","bcshzl_szd4","bcshzl_sq2x","bcshzl_sq2d","bcshzl_xq3","bcshzl_dq3","bcshzl_gd","bcshzl_xflj","bcshzl_dflj","lqhj_xz","lqhj_dz","shhj_xz","shhj_dz", "龙门1余料重量","龙门1前批余料代","龙门1零件重量","数1余料重量","数1前批余料代","数1零件重量","数小2余料重量","数小2前批余料代","数小2零件重量","数中大2余料重量","数中大2前批余料代","数中大2零件重量","小腹余料重量", "小腹前批余料代","小腹零件重量","大腹余料重量","大腹前批余料代","大腹零件重量","小组厚板余料重量","小组厚板前批余料代","小组厚板零件重量","大组厚板余料重量","大组厚板前批余料代","大组厚板零件重量","数小4余料重量", "数小4前批余料代","数小4零件重量","机肘4余料重量","机肘4前批余料代","机肘4零件重量","小面余料重量","小面前批余料代","小面零件重量","大面余料重量","大面前批余料代","大面零件重量","手小3余料重量","手小3前批余料代", "手小3零件重量","手机3余料重量","手机3前批余料代","手机3零件重量","手中大3余料重量","手中大3前批余料代","手中大3零件重量","小组型材余料重量","小组型材前批余料代","小组型材零件重量","大组型材余料重量","大组型材前批余料代", "大组型材零件重量","数中大4余料重量","数中大4前批余料代","数中大4零件重量","数曲2小余料重量","数曲2小前批余料代","数曲2小零件重量","数曲2大余料重量","数曲2大前批余料代","数曲2大零件重量","小曲3余料重量","小曲3前批余料代", - "小曲3零件重量","大曲3余料重量","大曲3前批余料代","大曲3零件重量","光电余料重量","光电前批余料代","光电零件重量",].includes(column.property)) { + "小曲3零件重量","大曲3余料重量","大曲3前批余料代","大曲3零件重量","光电余料重量","光电前批余料代","光电零件重量","xzxcgs","dzxcgs","fggs","小组型材领取米数","大组型材领取米数","小组型材实耗米数","大组型材实耗米数" + ,"方钢实耗米数","方钢领取米数","方钢余料重量","方钢前批余料代","方钢零件重量","xcgs_hj","xcms_hj"].includes(column.property)) { return this.sumNum(data, column.property) } if (["hdw","hdw1","hjbs",'lqhj_xz','shhj_xz','lqhj_dz','shhj_dz'].includes(column.property)) { @@ -671,7 +685,7 @@ export default { }, cellClassName ({ row, column }) { let fields=['lm1','s1','sx2','szd2','xf','df','xzhb','dzhb','sx4','jz4', - 'xm','dm','sx3','sj3','szd3','xzgs','dzgs','fg','szd4','sq2x', + 'xm','dm','sx3','sj3','szd3','xzxcgs','dzxcgs','fggs','szd4','sq2x', 'sq2d','xq3','dq3','gd' ] let hzfields=['hdw','lqhj_xz','shhj_xz','hdw1','lqhj_dz','shhj_dz']