From 2a9256b4a3121c3f9eeb25a1b1ca24e5c3eb2f49 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 七月 2024 14:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b1-expenses.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 79d87c5..67596ee 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -73,7 +73,7 @@
<el-select @focus="getCompanyOptions" @change="refreshTable()" clearable
size="small" v-model="componentData.entity.company" style="width: 100%">
<el-option v-for="item in companyOptions" :key="item.value"
- :label="item.label" :value="item.value">
+ :label="item.label" :value="item.label">
</el-option>
</el-select>
</div>
@@ -114,7 +114,7 @@
company: null,
dates: null,
orderBy: {
- field: 'id,ins_sample_id',
+ field: 'id',
order: 'asc'
}
},
@@ -135,6 +135,14 @@
name: 'entrustCode',
index: 2
},
+ /* {
+ name: 'sample',
+ index: 3
+ },
+ {
+ name: 'model',
+ index: 4
+ }, */
{
name: 'company',
index: 8
@@ -145,8 +153,8 @@
},
],
// 鐗规畩鐨勫悎骞惰锛屾牴鎹甿ain鍜宺ows鐨刵ame鏉ュ悎骞�
- special: {
- main: 'insSampleId',
+ /* special: {
+ main: 'entrustCode',
rows: [{
name: 'sample',
index: 3
@@ -164,7 +172,7 @@
index: 6
},
]
- }
+ } */
},
tagField: {
type: {
--
Gitblit v1.9.3