From 78205457ae730992201bacde39e627405afaab9e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 2 Aug 2024 21:11:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=85=89=E5=AD=90=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pm/utask_form.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/pm/utask_form.vue b/src/views/pm/utask_form.vue index 169836a8..383aa4d9 100644 --- a/src/views/pm/utask_form.vue +++ b/src/views/pm/utask_form.vue @@ -34,7 +34,7 @@ @@ -165,7 +165,7 @@ export default { methods: { getRouteOptions() { this.$API.mtm.route.list - .req({ page: 0, mgroup__belong_dept: this.activeDept }) + .req({ page: 0, mgroup__belong_dept: this.activeDept, routepack__isnull: true }) .then((res) => { for (var i = 0; i < res.length; i++) { if (res[i].material_in_name == undefined) { From d033ac01a7d83fc90c2fd74a37afb1c42774ff05 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sun, 4 Aug 2024 20:32:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20opl=E6=B7=BB=E5=8A=A0=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=B1=95=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scOpl/scFire.vue | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue index 207e3149..932dbc4a 100644 --- a/src/components/scOpl/scFire.vue +++ b/src/components/scOpl/scFire.vue @@ -102,14 +102,6 @@ 进行中 - + + + + + +