xiaoning
/
gjerp_ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修正

Browse Source
master
xhj 2 years ago
parent 2d65162ecc
commit 449fdc7db4
13 changed files with 395 additions and 162 deletions
Show Stats Download Patch File Download Diff File

8
src/api/jhzxgl/pgd.js
Unescape View File

@ -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 savePwPgdFk(data) {return request({url: '/pgdPwjh/savePwPgdFk', method: 'post', data})}
export function getQgPgd(data) {return request({url: '/pgdPwjh/getQgPgd', method: 'post', data})} export function getQgPgd(data) {return request({url: '/pgdQgjh/getQgPgd', method: 'post', data})}
export function saveQgPgdXd(data) {return request({url: '/pgdPwjh/saveQgPgdXd', method: 'post', data})} export function saveQgPgdXd(data) {return request({url: '/pgdQgjh/saveQgPgdXd', method: 'post', data})}
export function saveQgPgdXdBack(data) {return request({url: '/pgdPwjh/saveQgPgdXdBack', method: 'post', data})} export function saveQgPgdXdBack(data) {return request({url: '/pgdQgjh/saveQgPgdXdBack', method: 'post', data})}
export function saveQgPgdFk(data) {return request({url: '/pgdPwjh/saveQgPgdFk', method: 'post', data})} export function saveQgPgdFk(data) {return request({url: '/pgdQgjh/saveQgPgdFk', method: 'post', data})}

28
src/utils/rpkj.js
Unescape View File

@ -58,6 +58,34 @@ export function getSumAdd(list, field){
return count 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) { export function getSumAddDicByName(list,...rest) {
let count = 0 let count = 0

38
src/views/sjzx/bclqCX.vue
Unescape View File

@ -9,16 +9,6 @@
<el-col :span="22"> <el-col :span="22">
<el-form-item label="船号:"> <el-form-item label="船号:">
<!-- <el-select v-model="queryParam.dcch" filterable placeholder="工程编号" @change="czbhChange" clearable >-->
<!-- <el-option-->
<!-- v-for="item in dictData.cbbm"-->
<!-- :key="item.cbbm"-->
<!-- :label="item.cbbm"-->
<!-- :value="item.cbbm">-->
<!-- </el-option>-->
<!-- </el-select>-->
<vxe-pulldown ref="xDown4" transfer > <vxe-pulldown ref="xDown4" transfer >
<template #default> <template #default>
<vxe-input <vxe-input
@ -114,7 +104,7 @@
ref="xGrid" ref="xGrid"
border border
resizable resizable
:scroll-y="{enabled: true}"
:align="'center'" :align="'center'"
:height="height" :height="height"
:columns="tableColumn" :columns="tableColumn"
@ -125,7 +115,9 @@
highlight-hover-row highlight-hover-row
show-overflow show-overflow
show-header-overflow show-header-overflow
:footer-method="footerMethod"
:footer-cell-style="{'text-align':'center','color':'red'}"
show-footer
> >
@ -148,7 +140,7 @@ import {
} from '@/api/sjzx/jcsj' } from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj"; import {getSumAdd, null2str, getSumAddDicByName, getSumAddDicByName1} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' 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() { uploadExcel() {
if (this.queryParam.cbbm === '') { if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号！') this.$message.error('请选择船号！')
@ -456,11 +466,11 @@ export default {
'dcZlZ', 'dcZlZ',
'lqlbZ', 'lqlbZ',
'zzcjZ', 'zzcjZ',
'qpyldZ',
'ybzsZ', 'ybzsZ',
'shzlZ', 'shzlZ',
'ylzlZ' 'ylzlZ'
] ]
console.log("111");
let tempcol=column.property let tempcol=column.property
let cellValue = row[tempcol] let cellValue = row[tempcol]
if (cellValue && fields.includes(column.property)) { if (cellValue && fields.includes(column.property)) {

4
src/views/sjzx/bclqCX1.vue
Unescape View File

@ -194,7 +194,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
export default { export default {
name:'BclqCX', name:'BclqCX1',
data() { data() {
return { return {
queryParam: { queryParam: {
@ -244,7 +244,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, 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: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },

65
src/views/sjzx/bctltCX.vue
Unescape View File

@ -108,11 +108,14 @@
highlight-current-row highlight-current-row
:data="list" :data="list"
:custom-config="{ storage: true }" :custom-config="{ storage: true }"
:scroll-y="{enabled: true}"
highlight-hover-row highlight-hover-row
show-overflow show-overflow
show-header-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' } from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj"; import {getSumAdd, getSumAddDicByName1, null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
@ -186,7 +189,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, 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: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
@ -214,23 +217,27 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'wph', title: '零件编号', width: 100, { field: 'ljslZ', title: '零件数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'ljslZ', title: '零件数量', width: 100, { field: 'wph', title: '零件编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'xgr', title: '编制人', width: 100,
{ field: 'zdrZ', title: '编制人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'xgrq', title: '编制日期', width: 100, { field: 'zdrqZ', title: '编制日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
],
footerData1: [
['合计', '2', '44', '67', '-']
] ]
} }
}, },
@ -245,6 +252,31 @@ export default {
}, },
methods: { 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}) { cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel() 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(){ initBase(){
getCzplBase({}).then(res=>{ getCzplBase({}).then(res=>{
this.dictData = res.data this.dictData = res.data
@ -345,6 +393,7 @@ export default {
return return
} }
getTLTList(this.queryParam).then((res) => { getTLTList(this.queryParam).then((res) => {
this.list = res.data this.list = res.data
if (this.$refs.xGrid) { if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list) this.$refs.xGrid.loadData(this.list)

23
src/views/sjzx/bcybCX.vue
Unescape View File

@ -121,11 +121,13 @@
highlight-current-row highlight-current-row
:data="list" :data="list"
:custom-config="{ storage: true }" :custom-config="{ storage: true }"
:scroll-y="{enabled: true}"
highlight-hover-row highlight-hover-row
show-overflow show-overflow
show-header-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' } from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj"; import {getSumAdd, getSumAddDicByName1, null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' 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() { uploadExcel() {
if (this.queryParam.cbbm === '') { if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号！') this.$message.error('请选择船号！')

6
src/views/sjzx/czbhcx.vue
Unescape View File

@ -43,7 +43,9 @@
</el-form-item> </el-form-item>
<el-form-item >
<el-checkbox v-model="request.flag" >不显示完工船只</el-checkbox>
</el-form-item>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<el-form-item style="float: right" > <el-form-item style="float: right" >
@ -135,7 +137,7 @@ export default {
return { return {
request: { request: {
cbbm:'', cbbm:'',
flag:true
}, },
projectData:[], projectData:[],
projectData1:[], projectData1:[],

5
src/views/sjzx/czbhwh.vue
Unescape View File

@ -42,7 +42,9 @@
</el-form-item> </el-form-item>
<el-form-item >
<el-checkbox v-model="request.flag" >不显示完工船只</el-checkbox>
</el-form-item>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
@ -135,6 +137,7 @@ export default {
return { return {
request: { request: {
cbbm:'', cbbm:'',
flag:true
}, },
projectData:[], projectData:[],

2
src/views/sjzx/czplwh.vue
Unescape View File

@ -47,7 +47,7 @@
<el-form-item label="批量:"> <el-form-item label="批量:">
<el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input> <el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="批量:"> <el-form-item >
<el-checkbox v-model="queryParam.flag" >不显示完工船只</el-checkbox> <el-checkbox v-model="queryParam.flag" >不显示完工船只</el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col>

160
src/views/sjzx/ljptCX.vue
Unescape View File

@ -9,14 +9,38 @@
<el-col :span="22"> <el-col :span="22">
<el-form-item label="船号:"> <el-form-item label="船号:">
<el-select v-model="queryParam.dcch" filterable placeholder="工程编号" @change="czbhChange" > <vxe-pulldown ref="xDown4" transfer >
<el-option <template #default>
v-for="item in dictData.cbbm" <vxe-input
:key="item.cbbm" v-model="queryParam.dcch"
:label="item.cbbm" placeholder="船号"
:value="item.cbbm"> style="height: 28px;
</el-option> line-height: 28px; width: 150px;"
</el-select> suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="auto"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
</el-form-item> </el-form-item>
<el-form-item label="批量:"> <el-form-item label="批量:">
<el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input> <el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
@ -88,7 +112,9 @@
highlight-hover-row highlight-hover-row
show-overflow show-overflow
show-header-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' } from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj"; import {getSumAdd, getSumAddDicByName1, null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
@ -125,6 +151,16 @@ export default {
hxfl:'B' hxfl:'B'
}, },
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
list: [], list: [],
isupload:'02', isupload:'02',
filedis:true, filedis:true,
@ -158,7 +194,7 @@ export default {
filterRender: { name: 'FilterCombination', }, 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: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
@ -234,8 +270,38 @@ export default {
}, },
methods: { 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() { uploadExcel() {
if (this.queryParam.cbbm === '') { if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号！') this.$message.error('请选择船号！')
@ -303,6 +369,8 @@ export default {
initBase(){ initBase(){
getCzplBase({}).then(res=>{ getCzplBase({}).then(res=>{
this.dictData = res.data this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid // const xGrid = this.$refs.xGrid
// //
// const dwbm = xGrid.getColumnByField('dwbm') // const dwbm = xGrid.getColumnByField('dwbm')
@ -343,77 +411,7 @@ export default {
getHeight() { getHeight() {
this.height = window.innerHeight - 190 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
}
}
} }
} }
</script> </script>

2
src/views/sjzx/plbXC.vue
Unescape View File

@ -47,7 +47,7 @@
<el-form-item label="批量:"> <el-form-item label="批量:">
<el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input> <el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="批量:"> <el-form-item >
<el-checkbox v-model="queryParam.flag" >不显示完工船只</el-checkbox> <el-checkbox v-model="queryParam.flag" >不显示完工船只</el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col>

98
src/views/sjzx/xclqCX.vue
Unescape View File

@ -9,14 +9,38 @@
<el-col :span="22"> <el-col :span="22">
<el-form-item label="船号:"> <el-form-item label="船号:">
<el-select v-model="queryParam.dcch" filterable placeholder="工程编号" @change="czbhChange" > <vxe-pulldown ref="xDown4" transfer >
<el-option <template #default>
v-for="item in dictData.cbbm" <vxe-input
:key="item.cbbm" v-model="queryParam.dcch"
:label="item.cbbm" placeholder="船号"
:value="item.cbbm"> style="height: 28px;
</el-option> line-height: 28px; width: 150px;"
</el-select> suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="auto"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
</el-form-item> </el-form-item>
<el-form-item label="批量:"> <el-form-item label="批量:">
<el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input> <el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
@ -88,6 +112,9 @@
show-overflow show-overflow
show-header-overflow show-header-overflow
:scroll-y="{enabled: true}" :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' } from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj"; import {null2str, getSumAdd, getSumAddDicByName1} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
@ -124,6 +151,16 @@ export default {
delx:'X' delx:'X'
}, },
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
list: [], list: [],
isupload:'02', isupload:'02',
filedis:true, filedis:true,
@ -131,7 +168,6 @@ export default {
}, },
heads: { token: getToken() }, heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{}, dictData:{},
height: '500px', height: '500px',
@ -163,7 +199,7 @@ export default {
filterRender: { name: 'FilterCombination', }, 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: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
@ -224,7 +260,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'shzl', title: '领取重量', width: 100, { field: 'shzl', title: '实耗重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
@ -324,7 +360,23 @@ export default {
// this.uploadData.czbh = this.queryParam.czbh // this.uploadData.czbh = this.queryParam.czbh
this.uploadData.isupload = this.isupload 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(){ czbhChange(){
if (this.queryParam.cbbm === '') { if (this.queryParam.cbbm === '') {
this.filedis=true this.filedis=true
@ -380,6 +432,8 @@ export default {
initBase(){ initBase(){
getCzplBase({}).then(res=>{ getCzplBase({}).then(res=>{
this.dictData = res.data this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid // const xGrid = this.$refs.xGrid
// //
// const dwbm = xGrid.getColumnByField('dwbm') // 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() { initList() {
if (this.queryParam.dcch === '') { if (this.queryParam.dcch === '') {
this.$message.warning('选择船只编号') this.$message.warning('选择船只编号')

64
src/views/sjzx/xctltCX.vue
Unescape View File

@ -112,7 +112,10 @@
highlight-hover-row highlight-hover-row
show-overflow show-overflow
show-header-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' } from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj"; import {getSumAdd, getSumAddDicByName1, null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
export default { export default {
name:'XctltCX', name:'BctltCX',
data() { data() {
return { return {
queryParam: { queryParam: {
@ -214,20 +217,27 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'ljslZ', title: '零件数量', width: 100, { field: 'ljslZ', title: '零件数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'xgr', title: '编制人', width: 100, { field: 'wph', title: '零件编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ field: 'xgrq', title: '编制日期', width: 100,
{ field: 'zdrZ', title: '编制人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zdrqZ', title: '编制日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
],
footerData1: [
['合计', '2', '44', '67', '-']
] ]
} }
}, },
@ -242,6 +252,31 @@ export default {
}, },
methods: { 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}) { cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel() this.$refs.xDown4.hidePanel()
@ -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(){ initBase(){
getCzplBase({}).then(res=>{ getCzplBase({}).then(res=>{
this.dictData = res.data this.dictData = res.data
@ -342,6 +393,7 @@ export default {
return return
} }
getTLTList(this.queryParam).then((res) => { getTLTList(this.queryParam).then((res) => {
this.list = res.data this.list = res.data
if (this.$refs.xGrid) { if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list) this.$refs.xGrid.loadData(this.list)

Write Preview
Loading…
Cancel
Save