From 6d2ba4743d0d9d8d4b25f3c04c3bce503397c06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Fri, 1 Nov 2024 10:46:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=8E=92=E4=BA=A7=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E9=A1=BA=E5=BA=8F=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202.=E4=BC=98=E5=8C=96=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8E=92=E4=BA=A7=E9=A1=B5=E9=9D=A2=E6=AD=A5=E9=AA=A4=E6=9D=A1?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E7=82=B9=E5=87=BB=E6=BF=80?= =?UTF-8?q?=E6=B4=BB=E5=90=84=E6=AD=A5=E9=AA=A4=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?,=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E4=BA=A7=E8=83=BD?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=8C=89=E7=85=A7=E5=9E=AE=E4=BD=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Gcrl/GcrlProperties.vue | 3 --- src/views/jhzx/components/sygdpc/Sbcn.vue | 13 +++++++++++-- src/views/jhzx/symxCX.vue | 12 ++++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/components/Gcrl/GcrlProperties.vue b/src/components/Gcrl/GcrlProperties.vue index b786ea1..3a6a64e 100644 --- a/src/components/Gcrl/GcrlProperties.vue +++ b/src/components/Gcrl/GcrlProperties.vue @@ -43,17 +43,14 @@ export default { }, mounted(){ this.handler() - console.log(this.workType) }, methods:{ handler(){ const data=this.dateFormat(this.$props.data) - console.log(data) if (this.$props.eb.includes(data)){ this.workType='1' return } - console.log(this.$props.yb); if (this.$props.yb.includes(data)){ this.workType='2' return diff --git a/src/views/jhzx/components/sygdpc/Sbcn.vue b/src/views/jhzx/components/sygdpc/Sbcn.vue index a97f31e..956cf88 100644 --- a/src/views/jhzx/components/sygdpc/Sbcn.vue +++ b/src/views/jhzx/components/sygdpc/Sbcn.vue @@ -135,14 +135,23 @@ export default { methods:{ getList(){ getSbcnAll().then((res) => { - this.sbcnList=[] + const sbcnList=[] this.gxList.forEach(gx=>{ res.data.forEach(item=>{ if (gx.value===item._工序){ - this.sbcnList.push(item) + sbcnList.push(item) } }) }) + this.sbcnList=sbcnList.sort((a,b)=>{ + if (a.跨位 < b.跨位) { + return -1; + } + if (a.跨位 > b.跨位) { + return 1; + } + return 0; + }) }) }, add(){ diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue index 83c61eb..caba8cc 100644 --- a/src/views/jhzx/symxCX.vue +++ b/src/views/jhzx/symxCX.vue @@ -313,12 +313,12 @@