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

Merge remote-tracking branch 'origin/master'

Browse Source
master
xhj 2 months ago
parent 9f545d4541 018332807c
commit 3dbef3a6d9
2 changed files with 27 additions and 181 deletions
Show Stats Download Patch File Download Diff File

205
src/views/jhzx/sygdCX.vue
Unescape View File

@ -4,12 +4,14 @@
<el-form :inline="true" label-width="65px" label-position="left">
<el-row>
<el-col :span="15" >
<el-form-item style="margin-left: 4px;">
<span style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
<el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd" type="date" style="width: 33%;" />
<span style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
<el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd" type="date" style="width: 33%" />
</el-form-item>
<el-select v-model="queryParam.fileName" filterable placeholder="计划名称" @change="fileNameChange" >
<el-option
v-for="(item,index) in fileNameList"
:key="index"
:label="item"
:value="item">
</el-option>
</el-select>
<el-form-item label="状态:" >
<el-select
v-model="queryParam.gdZt"
@ -34,7 +36,7 @@
icon="el-icon-download"
@click="handleExport"
>导出</el-button>
<div style="float: right;margin-left: 5px" >
<!-- <div style="float: right;margin-left: 5px" >
<el-upload
:action="uploadAction"
:show-file-list="false"
@ -46,7 +48,7 @@
>
<el-button type="success" @click="uploadExcel" >导入</el-button>
</el-upload>
</div>
</div>-->
</el-form-item>
</el-col>
</el-row>
@ -81,7 +83,6 @@
:custom-config="{ storage: true }"
highlight-current-row
highlight-hover-row
:span-method="rowspanMethod"
@checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent"
:scroll-y="{ enabled: true }"
@ -96,20 +97,21 @@
<script>
import { getCzxx} from '@/api/jhzx/qfxq'
import {getSygdList,tj} from '@/api/jhzx/sygd'
import {getFilenameNew, getSygdList, listByFileNameNew, tj} from '@/api/jhzx/sygd'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
import ydjhNewTable from "@/views/jhzx/js/ydjhNewTable";
export default {
name:'SygdWH',
data() {
return {
fileNameList:[],
queryParam: {
beginTime:'',
endTime:'',
fileName:'',
gdZt:'0'
},
gdZtOptions:[
@ -135,143 +137,7 @@ export default {
uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
dictData:[],
height: '500px',
tableColumn:[
{ type: 'checkbox', width: 50 ,},
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
{ field: 'dcCh', title: '船号',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'dcPl', title: '批量',width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'dcFd', title: '分段号',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'bs', title: '板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sl', title: '上料', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xcpw', title: '型材抛丸', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pw', title: '抛丸', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'yklm', title: '一垮龙门板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'yksk', title: '一垮数控板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ykpkjs', title: '坡口切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'eksk', title: '二垮数控板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ekskks', title: '数控切割开始', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ekpkjs', title: '坡口切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sksk', title: '三垮数控板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skskqgks', title: '数控切割开始', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skpkjs', title: '坡口切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skpt', title: '三垮平铁板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ptks', title: '平铁切割开始', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ptjs', title: '平铁切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qptZjs', title: '曲平铁转结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qptjs', title: '曲平铁结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qwbjs', title: '曲外板结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zl', title: '组立', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skbs', title: '数控 板数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'skqgks', title: '数控切割开始', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkqgjs', title: '坡口切割结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'mbjb', title: '面板挤边', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qkxcms', title: '七垮型 材米数', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xcmb', title: '型材 面板', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fdxq', title: '分段需求', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'gdjs', title: '光电 结束', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bz', title: '备注', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
// { field: 'zt', title: '状态', width: 120,formatter:this.formatterZt,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'id', title: '流水号（禁止修改）',width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }}
],
tableColumn:[],
checkedList: [],
}
},
@ -279,6 +145,8 @@ export default {
...mapGetters(['name', 'bmbm'])
},
created() {
const {tableColumn}=ydjhNewTable()
this.tableColumn = tableColumn
window.addEventListener('resize', this.getHeight)
this.getHeight()
this.initBase()
@ -316,21 +184,6 @@ export default {
}
return cellValue
},
rowspanMethod({row, _rowIndex, column, visibleData}) {
//不要忘记在vxe-grid上配置 :scroll-y="{enabled: false}" 防止下拉时样式变化
// 需要合并的列字段
let fields = ['dcCh','dcPl'];// 需要合并的列
const cellValue = row[column.property];// 合并行的相同的唯一标识
if (cellValue && fields.includes(column.property)) {
const prevRow = visibleData[_rowIndex - 1];
let nextRow = visibleData[_rowIndex + 1];
if(_rowIndex%2==0){
return {rowspan: 2, colspan: 1};
}else {
return {rowspan: 0, colspan: 0};
}
}
},
handleExport() {
this.$refs.xGrid.exportData({
filename: '三月滚动计划',// 文件名字
@ -418,31 +271,21 @@ export default {
}
},
initBase(){
getFilenameNew().then(res=>{
this.fileNameList=res.data
})
getCzxx({}).then(res=>{
this.dictData = res.data
})
},
initList() {
if (this.queryParam.beginTime === ''||
this.queryParam.beginTime === null||
this.queryParam.beginTime === ''||
this.queryParam.endTime === null) {
this.$message.warning('选择时间范围')
const fileName=this.queryParam.fileName
if (!fileName){
this.$message.warning('请先选择文件名')
return
}
getSygdList(this.queryParam).then((res) => {
listByFileNameNew({fileName,zt:this.queryParam.gdZt}).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
}
})
},
tj(){
tj(this.checkedList).then((res)=>{
if (res){
this.$message({ message: '提交成功', type: 'success' })
this.initList()
}
})
},
formatDate ({ cellValue }) {

3
src/views/jhzx/sygdSH.vue
Unescape View File

@ -105,6 +105,7 @@ import XEUtils from 'xe-utils'
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
import ydjhNewTable from "@/views/jhzx/js/ydjhNewTable";
export default {
name:'SygdWH',
data() {
@ -145,6 +146,8 @@ export default {
...mapGetters(['name', 'bmbm'])
},
created() {
const {tableColumn}=ydjhNewTable()
this.tableColumn = tableColumn
window.addEventListener('resize', this.getHeight)
this.getHeight()
this.initBase()

Write Preview
Loading…
Cancel
Save