From e7f86b5ad64b224163c321c46b0f61c294578a2b Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期日, 24 九月 2023 16:53:53 +0800
Subject: [PATCH] 改bug
---
src/components/view/processInspection.vue | 197 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 191 insertions(+), 6 deletions(-)
diff --git a/src/components/view/processInspection.vue b/src/components/view/processInspection.vue
index 3a1abf5..46383dd 100644
--- a/src/components/view/processInspection.vue
+++ b/src/components/view/processInspection.vue
@@ -8,6 +8,7 @@
<el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus"
style="background: #004EA2; ">鏂板</el-button>
<el-button icon="el-icon-download" size="mini">瀵煎嚭</el-button>
+ <el-button @click="report" icon="el-icon-download" size="mini">鐢熸垚鎶ュ憡</el-button>
</el-col>
</el-row>
</div>
@@ -241,19 +242,150 @@
<div class="newPage" v-if="showLook">
<processInspectionLook :rowInfo="rowInfp" />
</div>
+ <!-- <div class="newPage" v-if="reportlook">
+ <index />
+ </div> -->
+ <el-dialog
+ title="杩囩▼妫�楠屾姤鍛�" :visible.sync="reportlook" width="40%">
+ <template>
+ <div ref="print">
+
+ <div style="margin:0 auto;">
+ <!-- <div style="text-align:center;margin-top:10px;">杩囩▼妫�楠屾姤鍛�</div> -->
+ <table class="table table-striped table-bordered" align="center" border style="width: 100%;height: 700px;" valign="center">
+ <tr>
+ <td class="column" colspan="2" rowspan="2" > <img src="../view/report/logo-2.png" style="width:100%;" /></td>
+ <td class="column" colspan="2" ><p>璁板綍鍚嶇О锛氭楠岃褰曡〃</p>Table: Inspection Record</td>
+ <td class="column" colspan="2"><p>淇濆瓨鏈熼檺锛�25骞�</p> Storage Life: 25 years</td>
+ </tr>
+ <tr>
+ <td class="column" colspan="2" > 璁板綍缂栧彿</td>
+ <td class="column" colspan="2" > 褰掓。閮ㄩ棬</td>
+ </tr>
+ <tr>
+ <td class="column"><p>闆朵欢鍚嶇О</p> Part Description</td>
+ <td class="value"></td>
+ <td class="column"><p>鍨嬪彿</p> Model</td>
+ <td class="value"></td>
+ <td class="column"><p>鍔犲伐鍗曞彿</p> Order No</td>
+ <td class="value"></td>
+ </tr>
+ <tr>
+ <td class="column"><p>妫�楠屼华鍣�</p> Inspection instrument</td>
+ <td class="value"></td>
+ <td class="column"><p>妫�楠屾暟閲�</p> Quantity to check</td>
+ <td class="value"></td>
+ <td class="column"><p>渚涜揣鍗曚綅</p> Supplier</td>
+ <td class="value"></td>
+ </tr>
+ <tr>
+ <td class="column"><p>妫�楠岄」鐩�</p> Inspection Item</td>
+
+ <td class="column" colspan="3"><p><p>妫�楠岀粨鏋�(瀹炴祴鍊�)</p> Test result (Measured value)</p></td>
+
+ <td class="column" rowspan="2" colspan="2"><p>鍒ゅ畾</p> Conclusion</td>
+ </tr>
+ <tr>
+ <td class="column"><p>鎶�鏈姹�</p> Technical Requirement</td>
+ <td class="column"><p>鍏樊</p> TOL</td>
+ <!-- <td class="daughter" >01</td> -->
+ </tr>
+ <tr>
+ <td class="column" rowspan="9" colspan="0.5">灏哄</td>
+ <td class="value" ></td>
+ <td class="column"></td>
+ <td class="value" ></td>
+
+ </tr>
+ <tr>
+ <td class="column"></td>
+ <td class="value" colspan="3"></td>
+ <td class="column"></td>
+
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+
+ <tr>
+ <td class="column" colspan="6"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+
+ <tr>
+ <td class="column">鏉愯川</td>
+ <td class="value" colspan="5"></td>
+ </tr>
+ <tr >
+ <td class="column" >澶栬鎬ц兘</td>
+ <td class="value" colspan="5" style="text-align:left;">
+ <br>
+ <br>
+ <br>
+ <br>
+ </td>
+ </tr>
+ <tr>
+ <td class="column">澶囨敞</td>
+ <td class="value" colspan="5">
+ <br>
+ <br>
+ <br>
+ <br>
+ </td>
+ </tr>
+
+
+ </table>
+ </div>
+ </div>
+ </template>
+ </el-dialog>`
</div>
</template>
<script>
import processInspectionUpdate from '../view/processInspectionUpdate.vue'
import processInspectionLook from '../view/processInspectionLook.vue'
+// import index from '../view/report/index.vue'
export default {
- components: { processInspectionUpdate, processInspectionLook },
+ components: {
+ processInspectionUpdate,
+ processInspectionLook,
+ // index
+ },
data() {
return {
showUp: false,
isAddProject: false,
showLook: false,
+ reportlook: false,
detailId: 28,
rowInfp: {},
search: {
@@ -334,8 +466,8 @@
name: null
}, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
clickSelectDevice: {
- index: "", // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
- rpId: "" // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
+ index: null, // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
+ rpId: null // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
}
};
},
@@ -349,6 +481,12 @@
// this.getOptions();
},
methods: {
+ report() {
+ this.reportlook = true
+ // this.$nextTick(() => {
+ // this.$print(this.$refs.print);
+ // })
+ },
handleClick(row) {
this.rowInfp = row
this.showLook = true
@@ -393,13 +531,23 @@
}
}).then(res => {
this.materialOptions = res.data;
+ if (this.materialOptions.length === 1) {
+ this.$message({
+ message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
+ type: 'warning'
+ });
+ return
+ }
+ row.isSelectDevice = true
this.filterText = row.did
});
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
clickTableSelect(scope) {
// this.centerDialogVisible = true;
- scope.row.isSelectDevice = true
+ if (this.clickSelectDevice.index != null) {
+ this.$set(this.inspectionItems[this.clickSelectDevice.index], 'isSelectDevice', false)
+ }
this.clickSelectDevice.index = scope.$index;
this.clickSelectDevice.rpId = scope.row.id;
this.getOptions(scope.row)
@@ -532,7 +680,7 @@
let val = JSON.parse(JSON.stringify(this.processInspectVo))
val.techname = this.processInspectVo.techname.split("-")[1]
val.technologyId = this.processInspectVo.techname.split("-")[0]
- this.processInspectVo.technologyId=val.technologyId
+ this.processInspectVo.technologyId = val.technologyId
this.$axios.post(this.$api.url.processInspectAddProcess, {
material: val.material,
materialCode: val.materialCode,
@@ -542,6 +690,7 @@
techfather: val.techfather,
techname: val.techname,
techId: Number(val.technologyId),
+ mtId: Number(val.technologyId),
unit: val.unit
}, {
headers: { "Content-Type": "application/json" }
@@ -583,7 +732,7 @@
c.empiricalValueAddss.push("")
}
uName.push(c['username'])
- c.isSelectDevice=false
+ c.isSelectDevice = false
arr.push(c)
})
})
@@ -781,4 +930,40 @@
float: right;
font-size: 13px !important;
}
+
+/* .table{
+ border-collapse: collapse;
+ border-spacing: 0;
+ background-color: transparent;
+ display: table;
+ width: 100%;
+ max-width: 100%;
+ width: 800px;
+ margin:0 auto;
+} */
+/* .table td{
+ text-align:center;
+ vertical-align:middle;
+ font-size: 14px;
+ font-family: 'Arial Normal', 'Arial';
+ color: #333333;
+ padding: 8px 12px;
+} */
+/* .table-bordered {
+ border: 1px solid #ddd;
+} */
+.column{
+ width:auto;
+ height:30px;
+ font-size: 12px;
+ text-align:center
+ /* border:1px solid #333;
+ background: #f1f1f1; */
+}
+.value{
+ width:70px;
+ height:30px;
+ border:1px solid #333;
+}
+
</style>
--
Gitblit v1.9.3