From e1d6ecb19c05c9cc00b7d4a29d82cbc546d5cd09 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 02 八月 2024 16:42:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspection-order.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 3860336..ab95334 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -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"
@@ -475,6 +480,7 @@
sampleName: null,
sampleModel: null,
sampleCode: null,
+ outEntrustCode: null,
state: 0,
name:null,
engineering:null,
@@ -525,7 +531,7 @@
type: 'text',
method: 'handleIssued',
disabFun: (row, index) => {
- return row.state != 1 || row.sendTime != null
+ return row.state != 1 || row.assign
}
}],
linkEvent: {
@@ -629,7 +635,7 @@
},
{
name:'model',
- index:2
+ index:5
}
]
},
@@ -763,7 +769,7 @@
}`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
- font_size: '',
+ font_size: '0.21cm',
});
},
print(){
--
Gitblit v1.9.3