From efdd0cfd0c5b65b01491835e94352e8afcb78085 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 23 十二月 2024 16:58:01 +0800
Subject: [PATCH] 报告编制预览修改
---
src/components/view/b1-inspection-order.vue | 299 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 241 insertions(+), 58 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 9e26214..5a5db44 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -188,9 +188,12 @@
v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;">
- <div class="search_label" style="width: 120px;">澶栭儴濮旀墭缂栧彿锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.outEntrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
+ <div class="search_label">璁㈠崟绫诲瀷锛�</div>
+ <div class="search_input">
+ <el-select v-model="componentData.entity.formType" size="small" style="width: 100%;" @change="refreshTable()">
+ <el-option v-for="(a,ai) in formType" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </div>
</div>
<div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
@@ -206,6 +209,11 @@
<div class="search_label">鏍峰搧缂栧彿锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" style="width: 20%;" v-if="more">
+ <div class="search_label" style="width: 120px;">澶栭儴濮旀墭缂栧彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.outEntrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">涓嬪崟鏃堕棿锛�</div>
@@ -369,6 +377,82 @@
:componentData="componentDataDataLook"/>
</div>
</el-dialog>
+ <!-- 鏂�-璺熸姤鍛婄敓鎴愮殑涓�鏍� -->
+ <el-dialog
+ title="鏁版嵁鏌ョ湅"
+ :visible.sync="lookDialogVisible"
+ width="60%"
+ :append-to-body="true"
+ :modal="!lookDialogVisible0"
+ >
+ <div style="max-height: 75vh;overflow-y: auto;">
+ <template v-for="(a,b) in sampleList">
+ <el-divider></el-divider>
+ <p style="margin: 10px 0;font-weight: 700;">鏍峰搧锛�<el-tag size="small">{{a.insSample.sample}}</el-tag> 鏍峰搧缂栧彿锛歿{a.insSample.sampleCode}}</p>
+ <el-card class="box-card" style="margin-top: 16px;" v-for="(item,index) in a.historyList" :key="index">
+ <div slot="header" style="display: flex;justify-content: space-between;">
+ <span>{{ item.laboratory }}</span>
+ </div>
+ <el-table
+ :data="item.insOrderUserList"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="submitTime"
+ label="鎻愪氦鏃ユ湡"
+ min-width="150">
+ </el-table-column>
+ <el-table-column
+ prop="submitUserName"
+ label="鎻愪氦浜�"
+ min-width="90">
+ </el-table-column>
+ <el-table-column
+ prop="term"
+ label="瀹為獙闃舵"
+ min-width="120">
+ </el-table-column>
+ <el-table-column
+ prop="note"
+ label="瀹為獙鎿嶄綔"
+ min-width="120">
+ </el-table-column>
+ <el-table-column
+ prop="tell"
+ label="鍐嶆妫�楠屽師鍥�"
+ min-width="120">
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="鎿嶄綔"
+ min-width="100">
+ <template slot-scope="scope">
+ <el-button @click="lookDetail(item,scope.row.num,a.insSample)" type="text" size="small">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ <p v-if="a.historyList.length==0" style="text-align: center;">鏆傛棤妫�楠屾暟鎹�</p>
+ </template>
+ </div>
+ </el-dialog>
+ <el-dialog
+ title="妫�楠岃鎯�"
+ :visible.sync="lookDialogVisible0"
+ width="100%" :fullscreen="true" :modal="false" :append-to-body="true">
+ <Inspection v-if="lookDialogVisible0"
+ :orderId="sampleId"
+ :orderId0="orderId0"
+ :userInfo="{}"
+ :inspectorList="currentItem.inspectorList"
+ :sonLaboratory="currentItem.laboratory"
+ :state="2"
+ :orderStateId="currentItem.orderStateId"
+ :version="currentItem.version"
+ :isLook="true"
+ :num1="currentItem.num1"
+ :noBack="true"/>
+ </el-dialog>
<el-dialog :title="deleteTilte" :visible.sync="deleteDialogVisible" width="80%">
<div style="height: 70vh;overflow-y: auto;" v-if="deleteDialogVisible">
<ValueTable ref="ValueTableDataDelete" :url="$api.insOrder.selectNoProducts+'?orderId='+orderId+'&ids='+this.revocationInsProductIds"
@@ -389,35 +473,52 @@
<div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
<div class="dia_body">
<el-checkbox
- style="margin: 10px 5px;"
+ style="margin: 10px 5px;text-align: left;"
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
- <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
+ <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList" style="text-align: left;">
<el-card class="box-card" v-for="(item, i) in qrData" :key="i+'wwwww'" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:-10px;left:5px"><br></el-checkbox>
<div>
- <p style="text-align: center;font-size: 18px;font-weight: 700;">{{ item.sample }}</p>
- <barcode :value="item.sampleCode" :height="34" :width="2" :displayValue="false" style="display: flex;justify-content: center;width: 100%;"></barcode>
- <div>
- <div style="width: 100%;line-height: 30px;">
+ <p style="text-align: center;font-size: 26px;font-weight: 700;">{{ item.sample }}锛坽{item.model}}锛�</p>
+ <p style="text-align: center;font-size: 16px;">{{ item.sampleCode }}</p>
+ <el-divider></el-divider>
+ <el-row style="font-size: 16px;">
+ <el-col :span="16" style="text-align: left;line-height: 28px;">
+ <p><span> 濮旀墭鍗曞彿: </span>{{ item.code }}</p>
+ <p><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</p>
+ <p><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</p>
+ <p><span> 鏍锋満鍛�: </span>{{ item.issueName }}</p>
+ <p class="ellipsis-multiline"><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</p>
+ </el-col>
+ <el-col :span="8" style="text-align: left;">
+ <vueQr
+ :text="item.str"
+ :size="140"
+ :margin="2"
+ ></vueQr>
+ </el-col>
+ </el-row>
+ <!-- <div>
+ <div>
<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="16"><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
- <el-col :span="8"><span> 鏍锋満鍛�: </span>{{ item.issueName }}</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>
+ </div> -->
</div>
</el-card>
</el-checkbox-group>
@@ -434,28 +535,27 @@
<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>
- <p style="text-align: center;font-size: 18px;font-weight: 500;margin-top: 10px;">{{ item.sample }}</p>
- <barcode :value="item.sampleCode" :height="34" :width="2" :displayValue="false" style="display: flex;justify-content: center;width: 100%;"></barcode>
- <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-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-row>
- <el-row style="margin-top: 1px;font-size: 16px;">
- <el-col :span="16"><span>鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
- <el-col :span="7"><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-row>
- </div>
+ <p style="text-align: center;font-size: 26px;font-weight: 700;margin-top: 20px;">{{ item.sample }}锛坽{item.model}}锛�</p>
+ <p style="text-align: center;font-size: 16px;">{{ item.sampleCode }}</p>
+ <!-- <el-divider></el-divider> -->
+ <p style="width: 100%;height:1px;background-color: #333333;margin: 6px 0;"></p>
+ <el-row style="font-size: 16px;">
+ <el-col :span="16" style="text-align: left;line-height: 28px;">
+ <p><span> 濮旀墭鍗曞彿: </span>{{ item.code }}</p>
+ <p><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</p>
+ <p><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</p>
+ <p><span> 鏍锋満鍛�: </span>{{ item.issueName }}</p>
+ <p class="ellipsis-multiline"><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</p>
+ </el-col>
+ <el-col :span="8" style="text-align: left;">
+ <vueQr
+ :text="item.str"
+ :size="140"
+ :margin="2"
+ ></vueQr>
+ </el-col>
+ </el-row>
</div>
- </div>
</el-card>
</div>
</div>
@@ -489,20 +589,31 @@
</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>
<script>
import ValueTable from '../tool/value-table.vue'
import Add from '../do/b1-ins-order/add.vue'
+ import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
export default {
components: {
ValueTable,
+ Inspection,
Add,
vueQr
},
+ props:{
+ param: {
+ type: Object,
+ default: () => {}
+ }
+ },
data() {
return {
deleteTilte:'鎾ら攢',
@@ -548,11 +659,13 @@
appointed:null,
issueTime:null,
motorNumber:null,
+ formType:null,
// orderBy: {
// field: '',
// order: ''
// }
},
+ init:false,
isIndex: true,
showSelect: true,
select: true,
@@ -571,7 +684,7 @@
type: 'text',
method: 'download',
disabFun: (row, index) => {
- return row.state != 4 || row.reportId == null
+ return !row.reportDtos||row.reportDtos.length==0
}
}, {
id: 'verify',
@@ -810,6 +923,16 @@
currentRole:'',
BZinfo:[],
BZDialogVisible:false,
+ downVisible:false,
+ downList:[],
+ formType:[],
+ currentInfo:{},
+ sampleList:[],
+ lookDialogVisible:false,
+ lookDialogVisible0:false,
+ sampleId:null,
+ orderId0:null,
+ currentItem:{},
}
},
watch:{
@@ -820,6 +943,14 @@
this.checkDataList = []
this.isIndeterminate = true;
}
+ },
+ param(val){
+ if(val&&val.text){
+ this.componentData.entity.entrustCode = this.param.text
+ this.componentData.entity.state = 1;
+ this.tabIndex = 1;
+ this.refreshTable()
+ }
}
},
created() {
@@ -827,11 +958,20 @@
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
+ if(this.param&&this.param.text){
+ this.componentData.entity.entrustCode = this.param.text
+ this.componentData.entity.state = 1;
+ this.tabIndex = 1;
+ this.refreshTable()
+ }else{
+ this.refreshTable()
+ }
this.getPower()
this.getUserMenu()
this.getAuthorizedPerson()
this.getInsStateDicts()
this.selectEnumByCategoryForOrderType()
+ this.selectEnumByCategoryForSampleForm()
},
methods: {
selectMethod(val){
@@ -905,11 +1045,17 @@
this.loadPint = false;
let arr1 = []
a.insProduct.forEach(b=>{
- arr1.push(b.inspectionItem)
+ arr1.push(b.inspectionItemSubclass)
})
a.item = [...new Set(arr1)].join(',')
})
- this.qrData = arr
+ this.qrData = arr.map(m=>{
+ m.str = JSON.stringify({
+ sampleCode:m.sampleCode,
+ entrustCode:m.code
+ })
+ return m
+ })
// console.log(this.qrData)
})
},
@@ -944,27 +1090,17 @@
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
- maxWidth:720,
- header: '',
+ documentTitle: "浜岀淮鐮�",
style:
`@page {
- margin: 0.4cm;
- margin-right: 0.4cm;
- margin-top: 0.4cm;
- margin-bottom: 0.4cm;
- padding-bottom: 0px;
- size: 800px 600px collapse;
+ margin: 0;
+ size: landscape;
}
- html{
+ body{
zoom:100%;
-
- }
- @media print{
- width: 800px;
- height: 600px;
+ padding:30px 0;
margin:0;
}`,
- font_size: '16px',
});
},
async print(){
@@ -1074,11 +1210,51 @@
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
- this.componentDataDataLook.entity.id = row.id
- this.dataDialogVisible = true;
+ // this.componentDataDataLook.entity.id = row.id
+ // this.dataDialogVisible = true;
+
+ this.currentInfo = row
+ this.$axios.get(this.$api.insReport.getInsOrderStateCount+'?id='+row.id).then(res => {
+ this.sampleList = res.data
+ this.sampleList.forEach(a=>{
+ a.historyList = a.insOrderStates
+ a.historyList.forEach(item => {
+ item.arr = []
+ this.$set(item,'numValue',1)
+ if(item.num>0){
+ for(var i=0;i<item.num;i++){
+ item.arr.push({
+ label:'璁板綍'+(i+1),
+ value:i+1
+ })
+ }
+ }
+ })
+ })
+ this.lookDialogVisible = true
+ })
},
+ // 鏌ョ湅妫�楠岃鎯�
+ lookDetail(row,value,insSample){
+ this.lookDialogVisible0 = true
+ let inspectorList = []
+ if(row.userName){
+ inspectorList = row.userName.split(',')
+ }
+ this.sampleId = insSample.id
+ this.orderId0 = insSample.insOrderId
+ this.currentItem = {
+ num1:value,
+ inspectorList:inspectorList,
+ ...row
+ }
+ },
// 涓嬭浇鎶ュ憡
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'
@@ -1260,6 +1436,13 @@
this.refreshTable('page')
this.upIndex++
},
+ selectEnumByCategoryForSampleForm() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "璁㈠崟绫诲瀷"
+ }).then(res => {
+ this.formType = res.data
+ })
+ },
getUserMenu() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
--
Gitblit v1.9.3