From f51920b6d720dd10cb61b2fb2973cfdb0dc59577 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 03 八月 2024 11:55:29 +0800
Subject: [PATCH] 修改委托要求温度循环提交报错
---
src/components/view/b1-inspection-order.vue | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 238a71c..93725b1 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -135,8 +135,8 @@
border: none !important;
}
.scor{
- width: 3px;
- height: 3px;
+ width: 0.01cm;
+ height: 0.01cm;
border-radius: 1px;
border: 1px solid #000;
display: inline-block;
@@ -175,6 +175,11 @@
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>
+ <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.sample" @keyup.enter.native="refreshTable()"></el-input></div>
@@ -189,7 +194,7 @@
<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%;">
+ <div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">涓嬪崟鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker style="width:100%" v-model="componentData.entity.createTime"
@@ -231,7 +236,9 @@
<ul class="tab">
<li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
</ul>
- <ValueTable :style="getStyle()" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
+ <ValueTable :style="getStyle()" ref="ValueTable"
+ :isColumnWidth="true"
+ :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
:key="'b'+upIndex" />
</div>
<!-- 瀹℃牳 -->
@@ -381,32 +388,32 @@
</el-row>
</span>
</el-dialog>
- <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-after: always;color: #000;box-shadow: none;" >
+ <div class="el-dialog__body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;display: none;">
+ <div id="printMOrder" class="printMOrder">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.16cm !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="78" :margin="2"></vueQr>
+ <vueQr :text="JSON.stringify(item.sampleCode)" :size="60" :margin="2"></vueQr>
</el-col>
</div>
- <div style="margin-left: 12px;line-height: 9px;">
+ <div style="margin-left: 0.32cm;line-height: 0.21cm;">
<el-row>
- <el-col style="font-size: 8px;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ <el-col style="font-size: 0.16cm;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
</el-row>
- <el-row style="font-size: 8px;">
+ <el-row style="font-size: 0.16cm;">
<el-col><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
</el-row>
- <el-row style="font-size: 8px;">
+ <el-row style="font-size: 0.16cm;">
<el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
- <el-row style="font-size: 8px;">
+ <el-row style="font-size: 0.16cm;">
<el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
</el-row>
- <el-row style="font-size: 8px;width: 140px;">
+ <el-row style="font-size: 0.16cm;width: 5.6cm;">
<el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
- <el-row style="margin-top: 3px;font-size: 8px;">
+ <el-row style="margin-top: 0.01cm;font-size: 0.16cm;">
<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>寰呮
@@ -473,14 +480,15 @@
sampleName: null,
sampleModel: null,
sampleCode: null,
+ outEntrustCode: null,
state: 0,
name:null,
engineering:null,
production:null,
- orderBy: {
- field: 'id',
- order: 'asc'
- }
+ // orderBy: {
+ // field: '',
+ // order: ''
+ // }
},
isIndex: true,
showSelect: true,
@@ -523,7 +531,7 @@
type: 'text',
method: 'handleIssued',
disabFun: (row, index) => {
- return row.state != 1 || row.sendTime != null
+ return row.state != 1 || row.assign
}
}],
linkEvent: {
@@ -583,7 +591,8 @@
},
selectField: {},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['createTime', 'sendTime', 'type', 'appointed']
},
componentDataDataLook: {
entity: {
@@ -626,7 +635,7 @@
},
{
name:'model',
- index:2
+ index:5
}
]
},
@@ -749,6 +758,10 @@
style: `@page {
margin:0;
size: 360px 175px collapse;
+ margin-top:3px;
+ &:first-of-type{
+ margin-top:0 !important;
+ }
}
html{
zoom:100%;
@@ -760,7 +773,7 @@
}`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
- font_size: '',
+ font_size: '0.16cm',
});
},
print(){
--
Gitblit v1.9.3