From f7120f92735057274098e9dadf0c04c585f208ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 14 May 2024 17:21:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=80=E8=B7=A8=E5=B9=B3?= =?UTF-8?q?=E7=9B=B4=E5=A4=A7=E7=89=88=E5=B7=A5=E5=BA=8F=E9=94=99=E8=AF=AF?= =?UTF-8?q?=202.=E8=B0=83=E6=95=B4=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8F=90=E5=8F=96=203.=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jhzx/pc.js | 7 +++ src/api/jhzx/sygd.js | 4 -- src/views/jhzx/symxCX.vue | 89 +++++++++++++++++++++------------------ 3 files changed, 55 insertions(+), 45 deletions(-) create mode 100644 src/api/jhzx/pc.js diff --git a/src/api/jhzx/pc.js b/src/api/jhzx/pc.js new file mode 100644 index 0000000..04d53f8 --- /dev/null +++ b/src/api/jhzx/pc.js @@ -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})} diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js index 91003a4..74cac75 100644 --- a/src/api/jhzx/sygd.js +++ b/src/api/jhzx/sygd.js @@ -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'})} diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue index 1a7b5cd..4a3d068 100644 --- a/src/views/jhzx/symxCX.vue +++ b/src/views/jhzx/symxCX.vue @@ -26,8 +26,8 @@ - -
+ +
三月滚动计划编制 读取三月滚动
- 三月滚动计划编制 - 读取三月滚动 - 提取明细 - 汇总 + 三月滚动计划编制 + 读取三月滚动 + 汇总 { - - 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 }) }, //明细排产