From 62b5cdb9d4b5f34f10b517a3476806bec133fb2f Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 09:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/api/experiment/checkTheReport.js | 9 ++++
src/components/experiment/checkTheReport/index.vue | 60 +++++++++++++++++------------
src/views/inspectionManagement/reportForInspection/index.vue | 7 ++-
src/views/experiment/checkTheReport/index.vue | 37 +++++++++++-------
4 files changed, 70 insertions(+), 43 deletions(-)
diff --git a/src/api/experiment/checkTheReport.js b/src/api/experiment/checkTheReport.js
index 940fb8a..7484a0e 100644
--- a/src/api/experiment/checkTheReport.js
+++ b/src/api/experiment/checkTheReport.js
@@ -7,3 +7,12 @@
params
})
}
+
+//鑾峰彇鎶ュ憡鍐呯殑鏁版嵁
+export function getReportData(params) {
+ return request({
+ url: '/report/getReportContext',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/components/experiment/checkTheReport/index.vue b/src/components/experiment/checkTheReport/index.vue
index 72f4c28..fe7d0f5 100644
--- a/src/components/experiment/checkTheReport/index.vue
+++ b/src/components/experiment/checkTheReport/index.vue
@@ -8,25 +8,27 @@
<table>
<tr>
<td>鏉愭枡鍚嶇О</td>
- <td colspan="5"></td>
+ <td colspan="5">{{reportData.name}}</td>
</tr>
<tr>
<td>瑙勬牸鍨嬪彿</td>
- <td colspan="2"></td>
+ <td colspan="2">
+ {{reportData.specifications.split("-")[1]}}
+ </td>
<td>鏉愭枡鍘傚</td>
- <td colspan="2"></td>
+ <td colspan="2">{{reportData.supplier}}</td>
</tr>
<tr>
- <td>鏉愭枡鎵瑰彿</td>
- <td colspan="2"></td>
+ <td>鏉愭枡缂栧彿</td>
+ <td colspan="2">{{reportData.imCode}}</td>
<td>妫�娴嬬紪鍙�</td>
- <td colspan="2"></td>
+ <td colspan="2">{{reportData.insCode}}</td>
</tr>
<tr>
<td>妫�娴嬩緷鎹�</td>
- <td colspan="2"></td>
+ <td colspan="2">{{reportData.specifications.split("-")[0]}}</td>
<td>妫�娴嬬被鍒�</td>
- <td colspan="2"></td>
+ <td colspan="2">鍘熸潗鏂�</td>
</tr>
<tr>
<td>搴忓彿</td>
@@ -36,32 +38,30 @@
<td>妫�娴嬬粨鏋�</td>
<td>鍗曢」鍒ゆ柇</td>
</tr>
- <tr v-for="item in 15" :key="item">
- <td>{{item}}</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <tr v-for="(item,index) in reportData.products" :key="item">
+ <td>{{index+1}}</td>
+ <td>{{item.ipName}}</td>
+ <td>{{item.unit}}</td>
+ <td>{{item.required}}</td>
+ <td>{{item.testValue}}</td>
+ <td>{{item.testState == 1 ? "鈭�" : "X"}}</td>
</tr>
<tr>
- <td colspan="6">妫�楠岀粨璁猴細</td>
+ <td colspan="6">妫�楠岀粨璁猴細{{reportData.type == 1 ? "鍚堟牸" : "涓嶅悎鏍�"}}</td>
</tr>
<tr>
<td colspan="6">
- 娉細鈥溾垰鈥濊〃绀鸿椤圭洰鍚堟牸锛屸�溍椻�濊〃绀鸿椤圭洰涓嶅悎鏍尖�溾�斺�濊〃绀鸿椤圭洰涓嶈姹傛娴嬨��
+ 娉細鈥溾垰鈥濊〃绀鸿椤圭洰鍚堟牸锛屸�溍椻�濊〃绀鸿椤圭洰涓嶅悎鏍硷紝鈥溾�斺�濊〃绀鸿椤圭洰涓嶈姹傛娴嬨��
</td>
</tr>
</table>
<el-row class="date-group" :gutter="20">
- <el-col :span="8">妫�娴嬨�佹棩鏈燂細<span>2023-08-25</span></el-col>
- <el-col :span="8">瀹℃牳銆佹棩鏈燂細<span>2023-08-25</span></el-col>
- <el-col :span="8">鎵瑰噯銆佹棩鏈燂細<span>2023-08-25</span></el-col>
+ <el-col :span="12">妫�娴嬨�佹棩鏈燂細<span>{{reportData.createTime}}</span></el-col>
+ <el-col :span="12">瀹℃牳銆佹棩鏈燂細<span>{{reportData.checkTime}}</span></el-col>
</el-row>
<p class="footer">
- <span>缂栧彿:</span><span>ZTT/ICSRCP18-003</span>
- <span> 鍙戣鏃ユ湡:</span><span>2023-08-25</span>
- <span> 鍙戣閮ㄩ棬:</span><span>璐ㄩ噺閮�</span>
+ <span>缂栧彿:</span><span>{{reportData.reportCode}}</span>
+ <span> 鍙戣鏃ユ湡:</span><span>{{new Date() | formatDate}}</span>
<span> 淇濆瓨鏈熼檺:</span><span>闀挎湡</span>
</p>
</div>
@@ -73,7 +73,17 @@
return {
logoSrc : require("@/assets/404_images/logo.png"),
}
- }
+ },
+ methods:{
+ formatDate(val){
+ var dt = new Date(val);
+ let year = dt.getFullYear();
+ let month = (dt.getMonth() + 1).toString().padStart(2,'0');
+ let date = dt.getDate().toString().padStart(2,'0');
+ return `${year}-${month}-${date}`;
+ }
+ },
+ props:["reportData"]
})
</script>
<style scoped lang="scss">
@@ -105,7 +115,7 @@
border: 2px solid black;
}
tr,td,th{
- padding: 15px 20px;
+ padding: 5px 5px;
}
.date-group .el-col{
text-align: center;
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
index 171ca9d..ab2d6ee 100644
--- a/src/views/experiment/checkTheReport/index.vue
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -57,10 +57,10 @@
:visible.sync="dialogVisible"
width="60%">
<span slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" @click="printFun()">鎵撳嵃</el-button>
+ <el-button type="primary" @click="printFun()">鎵撳嵃</el-button>
</span>
<div class="printStyle">
- <preview id="printDiv"></preview>
+ <preview id="printDiv" :reportData="reportData"></preview>
</div>
</el-dialog>
<div class="table-box">
@@ -93,14 +93,14 @@
</template></el-table-column
>
<el-table-column
- prop="materialCode"
+ prop="reportCode"
label="鎶ュ憡鍗曞彿"
sortable
min-width="10%"
>
<template slot-scope="scope">
<span style="color: #409eff;">
- {{ scope.row.materialCode }}
+ {{ scope.row.reportCode }}
</span>
</template></el-table-column
>
@@ -179,12 +179,13 @@
</template>
<script>
-import { selectAllReport } from "@/api/experiment/checkTheReport";
+import { selectAllReport,getReportData } from "@/api/experiment/checkTheReport";
import Preview from "@/components/experiment/checkTheReport/index.vue";
import PrintJS from 'print-js'
export default {
data() {
return {
+ reportData: [],
searchData:{
sample_code:'',
reportCode:'',
@@ -203,25 +204,31 @@
this.getData();
},
mounted(){
- // this.dialogVisible = true;
},
components:{
Preview
},
methods: {
- //棰勮鎸夐挳
- previewFun(){
+ async queryReportByRCode(code){
+ const resp = await getReportData({code:code});
+ this.reportData = resp.data;
+ console.log(this.reportData);
+ },
+ //鏌ョ湅鎶ュ憡鎸夐挳
+ previewFun(row){
this.dialogVisible = true;
+ this.queryReportByRCode(row.reportCode);
},
//鎵撳嵃鎸夐挳
printFun(){
- PrintJS({
- printable: "printDiv",
- type: "html",
- // header: "鍘熸潗鏂欐娴嬫姤鍛�",
- targetStyles: ["*"],
- ignoreElements: ["no-ignore"],
- });
+ this.dialogVisible = false;
+ PrintJS({
+ printable: "printDiv",
+ type: "html",
+ // header: "鍘熸潗鏂欐娴嬫姤鍛�",
+ targetStyles: ["*"],
+ ignoreElements: ["no-ignore"],
+ });
},
// 鐘舵�佹寜閽�
handleRadioChange() {
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index e48728d..a2d7b1e 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -123,13 +123,13 @@
min-width="8%"
/>
<el-table-column
- prop="condition"
+ prop="type"
label="鐘舵��"
min-width="8%"
>
<template slot-scope="scope">
- <span :style="{ color: scope.row.condition === 1 ? 'green' : 'red' }">
- {{ scope.row.condition === 1 ? '宸叉娴�':'鏈娴�' }}
+ <span :style="{ color: scope.row.type === 1 ? 'green' : 'red' }">
+ {{ scope.row.type === 1 ? '宸叉娴�':'鏈娴�' }}
</span>
</template>
</el-table-column>
@@ -386,6 +386,7 @@
// console.log(res)
this.inspectionTable = res.data.row
this.data = res.data.row
+ console.log(res.data.row);
this.total = res.data.total
},
async search(){
--
Gitblit v1.9.3