From 6578599214f8304b14fe9492aeff2e8745d9e334 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Fri, 2 Feb 2024 09:15:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=20=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E7=BC=96=E5=8F=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/heli/projectorder/startprint.vue | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue index c3ae6748..dd60a974 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue @@ -13,22 +13,22 @@ 开发项目启动单 - +
项目编号
-
{{ `formData.code` }}
+
{{ formData.code}}
- - 客户名称 - - {{ formData.customer.name }} - - {{ formData.customer.brief }} - 编码： - {{ formData.customer.code }} - + + 客户名称 + + {{ formData.customer.name }} + + {{ formData.customer.brief }} + 编码： + {{ formData.customer.code }} + 项目名称 @@ -56,10 +56,7 @@
客户提供资料：
-
+
√ @@ -100,9 +97,11 @@ -
子项目信息
+ + +
子项目信息
+ + 序号 @@ -169,8 +168,8 @@ import * as ProjectOrderApi from '@/api/heli/projectorder' import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict' import { betweenDay, dateFormatter, formatDate } from '@/utils/formatTime' import { Check } from '@element-plus/icons-vue' -import {getCustomer} from "@/api/heli/customer"; -import {getOperateLogPage} from "@/api/system/operatelog"; +import { getCustomer } from '@/api/heli/customer' +import { getOperateLogPage } from '@/api/system/operatelog' const dialogVisible = ref(false) // 弹窗的是否展示 const onPrint = () => { @@ -325,10 +324,10 @@ const open = async (id: number) => { let logParams = { pageNo: 1, pageSize: 2, - typeList: [9,10] + typeList: [9, 10] } const logs = await getOperateLogPage(logParams) - if(logs.list && logs.list.length == 2){ + if (logs.list && logs.list.length == 2) { const approveLog = logs.list[0] const auditLog = logs.list[1] formData.value.approveTime = approveLog.startTime From 4d9a13fb3dd09f2dfb774071445a6c723efa7cef Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Fri, 2 Feb 2024 09:23:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/deliverorder/shipmentsPrint.vue | 56 +++++++------------ 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue index 78fb2740..e9b31371 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue @@ -10,9 +10,7 @@
发货单 -                    +                   
@@ -64,11 +62,7 @@ 尺寸(米) 备注 - + {{ item.name }} {{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }} {{ item.amount }} @@ -123,8 +117,7 @@ {{ formData.transportBusNumber }} 电话 - {{ formData.transportDriverMobile }} + {{ formData.transportDriverMobile }} @@ -144,20 +137,13 @@
- @@ -209,11 +195,7 @@ - + @@ -268,8 +250,7 @@ - @@ -282,15 +263,13 @@
发货单 -                    +                   
尺寸(米) 备注
{{ item.name }} {{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }} {{ item.amount }}{{ formData.transportBusNumber }} 电话 {{ formData.transportDriverMobile }} + {{ formData.transportDriverMobile }}
-
+ "> 制单人：{{ formData.creatorName }} -回单联-
@@ -298,7 +277,7 @@
-
+
@@ -363,7 +342,16 @@ - + + + + + + + + +
{{ item.amount }} {{ item.remark }}
  +
@@ -371,15 +359,13 @@
-
+ "> 制单人：{{ formData.creatorName }} -回单联-