From 58faef5c48c7491fe14e2a3ec0a0db4dba8967a6 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 23 七月 2024 17:23:49 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a5-capacity-scope.vue | 16 +++++++++++++++-
src/assets/api/controller.js | 1 +
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a74994c..e1b97c9 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -124,6 +124,7 @@
upProduct: "/capacityScope/upProduct", //淇敼浜у搧
getItemTree: "/capacityScope/getItemTree", //鑾峰彇妫�楠屽璞℃爲
importData: "/capacityScope/importData", //瀵煎叆妫�楠岄」鐩�
+ importEquipData: "/capacityScope/importEquipData", //瑁呭鐢电紗-瀵煎叆妫�楠岄」鐩�
importExcel: "/capacityScope/importExcel", // 瀵煎叆鑳藉姏鑼冨洿
}
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 34de083..51d954c 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">
@@ -350,6 +353,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