From e6c3fccc9e412e79964a6dc2dae4c3da0c80095c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 26 十一月 2024 15:22:28 +0800
Subject: [PATCH] 完成检验下单、检验任务、报告生成变更
---
src/components/view/b1-inspection-order.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index dde0aa7..7996d58 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -402,18 +402,19 @@
<div>
<div style="width: 100%;line-height: 30px;">
<el-row style="font-size: 16px;">
- <el-col :span="16"><span> 鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
- <el-col :span="8"><span> 瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span> 鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ <el-col :span="8" style="text-align: left;"><span> 瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col :span="16"><span> 濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
- <el-col :span="8"><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span> 濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
+ <el-col :span="8" style="text-align: left;"><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="8" style="text-align: left;"><span> 鏍锋満鍛�: </span>{{ item.issueName }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
- <el-col><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ <el-col style="text-align: left;"><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
</div>
</div>
@@ -429,7 +430,7 @@
</el-row>
</span>
</el-dialog>
- <div class="el-dialog__body" style="overflow-y: auto;position: fixed;top:60px;right: 20px;z-index: 9999;">
+ <div class="el-dialog__body" style="overflow-y: auto;position: fixed;top:60px;right: 20px;z-index: 9999;display: none;">
<div id="printMOrder" class="printMOrder" ref="printMOrder">
<el-card class="box-card" v-for="(item, i) in checkDataList" :key="i+'uuuuu'" style="font-size: 16px !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
<div>
@@ -438,18 +439,19 @@
<div>
<div style="width: 100%;line-height: 30px;">
<el-row style="font-size: 16px;">
- <el-col :span="16"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
- <el-col :span="7"><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ <el-col :span="7" style="text-align: left;"><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col :span="16"><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
- <el-col :span="7"><span>鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
+ <el-col :span="7" style="text-align: left;"><span>鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col><span>鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span>鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="7" style="text-align: left;"><span>鏍锋満鍛�: </span>{{ item.issueName }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
- <el-col><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ <el-col style="text-align: left;"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
</div>
</div>
@@ -487,6 +489,9 @@
</el-row>
</span>
</el-dialog>
+ <el-dialog title="鎶ュ憡涓嬭浇" :visible.sync="downVisible" width="440px">
+ <p v-for="(item,index) in downList" :key="index" style="text-align: left;">鏍峰搧缂栧彿锛歿{item.codeUrl}} <el-button type="text" icon="el-icon-download" @click="handleDown(item)">鎶ュ憡涓嬭浇</el-button></p>
+ </el-dialog>
</div>
</template>
@@ -569,7 +574,7 @@
type: 'text',
method: 'download',
disabFun: (row, index) => {
- return row.state != 4 || row.reportId == null
+ return !row.reportDtos||row.reportDtos.length==0
}
}, {
id: 'verify',
@@ -808,6 +813,8 @@
currentRole:'',
BZinfo:[],
BZDialogVisible:false,
+ downVisible:false,
+ downList:[]
}
},
watch:{
@@ -942,7 +949,7 @@
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
- maxWidth:360,
+ maxWidth:720,
header: '',
style:
`@page {
@@ -951,18 +958,18 @@
margin-top: 0.4cm;
margin-bottom: 0.4cm;
padding-bottom: 0px;
- size: 400px 75px collapse;
+ size: 800px 600px collapse;
}
html{
zoom:100%;
}
@media print{
- width: 400px;
- height: 75px;
+ width: 800px;
+ height: 600px;
margin:0;
}`,
- font_size: '0.29cm',
+ font_size: '16px',
});
},
async print(){
@@ -998,7 +1005,10 @@
this.$refs['ValueTable'].selectList(e)
},
refresh() {
+ let state = this.componentData.entity.state
this.componentData.entity = this.HaveJson(this.entityCopy)
+ this.componentData.entity.state = state
+ this.refreshTable()
this.upIndex++
},
// 鏉冮檺鍒嗛厤
@@ -1074,6 +1084,10 @@
},
// 涓嬭浇鎶ュ憡
download(row) {
+ this.downList = row.reportDtos
+ this.downVisible = true;
+ },
+ handleDown(row){
let url = row.urlS?row.urlS:row.url;
if(url){
url = url.split('.')[0]+'.pdf'
--
Gitblit v1.9.3