From b15de00ffba31695514c1a404dbbbf65dc1e87c1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 09 十一月 2023 13:21:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/finishedProduct-print.vue | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-print.vue b/src/views/quality/finishedProductInspection/finishedProduct-print.vue
index a3b53fc..48d7c40 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-print.vue
@@ -27,10 +27,16 @@
<td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
height:40.05pt'>椤圭洰鍚嶇О</td>
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>銆�</td>
+ border-left:none'>銆�
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="deviceStr"></span></p>
+ </td>
<td class=xl6924921 style='border-top:none;border-left:none'>浜у搧鍚嶇О</td>
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>銆�</td>
+ border-left:none'>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="product"></span></p>
+銆� </td>
</tr>
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
<td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
@@ -266,7 +272,46 @@
<script>
export default {
-
+ props:{
+ formData:{
+ type: Object,
+ default:()=>{
+ return {}
+ }
+ }
+ },
+ data(){
+ return{
+ tableData: null,
+ projectList: [],
+ deviceStr: null,
+ product:null,
+ childrenData: [],
+ }
+ },
+ created(){
+ this.tableData = this.formData
+ console.log("============",this.tableData)
+ this.initData()
+ // this.initProjectList(this.projectList)
+ },
+ methods:{
+ initData(){
+ this.deviceStr = this.tableData.projectName
+ this.product = this.tableData.material
+ },
+ },
+ watch:{
+ formData(newVal){
+ if(newVal){
+ this.projectList = []
+ console.log(newVal)
+ this.tableData = newVal
+ this.initData()
+ // this.initProjectList(this.projectList)
+ }
+ }
+ },
}
</script>
--
Gitblit v1.9.3