diff --git a/src/api/jhzxgl/pgd.js b/src/api/jhzxgl/pgd.js
index 34b650a..67ced14 100644
--- a/src/api/jhzxgl/pgd.js
+++ b/src/api/jhzxgl/pgd.js
@@ -29,10 +29,10 @@ export function savePwPgdXdBack(data) {return request({url: '/pgdPwjh/savePwPgdX
export function savePwPgdFk(data) {return request({url: '/pgdPwjh/savePwPgdFk', method: 'post', data})}
-export function getQgPgd(data) {return request({url: '/pgdPwjh/getQgPgd', method: 'post', data})}
-export function saveQgPgdXd(data) {return request({url: '/pgdPwjh/saveQgPgdXd', method: 'post', data})}
-export function saveQgPgdXdBack(data) {return request({url: '/pgdPwjh/saveQgPgdXdBack', method: 'post', data})}
-export function saveQgPgdFk(data) {return request({url: '/pgdPwjh/saveQgPgdFk', method: 'post', data})}
+export function getQgPgd(data) {return request({url: '/pgdQgjh/getQgPgd', method: 'post', data})}
+export function saveQgPgdXd(data) {return request({url: '/pgdQgjh/saveQgPgdXd', method: 'post', data})}
+export function saveQgPgdXdBack(data) {return request({url: '/pgdQgjh/saveQgPgdXdBack', method: 'post', data})}
+export function saveQgPgdFk(data) {return request({url: '/pgdQgjh/saveQgPgdFk', method: 'post', data})}
diff --git a/src/utils/rpkj.js b/src/utils/rpkj.js
index 878c0ee..3d3fe69 100644
--- a/src/utils/rpkj.js
+++ b/src/utils/rpkj.js
@@ -58,6 +58,34 @@ export function getSumAdd(list, field){
return count
}
+
+export function getSumAddDicByName1(list,field,...rest) {
+ let count = 0
+ const cache = [];
+ let t;
+ function check(item) {
+ let trueList = [];
+ let args;
+ for(args of rest) {
+ trueList.push(item[args] === t[args])
+ }
+ return trueList.every(item => item)
+ }
+ for (t of list) {
+ if (cache.find(check)) {
+ continue;
+ }
+ cache.push(t);
+ }
+ for( let qc of cache){
+ let num = Number(qc[field])
+ if (!XEUtils.isNumber(num) || isNaN(num)) {
+ num = 0
+ }
+ count = cal.accAdd(count, num)
+ }
+ return count
+}
//根据属相去重相加
export function getSumAddDicByName(list,...rest) {
let count = 0
diff --git a/src/views/sjzx/bclqCX.vue b/src/views/sjzx/bclqCX.vue
index 819394f..ac83a56 100644
--- a/src/views/sjzx/bclqCX.vue
+++ b/src/views/sjzx/bclqCX.vue
@@ -9,16 +9,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -148,7 +140,7 @@ import {
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
+import {getSumAdd, null2str, getSumAddDicByName, getSumAddDicByName1} from "@/utils/rpkj";
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
@@ -355,6 +347,24 @@ export default {
}
},
+ footerMethod ({ columns, data }) {
+
+ return [
+ columns.map((column, columnIndex) => {
+ if (['sl','lqzl','shzl','ylzl','qpyld','ljzl','dztlzl'].includes(column.property)) {
+ return getSumAdd(data, column.property)
+ }
+
+ if (['qpyldZ','ybzsZ','lqzlZ','shzlZ','ylzlZ'].includes(column.property)) {
+ return getSumAddDicByName1(data, column.property,'lqbh')
+ }
+ if (columnIndex === 1) {
+ return '合计'
+ }
+ return null
+ })
+ ]
+ },
uploadExcel() {
if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号！')
@@ -456,11 +466,11 @@ export default {
'dcZlZ',
'lqlbZ',
'zzcjZ',
+ 'qpyldZ',
'ybzsZ',
'shzlZ',
'ylzlZ'
]
- console.log("111");
let tempcol=column.property
let cellValue = row[tempcol]
if (cellValue && fields.includes(column.property)) {
diff --git a/src/views/sjzx/bclqCX1.vue b/src/views/sjzx/bclqCX1.vue
index aa9eef7..770bcef 100644
--- a/src/views/sjzx/bclqCX1.vue
+++ b/src/views/sjzx/bclqCX1.vue
@@ -194,7 +194,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'BclqCX',
+ name:'BclqCX1',
data() {
return {
queryParam: {
@@ -244,7 +244,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ylZD1z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
+ { field: 'ylzd1Z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
diff --git a/src/views/sjzx/bctltCX.vue b/src/views/sjzx/bctltCX.vue
index a6570d3..f9d64f4 100644
--- a/src/views/sjzx/bctltCX.vue
+++ b/src/views/sjzx/bctltCX.vue
@@ -108,11 +108,14 @@
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
-
+ :scroll-y="{enabled: true}"
highlight-hover-row
show-overflow
show-header-overflow
-
+ :footer-method="footerMethod"
+ :footer-cell-style="{'text-align':'center','color':'red'}"
+ show-footer
+ :span-method="mergeRowMethod"
>
@@ -135,7 +138,7 @@ import {
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
+import {getSumAdd, getSumAddDicByName1, null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
@@ -186,7 +189,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ylZD1z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
+ { field: 'ylzd1Z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -214,23 +217,27 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'wph', title: '零件编号', width: 100,
+ { field: 'ljslZ', title: '零件数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ljslZ', title: '零件数量', width: 100,
+ { field: 'wph', title: '零件编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'xgr', title: '编制人', width: 100,
+
+ { field: 'zdrZ', title: '编制人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'xgrq', title: '编制日期', width: 100,
+ { field: 'zdrqZ', title: '编制日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
+ ],
+ footerData1: [
+ ['合计', '2', '44', '67', '-']
]
}
},
@@ -245,6 +252,31 @@ export default {
},
methods: {
+
+ mergeRowMethod ({ row, $rowIndex, column, data }) {
+ const fields = [ 'dcChZ','dcPlZ','dcZlZ','ylzd1Z','wpggZ','','hxcdZ','ylzd4Z','tzbhZ','ljslZ'
+
+ ]
+ let tempcol=column.property
+ let cellValue = row[tempcol]
+ if (cellValue && fields.includes(column.property)) {
+
+ let prevRow = data[$rowIndex - 1]
+ let nextRow = data[$rowIndex + 1]
+ if (prevRow && prevRow[tempcol] === cellValue) {
+ return {rowspan: 0, colspan: 0}
+ } else {
+ let countRowspan = 1
+ while (nextRow && nextRow[tempcol] === cellValue) {
+ nextRow = data[++countRowspan + $rowIndex]
+ }
+ if (countRowspan > 1) {
+ return {rowspan: countRowspan, colspan: 1}
+ }
+ }
+ }
+
+ },
cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel()
@@ -327,6 +359,22 @@ export default {
})
}
},
+
+ footerMethod ({ columns, data }) {
+
+ return [
+ columns.map((column, columnIndex) => {
+ if (['hxcdZ','ylzd4Z','ljslZ'].includes(column.property)) {
+ console.log(1)
+ return getSumAddDicByName1(data, column.property,'tzbhZ')
+ }
+ if (columnIndex === 1) {
+ return '合计'
+ }
+ return null
+ })
+ ]
+ },
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
@@ -345,6 +393,7 @@ export default {
return
}
getTLTList(this.queryParam).then((res) => {
+
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
diff --git a/src/views/sjzx/bcybCX.vue b/src/views/sjzx/bcybCX.vue
index e923d7b..1d23a51 100644
--- a/src/views/sjzx/bcybCX.vue
+++ b/src/views/sjzx/bcybCX.vue
@@ -121,11 +121,13 @@
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
-
+ :scroll-y="{enabled: true}"
highlight-hover-row
show-overflow
show-header-overflow
-
+ :footer-method="footerMethod"
+ :footer-cell-style="{'text-align':'center','color':'red'}"
+ show-footer
>
@@ -148,7 +150,7 @@ import {
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
+import {getSumAdd, getSumAddDicByName1, null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
@@ -285,7 +287,22 @@ export default {
}
},
+ footerMethod ({ columns, data }) {
+
+ return [
+ columns.map((column, columnIndex) => {
+ if (['sl'].includes(column.property)) {
+ return getSumAdd(data, column.property)
+ }
+
+ if (columnIndex === 1) {
+ return '合计'
+ }
+ return null
+ })
+ ]
+ },
uploadExcel() {
if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号！')
diff --git a/src/views/sjzx/czbhcx.vue b/src/views/sjzx/czbhcx.vue
index 6359fdc..d738e53 100644
--- a/src/views/sjzx/czbhcx.vue
+++ b/src/views/sjzx/czbhcx.vue
@@ -43,7 +43,9 @@
-
+
+ 不显示完工船只
+
@@ -135,7 +137,7 @@ export default {
return {
request: {
cbbm:'',
-
+ flag:true
},
projectData:[],
projectData1:[],
diff --git a/src/views/sjzx/czbhwh.vue b/src/views/sjzx/czbhwh.vue
index e6ad0be..2bc9c07 100644
--- a/src/views/sjzx/czbhwh.vue
+++ b/src/views/sjzx/czbhwh.vue
@@ -42,7 +42,9 @@
-
+
+ 不显示完工船只
+
@@ -135,6 +137,7 @@ export default {
return {
request: {
cbbm:'',
+ flag:true
},
projectData:[],
diff --git a/src/views/sjzx/czplwh.vue b/src/views/sjzx/czplwh.vue
index f751017..f9f0a6c 100644
--- a/src/views/sjzx/czplwh.vue
+++ b/src/views/sjzx/czplwh.vue
@@ -47,7 +47,7 @@
-
+
不显示完工船只
diff --git a/src/views/sjzx/ljptCX.vue b/src/views/sjzx/ljptCX.vue
index c202621..8daf15e 100644
--- a/src/views/sjzx/ljptCX.vue
+++ b/src/views/sjzx/ljptCX.vue
@@ -9,14 +9,38 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -88,7 +112,9 @@
highlight-hover-row
show-overflow
show-header-overflow
-
+ :footer-method="footerMethod"
+ :footer-cell-style="{'text-align':'center','color':'red'}"
+ show-footer
>
@@ -111,7 +137,7 @@ import {
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
+import {getSumAdd, getSumAddDicByName1, null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
@@ -125,6 +151,16 @@ export default {
hxfl:'B'
},
+ projectData:[],
+ projectData1:[],
+ projectColumns: [
+ {field: 'cbbm', title: '船号',width: 110},
+ { field: 'wgbs', title: '完工标识', width: 80,
+ slots:{
+ default: 'wgbsEdit'
+ },
+ },
+ ],
list: [],
isupload:'02',
filedis:true,
@@ -158,7 +194,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'ylzd1', title: '配套表类型', width: 100,
+ { field: 'ylzd1', title: '配套表类型', width: 100,formatter: ['dictFormat','SJLX'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -234,8 +270,38 @@ export default {
},
methods: {
+ cellClickEvent({row}) {
+ this.queryParam.dcch = row.cbbm
+ this.$refs.xDown4.hidePanel()
+ },
+ focusEvent4() {
+ this.$refs.xDown4.showPanel()
+ },
+ keyupEvent4() {
+
+
+ if (this.queryParam.dcch) {
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ } else {
+ this.projectData = this.projectData1.slice(0)
+ }
+
+ },
+ footerMethod ({ columns, data }) {
+ return [
+ columns.map((column, columnIndex) => {
+ if (['sl'].includes(column.property)) {
+ return getSumAdd(data, column.property)
+ }
+ if (columnIndex === 1) {
+ return '合计'
+ }
+ return null
+ })
+ ]
+ },
uploadExcel() {
if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号！')
@@ -303,6 +369,8 @@ export default {
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
+ this.projectData=res.data.cbbm
+ this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')
@@ -343,77 +411,7 @@ export default {
getHeight() {
this.height = window.innerHeight - 190
},
- toolbarButtonClickEvent(code) {
- const {
- insertRecords,
- removeRecords,
- updateRecords
- } = this.$refs.xGrid.getRecordset()
- switch (code) {
- case 'insert':
-
- this.$refs.xGrid.insertAt({
-
- }, -1).then(({ row }) => {
- this.$refs.xGrid.setActiveRow(row)
- })
- break
- case 'delete':
- this.$confirm('删除, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then((type) => {
- this.$refs.xGrid.removeCheckboxRow()
- })
- break
- case 'save':
-
-
- if (removeRecords.length !== 0) {
- del(removeRecords).then((response) => {
- if (response.success) {
- for (let i = 0; i < this.list.length; i++) {
- if (removeRecords.indexOf(this.list[i]) !== -1) {
- this.list.splice(i, 1)
- i--
- }
- }
- this.$message({ message: '保存成功！', type: 'success' })
- const xTable = this.$refs.xGrid
- xTable.loadData(this.initList())
-
- }
- })
- }
-
-
- if (updateRecords.length !== 0) {
- czPlupdate(updateRecords).then((response) => {
- if (response.success) {
- const xTable = this.$refs.xGrid
- xTable.loadData(this.initList())
- this.$message({message: '保存成功！', type: 'success'})
- }
- })
- }
- if (insertRecords.length !== 0) {
- add(insertRecords).then((response) => {
- if (response.success) {
- this.list = this.list.concat(insertRecords)
- const xTable = this.$refs.xGrid
- xTable.loadData(this.initList())
- this.$message({ message: '保存成功！', type: 'success' })
- }
- })
- }
- this.$message(
- `新增 ${insertRecords.length} 条，删除 ${removeRecords.length} 条，更新 ${updateRecords.length} 条`
- )
- break
- }
- }
}
}
diff --git a/src/views/sjzx/plbXC.vue b/src/views/sjzx/plbXC.vue
index a4667ec..6751845 100644
--- a/src/views/sjzx/plbXC.vue
+++ b/src/views/sjzx/plbXC.vue
@@ -47,7 +47,7 @@
-
+
不显示完工船只
diff --git a/src/views/sjzx/xclqCX.vue b/src/views/sjzx/xclqCX.vue
index 8810c60..7f7aab3 100644
--- a/src/views/sjzx/xclqCX.vue
+++ b/src/views/sjzx/xclqCX.vue
@@ -9,14 +9,38 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -88,6 +112,9 @@
show-overflow
show-header-overflow
:scroll-y="{enabled: true}"
+ :footer-method="footerMethod"
+ :footer-cell-style="{'text-align':'center','color':'red'}"
+ show-footer
>
@@ -110,7 +137,7 @@ import {
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
+import {null2str, getSumAdd, getSumAddDicByName1} from "@/utils/rpkj";
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
@@ -124,6 +151,16 @@ export default {
delx:'X'
},
+ projectData:[],
+ projectData1:[],
+ projectColumns: [
+ {field: 'cbbm', title: '船号',width: 110},
+ { field: 'wgbs', title: '完工标识', width: 80,
+ slots:{
+ default: 'wgbsEdit'
+ },
+ },
+ ],
list: [],
isupload:'02',
filedis:true,
@@ -131,7 +168,6 @@ export default {
},
heads: { token: getToken() },
- uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{},
height: '500px',
@@ -163,7 +199,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'qpyldZ', title: '前批余料代总', width: 100,
+ { field: 'qpyldZ', title: '前批余料代总', width: 100,slots: { footer: 'numMx' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -224,7 +260,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'shzl', title: '领取重量', width: 100,
+ { field: 'shzl', title: '实耗重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -324,7 +360,23 @@ export default {
// this.uploadData.czbh = this.queryParam.czbh
this.uploadData.isupload = this.isupload
},
+ cellClickEvent({row}) {
+ this.queryParam.dcch = row.cbbm
+ this.$refs.xDown4.hidePanel()
+ },
+ focusEvent4() {
+ this.$refs.xDown4.showPanel()
+ },
+ keyupEvent4() {
+
+ if (this.queryParam.dcch) {
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ } else {
+ this.projectData = this.projectData1.slice(0)
+ }
+
+ },
czbhChange(){
if (this.queryParam.cbbm === '') {
this.filedis=true
@@ -380,6 +432,8 @@ export default {
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
+ this.projectData=res.data.cbbm
+ this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')
@@ -387,6 +441,26 @@ export default {
})
},
+
+ footerMethod ({ columns, data }) {
+ return [
+ columns.map((column, columnIndex) => {
+ if (['sl','lqzl','shzl','ylzl','qpyld','lqms','shms'].includes(column.property)) {
+
+ return getSumAdd(data, column.property)
+ }
+ if (['qpyldZ','ybzsZ','lqzlZ','shzlZ','ylzlZ'].includes(column.property)) {
+
+ return getSumAddDicByName1(data, column.property,'lqbh')
+ }
+
+ if (columnIndex === 1) {
+ return '合计'
+ }
+ return null
+ })
+ ]
+ },
initList() {
if (this.queryParam.dcch === '') {
this.$message.warning('选择船只编号')
diff --git a/src/views/sjzx/xctltCX.vue b/src/views/sjzx/xctltCX.vue
index d899601..afa02e8 100644
--- a/src/views/sjzx/xctltCX.vue
+++ b/src/views/sjzx/xctltCX.vue
@@ -56,37 +56,37 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -112,7 +112,10 @@
highlight-hover-row
show-overflow
show-header-overflow
-
+ :footer-method="footerMethod"
+ :footer-cell-style="{'text-align':'center','color':'red'}"
+ show-footer
+ :span-method="mergeRowMethod"
>
@@ -135,12 +138,12 @@ import {
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
+import {getSumAdd, getSumAddDicByName1, null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'XctltCX',
+ name:'BctltCX',
data() {
return {
queryParam: {
@@ -214,20 +217,27 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
-
{ field: 'ljslZ', title: '零件数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'xgr', title: '编制人', width: 100,
+ { field: 'wph', title: '零件编号', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ { field: 'zdrZ', title: '编制人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'xgrq', title: '编制日期', width: 100,
+ { field: 'zdrqZ', title: '编制日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
+ ],
+ footerData1: [
+ ['合计', '2', '44', '67', '-']
]
}
},
@@ -242,6 +252,31 @@ export default {
},
methods: {
+
+ mergeRowMethod ({ row, $rowIndex, column, data }) {
+ const fields = [ 'dcChZ','dcPlZ','dcZlZ','ylzd1Z','wpggZ','','hxcdZ','ylzd4Z','tzbhZ','ljslZ'
+
+ ]
+ let tempcol=column.property
+ let cellValue = row[tempcol]
+ if (cellValue && fields.includes(column.property)) {
+
+ let prevRow = data[$rowIndex - 1]
+ let nextRow = data[$rowIndex + 1]
+ if (prevRow && prevRow[tempcol] === cellValue) {
+ return {rowspan: 0, colspan: 0}
+ } else {
+ let countRowspan = 1
+ while (nextRow && nextRow[tempcol] === cellValue) {
+ nextRow = data[++countRowspan + $rowIndex]
+ }
+ if (countRowspan > 1) {
+ return {rowspan: countRowspan, colspan: 1}
+ }
+ }
+ }
+
+ },
cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel()
@@ -253,7 +288,7 @@ export default {
if (this.queryParam.dcch) {
- this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+ this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
@@ -274,7 +309,7 @@ export default {
czbhChange(){
if (this.queryParam.cbbm === '') {
- this.filedis=true
+ this.filedis=true
}else{
this.filedis=false
}
@@ -324,6 +359,22 @@ export default {
})
}
},
+
+ footerMethod ({ columns, data }) {
+
+ return [
+ columns.map((column, columnIndex) => {
+ if (['hxcdZ','ylzd4Z','ljslZ'].includes(column.property)) {
+ console.log(1)
+ return getSumAddDicByName1(data, column.property,'tzbhZ')
+ }
+ if (columnIndex === 1) {
+ return '合计'
+ }
+ return null
+ })
+ ]
+ },
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
@@ -342,6 +393,7 @@ export default {
return
}
getTLTList(this.queryParam).then((res) => {
+
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
@@ -363,7 +415,7 @@ export default {
selectChange(row) {
// this.$refs.xGrid.clearActived() // 清除单元格激活状态
this.$refs.xGrid.clearEdit() // 清除单元格激活状态
- // this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+ // this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
null2str(row.row)
},
getHeight() {