From cb57bc6b4abf45dbb0605c94359c63e3b31b4b87 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 10 九月 2024 15:55:57 +0800
Subject: [PATCH] 优化报告生成、修改电路下单传参
---
src/components/view/a5-capacity-scope.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 34de083..074fd34 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -95,9 +95,12 @@
</div>
</div>
<div class="table">
- <ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList"
+ <ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList" v-if="PROJECT === '妫�娴嬩腑蹇�'"
:upUrl="$api.capacityScope.upItemParameter" :delUrl="$api.capacityScope.delItemParameter"
:inputUrl="$api.capacityScope.importData" :componentData="itemParameterData" :key="upIndex" />
+ <ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList" v-if="PROJECT === '瑁呭鐢电紗'"
+ :upUrl="$api.capacityScope.upItemParameter" :delUrl="$api.capacityScope.delItemParameter"
+ :inputUrl="$api.capacityScope.importEquipData" :componentData="itemParameterData" :key="upIndex" />
</div>
</div>
<div class="bodys">
@@ -262,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: {
@@ -302,7 +306,8 @@
}
},
requiredAdd: ['specimenName', 'code', 'laboratoryId'],
- requiredUp: ['specimenName', 'code', 'laboratoryId']
+ requiredUp: ['specimenName', 'code', 'laboratoryId'],
+ needSort: ['createTime', 'updateTime', 'specimenName'],
},
itemParameterEntityCopy: {},
testObjectDataEntityCopy: {},
@@ -350,6 +355,17 @@
uploading: false,
}
},
+ created() {
+ if (this.PROJECT === '瑁呭鐢电紗') {
+ this.itemParameterData.requiredUp = ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'manDay', 'templateId'
+ ]
+ } else {
+ this.itemParameterData.requiredUp = ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'method', 'manDay', 'templateId'
+ ]
+ }
+ },
mounted() {
this.token = {
'token': sessionStorage.getItem('token')
--
Gitblit v1.9.3