From 8d052fa277b38fab3ab3b8bae42780c65a7502d1 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Mon, 26 Feb 2024 16:45:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/heli/purchaseorder/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue index 333271ff..de7cb683 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue @@ -43,11 +43,11 @@ 新增 - - 乘税率导出 + + 乘税率导出 - - 直接导出 + + 直接导出 From 6a9833be16b6fff800ea2b0f5d65c5f0c7f916bc Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Mon, 26 Feb 2024 16:53:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes-ui/mes-ui-admin-vue3/src/styles/cus.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss index 6591c168..49eacdbe 100644 --- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss +++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss @@ -185,11 +185,13 @@ .iaudit { background-color: #19A998; color:#FFFFFF; + border:none; } //已启动 .istart { background-color: #1B9AEE; color: #FFFFFF; + border:none; } //已打回 .iBack { @@ -202,21 +204,26 @@ .ialteration { background-color:#FFF7E6; color:#D46B08; + border:none; } //已提交 .isubmit { background-color: #19A998; color:#FFFFFF; + border:none; } //已作废 .icancellation { background-color: #F0F1F4; color: #666879; + border:none; + } //已终止 .ibreakup { background-color: #F0F1F4; color: #666879; + border:none; } //全部发货 From 3b945c26556b782f53ddb3e439183dbad096379d Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Mon, 26 Feb 2024 17:29:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9disabled?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue index e260e174..81106edd 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue @@ -85,7 +85,7 @@ - + @@ -954,7 +954,7 @@ onMounted(() => { // 材质传递的值 const handleSelectedcomposition = (currentIndex: number, newValue: any) => { - + formData.value.projectOrderSubs[currentIndex].compositionId = newValue?.id } //职工 From 54ac85277c95e7cb010c226321af70ea9a2fd381 Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Mon, 26 Feb 2024 17:34:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue index 81106edd..783fc64e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue @@ -221,12 +221,12 @@ - + - + From 820048a1ce69a8164fd523aa39cabdab167e54db Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Mon, 26 Feb 2024 17:37:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8D=95=E6=97=A5=E6=9C=9F=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/heli/plan/productionPrint.vue | 127 +++++++++++++----- 1 file changed, 92 insertions(+), 35 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue index 0667e5ff..26575868 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue @@ -89,11 +89,20 @@ 是否要工艺: - {{ getDictLabel(DICT_TYPE.HELI_COMMON_IS_OR_NOT, planData.hasCraft) }} + + + {{ getDictLabel(DICT_TYPE.HELI_COMMON_IS_OR_NOT, planData.hasCraft) }} + 开始日期 - {{ formatDate(new Date(planData.craftStartDate), 'YYYY-MM-DD') }} + +   + {{ formatDate(new Date(planData.craftStartDate), 'YYYY-MM-DD') }} + 结束日期 - {{ formatDate(new Date(planData.craftEndDate), 'YYYY-MM-DD') }} + +   + {{ formatDate(new Date(planData.craftEndDate), 'YYYY-MM-DD') }} + 负责人 {{ userInit.find((user) => user.id == planData.craftOwner)?.nickname }} @@ -126,16 +135,16 @@ {{equipInit.find((equip) => equip.id == item.equipId)?.name}} {{item.amount}} {{ item.compositionName }} - +   {{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }} - +
-   +   {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} {{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }} -   +  
@@ -178,14 +187,14 @@ {{ index+1 }} {{ its.name }} - +   {{formatDate(new Date(its.startDate), 'YYYY-MM-DD')}} - +   {{formatDate(new Date(its.endDate), 'YYYY-MM-DD')}} - + {{userInit.find((user) => user.id == its.owner)?.nickname}} {{its.description}} @@ -213,16 +222,35 @@ 审核/日期 批准/日期 - + - {{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}} - {{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}} - {{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}} + +   + {{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}} + + +   + {{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}} + + +   + {{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}} + - - {{ userInit.find((user) => user.id == planData.editor)?.nickname }} - {{ userInit.find((user) => user.id == planData.auditor)?.nickname }} - {{ userInit.find((user) => user.id == planData.approver)?.nickname }} + + +   + {{ userInit.find((user) => user.id == planData.editor)?.nickname }} + + +   + {{ userInit.find((user) => user.id == planData.auditor)?.nickname }} + + + +   + {{ userInit.find((user) => user.id == planData.approver)?.nickname }} + @@ -297,15 +325,15 @@ 名称/编号 设备型号 数量 - 主要材料 - 毛坯日期 + 主要材料 + 毛坯日期 2D/日期 3D/日期 - {{ idx+4 }} + {{ idx+1 }}
{{item.name}} @@ -316,17 +344,27 @@ {{equipInit.find((equip) => equip.id == item.equipId)?.name}} {{item.amount}} {{ item.compositionName }} - {{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }} + +   + {{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }} + -
- {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} - {{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }} +
+   + {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} + {{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }} +  
- {{ formatDate(new Date(item.threeDimDate), 'YYYY-MM-DD') }} - {{ userInit.find((user) => user.id == item.threeDimOwner)?.nickname }} +   + + {{ formatDate(new Date(item.threeDimDate), 'YYYY-MM-DD') }} + + {{ userInit.find((user) => user.id === item.threeDimOwner)?.nickname }} + +  
@@ -367,16 +405,35 @@ 审核/日期 批准/日期 - + - {{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}} - {{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}} - {{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}} + +   + {{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}} + + +   + {{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}} + + +   + {{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}} + - - {{ userInit.find((user) => user.id == planData.editor)?.nickname }} - {{ userInit.find((user) => user.id == planData.auditor)?.nickname }} - {{ userInit.find((user) => user.id == planData.approver)?.nickname }} + + +   + {{ userInit.find((user) => user.id == planData.editor)?.nickname }} + + +   + {{ userInit.find((user) => user.id == planData.auditor)?.nickname }} + + + +   + {{ userInit.find((user) => user.id == planData.approver)?.nickname }} +