From dd6aa18a74f7c47d816ae57be4667274a48ebee3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 09 八月 2024 09:29:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a5-capacity-scope.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 51d954c..074fd34 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -265,7 +265,8 @@
'unit', 'method', 'manDay', 'templateId'
],
accept: '.xlsx',
- inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+ inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ needSort: ['createTime', 'updateTime', 'inspectionItem', 'inspectionItemSubclass', 'sample'],
},
testObjectData: {
entity: {
@@ -305,7 +306,8 @@
}
},
requiredAdd: ['specimenName', 'code', 'laboratoryId'],
- requiredUp: ['specimenName', 'code', 'laboratoryId']
+ requiredUp: ['specimenName', 'code', 'laboratoryId'],
+ needSort: ['createTime', 'updateTime', 'specimenName'],
},
itemParameterEntityCopy: {},
testObjectDataEntityCopy: {},
--
Gitblit v1.9.3