From ab87478ba941f90cd60252cf4d34aa585dc1a63f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 七月 2024 18:29:10 +0800
Subject: [PATCH] 设备数采配置 调整
---
src/components/view/b1-inspection-order.vue | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index d7870f2..e7ac309 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -120,10 +120,13 @@
height: 8px !important;
}
.el-dialog__body >>>.el-radio__label{
- padding-left: 2px !important;
+ padding-left: 2px !important;
}
.el-dialog__body >>>.el-card__body{
padding: 0 !important;
+ }
+ .el-dialog__body >>>.el-card {
+ border: none;
}
.el-dialog__body >>>.el-radio__input.is-disabled .el-radio__inner{
border-color: #000 !important;
@@ -153,7 +156,7 @@
<template>
<div class="inspection_order">
- <div style="width: 100%;height: 100%;" v-if="active == 0">
+ <div style="width: 100%;height: 100%;" v-show="active == 0">
<div>
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屼笅鍗�</el-col>
@@ -174,7 +177,7 @@
<div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍨嬪彿锛�</div>
@@ -343,7 +346,7 @@
<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-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</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>
@@ -369,16 +372,16 @@
</el-row>
</span>
</el-dialog>
- <div class="el-dialog__body" style="width:320px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;position: fixed;top: 0;display: none;">
+ <div class="el-dialog__body" style="display:none;overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;">
<div id="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-before:always;page-break-after: always;color: #000;">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-after: always;color: #000;box-shadow: none;" >
<div style="display: flex;">
<div>
- <el-col :span="8" :offset="4">
+ <el-col :span="10" :offset="2">
<vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
</el-col>
</div>
- <div style="margin-left: 57px;line-height: 9px;">
+ <div style="margin-left: 12px;line-height: 9px;">
<el-row>
<el-col style="font-size: 8px;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
</el-row>
@@ -389,9 +392,9 @@
<el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="font-size: 8px;">
- <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
+ <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
</el-row>
- <el-row style="font-size: 8px;">
+ <el-row style="font-size: 8px;width: 140px;">
<el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
<el-row style="margin-top: 3px;font-size: 8px;">
@@ -412,7 +415,7 @@
</div>
</el-card>
</div>
- </div>
+ </div>
</div>
</template>
@@ -456,7 +459,7 @@
componentData: {
entity: {
entrustCode: null,
- sampleType: null,
+ sample: null,
sampleName: null,
sampleModel: null,
sampleCode: null,
@@ -651,9 +654,9 @@
insOrderRow:{},
checkIndexList:[],
checkDataList:[
- // {
- // sampleCode:'11111'
- // }
+ {
+ sampleCode:'11111'
+ }
],
qrData:[],
multipleSelection:[]
@@ -730,11 +733,11 @@
PrintJS({
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
- maxWidth:450,
+ maxWidth:360,
targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px portrait;
+ size: 360px 175px collapse;
}
html{
zoom:100%;
@@ -770,8 +773,8 @@
this.personList = data
})
},
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -898,7 +901,7 @@
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.issuedDialogVisible = false
- this.refreshTable()
+ this.refreshTable('page')
}).catch(e => {
this.$message.error('淇敼澶辫触')
this.upLoad = false
@@ -911,7 +914,7 @@
if (res.code===200){
this.upLoad=false
this.quashDialogVisible=false
- this.refreshTable()
+ this.refreshTable('page')
this.$message.success("鏇存柊鎴愬姛")
}
})
@@ -920,7 +923,7 @@
if (res.code===200){
this.upLoad = false
this.quashDialogVisible = false
- this.refreshTable()
+ this.refreshTable('page')
this.$message.success("鏇存柊鎴愬姛")
}
})
@@ -935,6 +938,7 @@
// 涓嬪崟
playOrder(num) {
this.active = num
+ this.refreshTable('page')
},
handleTab(m, i) {
this.tabIndex = i;
--
Gitblit v1.9.3