Merge remote-tracking branch 'origin/master'

王震

2023-08-28 694ffa950bf2435affef95272c7bfd6b62704639

 src/components/experiment/checkTheReport/index.vue

@@ -5,7 +5,7 @@
        </div>
        <div class="center">
            <h1>原材料检测报告</h1>
            <table>
            <table height="30px">
                <tr>
                    <td>材料名称</td>
                    <td colspan="5">{{reportData.name}}</td>
@@ -26,7 +26,9 @@
                </tr>
                <tr>
                    <td>检测依据</td>
                    <td colspan="2">{{reportData.specifications.split("-")[0]}}</td>
                    <td colspan="2">
                        {{reportData.specifications.split("-")[0]}}
                    </td>
                    <td>检测类别</td>
                    <td colspan="2">原材料</td>
                </tr>
@@ -44,7 +46,7 @@
                    <td>{{item.unit}}</td>
                    <td>{{item.required}}</td>
                    <td>{{item.testValue}}</td>
                    <td>{{item.testState == 1 ? "√" : "X"}}</td>
                    <td>{{item.testState === 1 ? "√" : "X"}}</td>
                </tr>
                <tr>
                    <td colspan="6">检验结论：{{reportData.type == 1 ? "合格" : "不合格"}}</td>
@@ -55,14 +57,14 @@
                    </td>
                </tr>
            </table>
            <el-row class="date-group" :gutter="20">
                <el-col :span="12">检测、日期：<span>{{reportData.createTime}}</span></el-col>
                <el-col :span="12">审核、日期：<span>{{reportData.checkTime}}</span></el-col>
            <el-row class="date-group">
                <p>检测、日期：<span>{{reportData.createTime}}</span></p>
                <p>审核、日期：<span>{{reportData.checkTime}}</span></p>
            </el-row>
            <p class="footer">
                <span>编号:</span><span>{{reportData.reportCode}}</span>
                <span> 发行日期:</span><span>{{new Date() | formatDate}}</span>
                <span> 保存期限:</span><span>长期</span>
                <span>编号：</span><span>{{reportData.rcode}}  </span>
                <span>发行日期：</span><span>{{now}}  </span>
                <span>保存期限：</span><span>长期</span>
            </p>
        </div>
    </div>
@@ -72,6 +74,7 @@
    data() {
        return {
            logoSrc : require("@/assets/404_images/logo.png"),    
            now: new Date().toLocaleDateString()
        }
    },
    methods:{
@@ -107,7 +110,6 @@
            }
            table{
                width:100%;
                height:100vh;
                border-collapse: collapse;
                font-size: 18px;
            }
@@ -115,19 +117,23 @@
                border: 2px solid black;
            }
            tr,td,th{
                padding: 5px 5px;
                padding: 10px 10px;
            }
            .date-group .el-col{
            .date-group{
                width: 90%;
                margin-left: 5%;
                p{
                    width: 50%;
                    float: left;
                text-align: center;
                padding: 50px 0px;
                font-size: 18px;
            }
            }
            .footer{
                margin: 0;
                padding: 0;
                width:90%;
                margin-left: 5%;
                color: gray; 
                color: lightgray; 
                text-align: center;
                margin-top: 250px;
            }