From 0e5763b1b39de488adb3bcc856a2201f87597a08 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 23 十二月 2024 15:56:40 +0800
Subject: [PATCH] 人员测试联调
---
src/components/view/b1-inspection-order.vue | 266 +++++++++++++++++++++++++++++------------------------
1 files changed, 146 insertions(+), 120 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 8778c55..68f9b3f 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>
@@ -385,56 +393,57 @@
<div style="width: 100%;height: 100%;" v-if="active >0">
<Add :active="active" :currentId="currentId" v-if="active<4" :examine = "examine" />
</div>
- <el-dialog title="鏍囩鎵撳嵃" :visible.sync="printDialogVisible" width="40%" top="5vh">
+ <el-dialog title="鏍囩鎵撳嵃" :visible.sync="printDialogVisible" width="38%" top="5vh">
<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:-20px;left:5px"><br></el-checkbox>
- <div>
- <el-row style="font-size: 14px;padding-left: 20px;">
- <el-col style="font-weight: bold;">{{ item.pName }}</el-col>
+ <el-checkbox :label="i" :key="i" style="position: relative;top:-10px;left:5px"><br></el-checkbox>
+ <div>
+ <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" 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>
- <div style="display: flex;">
- <div>
- <el-col :span="8" :offset="4">
- <vueQr :text="JSON.stringify(item.sampleCode)" :size="140" :margin="2"></vueQr>
- </el-col>
- </div>
- <div style="margin-left: 50px;width: 100%;">
- <el-row>
- <el-col style="font-weight: bold;font-size: 14px;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
- </el-row>
- <el-row style="margin-top: 1px;font-size: 14px;">
- <el-col style="font-weight: bold;"><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
- </el-row>
- <el-row style="margin-top: 1px;font-size: 14px;">
- <el-col style="font-weight: bold;"><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
- </el-row>
- <el-row style="margin-top: 1px;font-size: 14px;">
- <el-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
- </el-row>
- <el-row style="margin-top: 1px;font-size: 14px;">
- <el-col style="font-weight: bold;"><span>鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
- </el-row>
- <el-row style="margin-top: 1px;font-size: 14px;" class="ellipsis-multiline">
- <el-col style="font-weight: bold;"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
- </el-row>
- <el-row style="margin-top: 3px;font-size: 14px;">
- <el-col style="font-weight: bold;display: flex;align-items: center;"><span>鏍峰搧鐘舵��: </span><el-radio-group :value="item.insState" style="margin-top: 7px;margin-left: 4px;" disabled>
- <el-radio :label="0" style="font-weight: bold;margin-right: 7px;">寰呮</el-radio>
- <el-radio :label="1" style="font-weight: bold;margin-right: 7px;">鍦ㄦ</el-radio>
- <el-radio :label="2" style="font-weight: bold;margin-right: 7px;">宸叉</el-radio>
- </el-radio-group><el-radio :label="1" style="font-weight: bold;margin-top: 7px;" v-model="item.isLeave" disabled>鐣欐牱</el-radio></el-col>
- </el-row>
- </div>
+ <el-row style="margin-top: 1px;font-size: 16px;">
+ <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" 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 style="text-align: left;"><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ </el-row>
</div>
- </div>
+ </div> -->
+ </div>
</el-card>
</el-checkbox-group>
</div>
@@ -446,50 +455,31 @@
</el-row>
</span>
</el-dialog>
- <div class="el-dialog__body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;display: none;">
+ <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: 0.20cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
- <div style="display: flex;">
- <div>
- <el-col :span="10" :offset="2">
- <vueQr :text="JSON.stringify(item.sampleCode)" :size="60" :margin="2"></vueQr>
- </el-col>
- </div>
- <div style="margin-left: 0.32cm;line-height: 0.22cm;">
- <el-row>
- <el-col style="font-size: 0.20cm;width: 4cm;" class="single-line-ellipsis"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
- </el-row>
- <el-row style="font-size: 0.20cm;">
- <el-col><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
- </el-row>
- <el-row style="font-size: 0.20cm;">
- <el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
- </el-row>
- <el-row style="font-size: 0.20cm;">
- <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
- </el-row>
- <el-row style="font-size: 0.20cm;">
- <el-col ><span>鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
- </el-row>
- <el-row style="font-size: 0.20cm;width: 4cm;">
- <el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
- </el-row>
- <el-row style="margin-top: 0.01cm;font-size: 0.20cm;">
- <el-col style="display: flex;align-items: center;"><span>鏍峰搧鐘舵��:
- </span>
- <span style="white-space: nowrap;"><span v-if="item.insState==0">鈭�</span><span class="scor" v-if="item.insState!=0"></span>寰呮
- <span v-if="item.insState==1">鈭�</span><span class="scor" v-if="item.insState!=1"></span>鍦ㄦ
- <span v-if="item.insState==2">鈭�</span><span class="scor" v-if="item.insState!=2"></span>宸叉
- <span v-if="item.isLeave==1">鈭�</span><span class="scor" v-if="item.isLeave!=1"></span>鐣欐牱</span>
- <!-- <el-radio-group :value="item.insState" style="margin-top: 3px;margin-left: 1px;" disabled>
- <el-radio :label="0" style="margin-right: 3px;font-size: 6px;">寰呮</el-radio>
- <el-radio :label="1" style="margin-right: 3px;font-size: 6px;">鍦ㄦ</el-radio>
- <el-radio :label="2" style="margin-right: 3px;font-size: 6px;">宸叉</el-radio>
- </el-radio-group><el-radio :label="1" style="margin-top: 3px;font-size: 8px;" v-model="item.isLeave" disabled>鐣欐牱</el-radio> -->
- </el-col>
+ <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: 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>
@@ -522,7 +512,10 @@
<el-button type="primary" @click="submitForm3" :loading="upLoad">纭� 瀹�</el-button>
</el-row>
</span>
- </el-dialog>
+ </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>
@@ -531,13 +524,18 @@
import Add from '../do/b1-ins-order/add.vue'
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
-import { Header } from 'iview';
export default {
components: {
ValueTable,
Add,
vueQr
},
+ props:{
+ param: {
+ type: Object,
+ default: () => {}
+ }
+ },
data() {
return {
deleteTilte:'鎾ら攢',
@@ -583,11 +581,13 @@
appointed:null,
issueTime:null,
motorNumber:null,
+ formType:null,
// orderBy: {
// field: '',
// order: ''
// }
},
+ init:false,
isIndex: true,
showSelect: true,
select: true,
@@ -606,7 +606,7 @@
type: 'text',
method: 'download',
disabFun: (row, index) => {
- return row.state != 4 || row.reportId == null
+ return !row.reportDtos||row.reportDtos.length==0
}
}, {
id: 'verify',
@@ -838,17 +838,16 @@
more:false,
insOrderRow:{},
checkIndexList:[],
- checkDataList:[
- {
- sampleCode:'11111'
- }
- ],
+ checkDataList:[],
qrData:[],
multipleSelection:[],
sonLaboratoryList:[],
currentRole:'',
BZinfo:[],
BZDialogVisible:false,
+ downVisible:false,
+ downList:[],
+ formType:[]
}
},
watch:{
@@ -859,6 +858,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() {
@@ -866,11 +873,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){
@@ -944,12 +960,18 @@
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
- console.log(this.qrData)
+ this.qrData = arr.map(m=>{
+ m.str = JSON.stringify({
+ sampleCode:m.sampleCode,
+ entrustCode:m.code
+ })
+ return m
+ })
+ // console.log(this.qrData)
})
},
//閫夋嫨瑕佹墦鍗扮殑浜岀淮鐮�
@@ -979,31 +1001,21 @@
this.$message.warning("璇烽�夋嫨瑕佹墦鍗扮殑浜岀淮鐮�")
return
}
- this.printDialogVisible = false;
PrintJS({
- printable: 'printMOrder',//椤甸潰
- type: "html",//鏂囨。绫诲瀷
- maxWidth:360,
- targetStyles:['*'],
- style: `@page {
- margin:0;
- size: 400px 75px collapse;
- margin-top:3px;
- &:first-of-type{
- margin-top:0 !important;
- }
- }
- html{
- zoom:100%;
- }
- @media print{
- width: 400px;
- height: 75px;
- margin:0;
- }`,
- onPrintDialogClose: this.erexcel=false,
- targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
- font_size: '0.20cm',
+ targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+ printable: 'printMOrder',//椤甸潰
+ type: "html",//鏂囨。绫诲瀷
+ documentTitle: "浜岀淮鐮�",
+ style:
+ `@page {
+ margin: 0;
+ size: landscape;
+ }
+ body{
+ zoom:100%;
+ padding:30px 0;
+ margin:0;
+ }`,
});
},
async print(){
@@ -1039,7 +1051,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++
},
// 鏉冮檺鍒嗛厤
@@ -1115,6 +1130,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'
@@ -1296,6 +1315,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