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

基础数据

Browse Source
master
xhj 2 years ago
parent 6b8dfc40fe
commit fa8911680c
4 changed files with 101 additions and 43 deletions
Show Stats Download Patch File Download Diff File

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

@ -22,6 +22,10 @@
<el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
</el-form-item>
<el-form-item label="分段:">
<el-input v-model="queryParam.dcfd" type="search" placeholder="分段" ></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
@ -76,15 +80,14 @@
ref="xGrid"
border
resizable
keep-source
:align="'center'"
:height="height"
:auto-resize="true"
:columns="tableColumn"
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
:span-method="mergeRowMethod"
highlight-hover-row
show-overflow
show-header-overflow
@ -122,7 +125,8 @@ export default {
queryParam: {
dcch:'',
dcpl:'',
delx:'B'
delx:'B',
dcfd:''
},
list: [],
@ -160,34 +164,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qpyldZ', title: '前批余料代总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
// { field: 'ljzlZ', title: '零件重量总', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'ybzsZ', title: '用板总数', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqzlZ', title: '领取重量总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'shzlZ', title: '实耗重量总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylzlZ', title: '余料重量总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
@ -253,6 +230,34 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qpyldZ', title: '前批余料代总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
// { field: 'ljzlZ', title: '零件重量总', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'ybzsZ', title: '用板总数', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqzlZ', title: '领取重量总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'shzlZ', title: '实耗重量总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylzlZ', title: '余料重量总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
// { field: 'bz', title: '备注', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -387,6 +392,40 @@ export default {
this.$refs.xGrid.setActiveCell(row,column)
},
mergeRowMethod ({ row, $rowIndex, column, data }) {
const fields = [ 'dcChZ',
'dcPlZ',
'dcFdZ',
'lqzlZ',
'dcZlZ',
'lqlbZ',
'zzcjZ',
'ybzsZ',
'shzlZ',
'ylzlZ'
]
console.log("111");
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}
}
}
}
},
selectChange(row) {
// this.$refs.xGrid.clearActived() // 清除单元格激活状态

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

@ -3,7 +3,7 @@
<el-container>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-form :inline="true" label-width="65px" label-position="left">
<el-form :inline="true" label-width="75px" label-position="left">
<el-row>
<el-col :span="22">
@ -21,6 +21,9 @@
<el-form-item label="批量:">
<el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
</el-form-item>
<el-form-item label="套料图号:">
<el-input v-model="queryParam.tzbh" type="search" placeholder="套料图号" ></el-input>
</el-form-item>
</el-col>
@ -122,7 +125,8 @@ export default {
queryParam: {
dcch:'',
dcpl:'',
delx:'B'
delx:'B',
tzbh:''
},
list: [],

10
src/views/sjzx/bomcx.vue
Unescape View File

@ -311,7 +311,10 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fds', title: '分段和', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fd', title: '分段', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -547,10 +550,7 @@ export default {
// { field: 'fds', title: '分段和', width: 120,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },

25
src/views/sjzx/bomwh.vue
Unescape View File

@ -45,11 +45,11 @@
<el-form-item style="float: right" >
<!-- <el-button-->
<!-- type="success"-->
<!-- @click="tjClick"-->
<!-- >保存</el-button>-->
<!-- <el-button-->
<el-button
type="success"
@click="tjClick"
>保存</el-button>
<!-- type="success"-->
<!-- @click="bomClick"-->
<!-- >生成bom</el-button>-->
@ -1063,6 +1063,21 @@ export default {
if (this.fileList.length === 0) {
return this.$message.warning('请选取文件后再上传')
}
// 判断是否满足条件
if(this.bclqList.length ==0){
return this.$message.warning('缺少板材领取数据')
}
if(this.xclqList.length ==0){
return this.$message.warning('缺少型材领取数据')
}
if(this.bctjList.length ==0){
return this.$message.warning('缺少板材统计数据')
}
if(this.xctjList.length==0){
return this.$message.warning('缺少型材统计数据')
}
return;
// 下面的代码将创建一个空的FormData对象:
const formData = new FormData()
// 你可以使用FormData.append来添加键/值对到表单里面；

Write Preview
Loading…
Cancel
Save