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

1.修复一跨平直大版工序错误

Browse Source 
2.调整汇总数据提取
3.删除重复依赖
master
董哲奇 1 year ago
parent 1df77b54dd
commit f7120f9273
3 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File

7
src/api/jhzx/pc.js
Unescape View File

@ -0,0 +1,7 @@
import request from "@/utils/request";
export function 排产(data) {return request({url: '/sygdpc/pc', method: 'get',params:data})}
export function 获取排产结果(data) {return request({url: '/sygdpc/sygdjh', method: 'get',params:data})}
export function 生成三月滚动(data) {return request({url: '/sygdpc/createSygdjh', method: 'get',params:data})}

4
src/api/jhzx/sygd.js
Unescape View File

@ -6,10 +6,6 @@ export function tj(data) {return request({url: '/dmSygd/tj', method: 'post', dat
export function sh(data) {return request({url: '/dmSygd/sh', method: 'post', data})}
export function saveByDcch(data) {return request({url: '/dmSygdMx/saveByDcch', method: 'post', data})}
export function symxhz(data) {return request({url: '/dmSygdMx/symxhz', method: 'post', data})}
export function 排产(data) {return request({url: '/dmSygdMx/pc', method: 'get',params:data})}
export function 获取排产结果(data) {return request({url: '/dmSygdMx/sygdjh', method: 'get',params:data})}
export function sygdPC() {return request({url: '/dmSygdMx/sygdPC', method: 'post'})}
export function tqSygd(data) {return request({url: '/dmSygdMx/tqSygd', method: 'post',data})}
export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'post'})}

89
src/views/jhzx/symxCX.vue
Unescape View File

@ -26,8 +26,8 @@
<el-container style="padding-top: 0px">
<el-main>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="三月滚动计划编制" name="sygdjh" v-show="isUser">
<div class="mytable">
<el-tab-pane label="三月滚动计划编制" name="sygdjh" v-if="isUser">
<div class="mytable" >
<el-button type="success" @click="paichan">三月滚动计划编制</el-button>
<el-button type="success" @click="jgcx">读取三月滚动</el-button>
<vxe-grid
@ -41,7 +41,7 @@
:auto-resize="true"
:columns="tableColumn9"
highlight-current-row
:data="list1"
:data="list9"
:custom-config="{ storage: true }"
:scroll-y="{enabled: true}"
highlight-hover-row
@ -53,10 +53,9 @@
</el-tab-pane>
<el-tab-pane label="前方三月需求计划" name="first">
<div class="mytable">
<el-button type="success" @click="paichan" v-show="isUser">三月滚动计划编制</el-button>
<el-button type="success" @click="jgcx" v-show="isUser">读取三月滚动</el-button>
<el-button type="success" @click="sygdPC()" v-show="!isUser"> 提取明细</el-button>
<el-button type="success" @click="symxhz" v-show="!isUser">汇总</el-button>
<el-button type="success" @click="paichan">三月滚动计划编制</el-button>
<el-button type="success" @click="jgcx">读取三月滚动</el-button>
<el-button type="success" @click="symxhz">汇总</el-button>
<vxe-grid
id="id"
ref="xGrid"
@ -119,7 +118,6 @@
highlight-current-row
:data="list1"
:custom-config="{ storage: true }"
:span-method="rowspanMethod"
:cell-style="cellStyle"
:row-style="rowClassName"
highlight-hover-row
@ -301,24 +299,19 @@ import {
saveByDcch,
tqSygd,
symxhz,
getCnsb,
saveMxList,
tqSygd1,
排产,
获取排产结果
} from '@/api/jhzx/sygd'
import {mapGetters} from 'vuex'
import XEUtils from 'xe-utils'
import {getToken} from '@/utils/auth'
import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
import {emSbjbbZM} from "@/api/sjzx/sbcnWH";
import {排产, 生成三月滚动, 获取排产结果,} from "@/api/jhzx/pc";
export default {
name: 'SymxCX',
components: {ScrollPane},
data() {
return {
isUser:true,
isUser:false,
gcrl:[],
dialogVisible: false,
dialogVisible1: false,
@ -2606,10 +2599,13 @@ export default {
filterRender: { name: 'FilterCombination', },
},
],
list9:[],
tableColumn9:[
{type: 'seq', width: 60, title: '序号', fixed: "left"},
{ field: 'day', title: '日期', width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
sortable:true,
},
{ field: '白班时长', title: '白班', width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -2619,27 +2615,32 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kw', title: '套料图名称', width: 120,formatter:['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
sortable:true,
},
{ field: '工序', title: '工序', width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kw', title: '套料图名称', width: 100,formatter:['dictFormat','QGKW'],
{ field: '产能', title: '设备总定额', width: 110,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: '产能', title: '定额', width: 70,
{ field: '设备产能', title: '设备单台定额', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: '设备编号', title: '设备编码', width: 100,
{ field: '_degs', title: '实际定额', width: 110,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: '设备名称', title: '设备名称', width: 100,
{ field: '', title: '划线长度', width: 110,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: '设备产能', title: '设备定额', width: 100,
{ field: '', title: '切割长度', width: 110,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -2659,16 +2660,16 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'czlx', title: '操作类型(手工/数控)', width: 80,
{ field: 'czlx', title: '类型', width: 80,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
//下面是bom的表头
{ field: 'zl', title: '组立', width: 80,
{ field: 'zl', title: '组立', width: 80,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kw', title: '跨位', width: 80,
{ field: '_kw', title: '跨位', width: 80, formatter: ['dictFormat', 'QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -2688,7 +2689,12 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: '_degs', title: '定额', width: 80,
{ 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', },
},
@ -2702,8 +2708,8 @@ export default {
window.addEventListener('resize', this.getHeight)
this.getHeight()
this.initBase()
if(this.yhdm=='UserAdmin'||this.yhdm=='user02'){
this.isUser=false
if(this.yhdm=='user01'){
this.isUser=true
}
},
watch: {
@ -2912,13 +2918,7 @@ export default {
return
}
getList(this.queryParam).then((res) => {
this.list = res.data.list
// this.gcrl=res.data.gcrl
// if (this.$refs.xGrid) {
// this.$refs.xGrid8.loadData(this.list8)
// }
})
this.activeName = 'first'
},
@ -2930,19 +2930,25 @@ export default {
},
paichan(){
const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
排产(data).then(res=>{
this.jgcx()
排产(data).then(()=>{
this.jgcx(false)
// 生成三月滚动(data).then(res=>{
// this.list=res.data
// })
})
},
jgcx(){
jgcx(flag=true){
const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
const list=[]
if (flag){
this.initList()
}
const 工序表=['上料','抛丸','理料','划线','切割','坡口','曲型','打磨','型材面板']
获取排产结果(data).then(res=>{
this.activeName="sygdjh"
if(this.isUser){
this.activeName="sygdjh"
}
const zy=res.data.zy
console.log(res)
const list=[]
Object.keys(zy).forEach(key=>{
if (key>=this.queryParam.beginTime&&key<=this.queryParam.endTime){
@ -2971,6 +2977,7 @@ export default {
data.dzglxq=bom.dzglxq
data.zl=bom.zl
data.kw=bom.kw
data._kw=bom.kw
data.tzbh=bom.tzbh
data.wpgg=bom.wpgg
data.wpcz=bom.wpcz
@ -2983,8 +2990,8 @@ export default {
}
}
})
console.log(list)
this.list1=list
this.list9=list
})
},
//明细排产

Write Preview
Loading…
Cancel
Save