From e8b387a545aba39f4472bc518c2288401a4881c2 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Tue, 20 Feb 2024 10:17:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8D=95=20=20=E5=8F=8A=E7=94=9F=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=8D=95=E9=A1=B5=E9=9D=A2=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/index.vue | 6 +- .../src/views/heli/plan/productionPrint.vue | 134 +++++++++++------- 2 files changed, 85 insertions(+), 55 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue index 98116e00..a57afaa3 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue @@ -5,7 +5,7 @@ - + @@ -36,8 +36,8 @@ - - + + 搜索 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 8478fbbd..b27029a6 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 @@ -2,7 +2,7 @@
- +
- + - + - + - - + + @@ -156,7 +166,7 @@ - + @@ -168,8 +178,14 @@ - - + + @@ -210,9 +226,9 @@
@@ -110,40 +110,50 @@ 设备型号 数量 主要材料 毛坯日期 毛坯日期 2D/日期 3D/日期
{{ idx+1 }}
{{item.name}}   - {{ formData.code+'-'+formData.customer.code+'-'+ item.projectSubShortName}} + {{ formData.code+'-'+formData.customer.code+'-'+ item.projectSubShortName}}
{{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 }} + +  
{{item+(formData.projectOrderSubs.length)}}    
序号 工艺流程 开始日期 {{ index+1 }} {{ its.name }} {{formatDate(new Date(its.startDate), 'YYYY-MM-DD')}}{{formatDate(new Date(its.endDate), 'YYYY-MM-DD')}} +   + {{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}}
-
+
- +
@@ -233,33 +249,33 @@ - + - + - + - + - + - + - - + + + + - - - - + + + + + + + + + + + + + + + + @@ -335,16 +366,16 @@ - - - - - - - - - - + + + + + + + + + +
@@ -225,7 +241,7 @@
项目编号
-
{{ `formData.code` }}
+
{{ formData.code }}
客户名称 - {{ '公司名字' }} + {{ formData.customerName }} {{ `密称` }}{{ formData.customer.brief }} 编码： {{ `1091` }} {{ formData.customer.code }}
项目名称 - {{ `系列模具` }} + {{ formData.projectName }} 业务员： {{ `xxx` }} {{ formData.businessManName }}
项目工期 起 - {{ '2024/1/11' }} + {{ formatDate(new Date(formData.projectStartTime), 'YYYY-MM-DD') }} 至{{ `2024/4/11` }}{{ formatDate(new Date(formData.projectEndTime), 'YYYY-MM-DD') }} 天数{{ `92` }}{{ betweenDay(new Date(formData.projectStartTime), new Date(formData.projectEndTime)) }} 是否紧急： {{ `否` }} {{ getDictLabel(DICT_TYPE.HELI_COMMON_IS_OR_NOT, formData.isUrgency) }}
@@ -285,32 +301,47 @@ 2D/日期 3D/日期
{{ item + 8 }}
{{ idx+4 }}
- {{ `名称` }} - {{ `编号` }} + {{item.name}} +   + {{ formData.code+'-'+formData.customer.code+'-'+ item.projectSubShortName}}
{{ `LP 100L` }} {{ `1` }} {{ `H13` }} {{ `2024/1/15` }} {{equipInit.find((equip) => equip.id == item.equipId)?.name}} {{item.amount}} {{ item.compositionName }} {{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }}
- {{ `2024/1/15` }} - {{ `name` }} + {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} + {{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }}
-
- {{ `2024/1/15` }} - {{ `name` }} +
+ {{ formatDate(new Date(item.threeDimDate), 'YYYY-MM-DD') }} + {{ userInit.find((user) => user.id == item.threeDimOwner)?.nickname }}
{{item+(formData.projectOrderSubs.length)}}             
审核/日期 批准/日期
{{formData.creatorName}}{{formData.auditUserName}}{{formData.approveUserName}}
{{formatDate(new Date(formData.createTime), 'YYYY-MM-DD')}}{{formatDate(new Date(formData.auditTime), 'YYYY-MM-DD')}}{{formatDate(new Date(formData.approveTime), 'YYYY-MM-DD')}}
{{formData.creatorName}}{{formData.auditUserName}}{{formData.approveUserName}}
{{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}}{{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}
@@ -564,7 +595,6 @@ const open = async (id: number) => { // 生产计划数据 planData.value = await PlanApi.getPlan(id) - formData.value = await ProjectOrderApi.getProjectOrder(planData.value.projectId) // 子项列表 formData.value.projectOrderSubs = await ProjectOrderApi.getProjectOrderSubListByProjectOrderId(