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 @@