modified: src/views/quality/finishedProductInspection/finishedProducter-...

王震

2023-11-16 9c3cda89b53b134b95142116c7d1a72eb1a8f5b3

	modified:   src/views/quality/finishedProductInspection/finishedProducter-print.vue
	modified:   src/views/quality/finishedProductInspection/index.vue

 src/views/quality/finishedProductInspection/finishedProducter-print.vue

@@ -122,12 +122,10 @@
                    <span style="font-family:宋体">{{testValue}}</span>
                </td>
                <td  colspan=2  class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
                    <p v-if="el.iresult==1" class="MsoNormal" align="center" style="text-align:center">
                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">合格</span></p>
                    <p v-if="el.iresult==0" class="MsoNormal" align="center" style="text-align:center">
                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">不合格</span></p>
                    <!-- <p v-else class="MsoNormal" align="center" style="text-align:center">
                    <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif"></span></p> -->
                    <p  class="MsoNormal" align="center" style="text-align:center">
                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">{{ el.iresult | formatState}}</span></p>

                    
                </td>
            </tr>
            </tbody>
@@ -590,30 +588,30 @@
                    </div>
                    <div>
                        <div class="chilen">
                        <p ><span class="x1111113">批  准:<br>Approved by</span></p> 
                        <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        <p ><span class="x1111113">批  准:<br>&nbsp;&nbsp;Approved by</span></p> 
                        <p v-for="pel in prjdata"><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        </div>
                        <div class="chilen">
                        <p ><span class="x1111113">核验员:<br>Inspected by</span></p> 
                        <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        <p ><span class="x1111113">核验员:<br>&nbsp;&nbsp;Inspected by</span></p> 
                        <p v-for="pel in prjdata"><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        </div>
                        <div style="display: flex;margin-left: 290px;">
                        <p ><span class="x1111113">检验员：<br>Tested by</span></p> 
                        <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        <div style="display: flex;margin-left: 280px;">
                        <p ><span class="x1111113">检验员：<br>&nbsp;Tested by</span></p> 
                        <p ><span  class="time">{{username}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        </div>
                        <div class="cldata">
                        <p ><span class="x1111113">送样日期:<br>Delivery Date</span></p> 
                        <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        <p v-for="pel in prjdata"><span class="time">{{tableData.updateTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        </div>
                        <div class="cldata">
                        <p ><span class="x1111113">测试日期:<br>Testing Date</span></p> 
                        <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        <p v-for="pel in prjdata"><span class="time">{{tableData.createTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                        </div>
                    </div>
                </div>
                </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: 0, 32, 96;">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>      
@@ -648,15 +646,32 @@
            material:null,
            materialCode:null,
            quantity:null,
            username:null,
        }
    },
    filters:{
        formatState(state){
            if(state){
                if(state == "1"){
                    return "合格"
                }
                if(state == "0"){
                    return "不合格"
                }
                return null
            }
            return null
        }
    },
    created(){
        this.tableData = this.formData
        console.log(this.tableData,"=======================77777777");
        this.initData()
        this.initprjdata(this.prjdata)
    },
    methods:{
        initData(){
            let ii = []
        console.log("<------------------------------->");
            this.deviceStr = this.tableData.projectName
            this.product = this.tableData.material
@@ -667,9 +682,14 @@
            this.quantity = this.tableData.quantity
            console.log(this.tableData,"--------------------11111");
            this.tableData.children.forEach(el =>{
                console.log(el,"-->-->");
                this.prjdata.push(el)
             })
                el.children.forEach(kl =>{
                    if(kl.userName){
                        ii.push(kl.userName)
                    }
                })
            })
                this.username = Array.from(new Set(ii)).join(",")
        },
        initprjdata(list){
            console.log(list,"uuuuuuuuuuuuuuuuu");
@@ -679,7 +699,7 @@
                            iname: '',
                            inote: '',
                            inspectionValue: '',
                            iresult: '',
                            : '',
                            required: '',
                            iunit: '',
                            itype: '',
@@ -1885,9 +1905,47 @@
    margin-left: 140px;
}
.ziti{
   font-size: 38pt;
   font-family: 宋体;
    display: flex;
   margin-left: 140px;
    
   padding: 0px;
    mso-ignore: padding;
    color: black;
    font-size: 20pt;
    font-weight: 400;
    font-style: normal;
    text-decoration: none;
    font-family: 宋体;
    mso-generic-font-family: auto;
    mso-font-charset: 134;
    mso-number-format: General;
    text-align: general;
    vertical-align: middle;
    mso-background-source: auto;
    mso-pattern: auto;
    white-space: nowrap;
}
.time{
    display: flex;
   margin-left: 80px;
   margin-top: 20px;
    padding: 0px;
    mso-ignore: padding;
    color: black;
    font-size: 20pt;
    font-weight: 400;
    font-style: normal;
    text-decoration: none;
    font-family: 黑体;
    mso-generic-font-family: auto;
    mso-font-charset: 134;
    mso-number-format: General;
    text-align: general;
    vertical-align: middle;
    mso-background-source: auto;
    mso-pattern: auto;
    white-space: nowrap;

}
.chilen{
    display: flex;
@@ -1908,7 +1966,7 @@
    font-weight: 400;
    font-style: normal;
    text-decoration: none;
    font-family: 宋体;
    font-family: 黑体;
    mso-generic-font-family: auto;
    mso-font-charset: 134;
    mso-number-format: General;
@@ -1926,7 +1984,7 @@
    font-weight: 400;
    font-style: normal;
    text-decoration: none;
    font-family: 宋体;
    font-family: 黑体;
    mso-generic-font-family: auto;
    mso-font-charset: 134;
    mso-number-format: General;

 src/views/quality/finishedProductInspection/index.vue

@@ -225,15 +225,18 @@
                    style: '@page {margin: 2.0mm 2.0mm}',
                    targetStyles: ["*"],
                    // importCSS: true,
                    fontSize: '30px',
                    ignoreElements: ["no-ignore"],
                    orientation: 'portrait'
                });
            },
            //查看报告按钮
            showPrint(row){
                console.log('----------');
                queryById(row.id).then(res=>{
                    this.printFormData = res.data.data
                    this.printFormData.createTime = row.createTime
                    this.printFormData.updateTime = row.updateTime
                    console.log(this.printFormData,"7777777777=====");
                    this.printDialogVisible = true
                }).catch(error=>{
                    console.log(error);