From dff404a76987de5b632ae635a6dea6c95dc37a4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 四月 2024 16:58:59 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a7-standard-method.vue | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/src/components/view/a7-standard-method.vue b/src/components/view/a7-standard-method.vue
index 5176e02..47379a7 100644
--- a/src/components/view/a7-standard-method.vue
+++ b/src/components/view/a7-standard-method.vue
@@ -115,6 +115,16 @@
value: 1,
label: '鏄�'
}]
+ },
+ isUse: {
+ select: [{
+ value: 0,
+ type: 'info',
+ label: '鍚�'
+ }, {
+ value: 1,
+ label: '鏄�'
+ }]
}
},
selectField: {
@@ -124,6 +134,7 @@
isProduct: {
select: [{
value: 0,
+ type: 'info',
label: '鍚�'
}, {
value: 1,
@@ -157,4 +168,43 @@
getPower() {
let power = JSON.parse(sessionStorage.getItem('power'))
let up = false
- let del = fa
+ let del = false
+ let add = false
+ for (var i = 0; i < power.length; i++) {
+ if (power[i].menuMethod == 'addStandardMethod') {
+ add = true
+ }
+ if (power[i].menuMethod == 'delStandardMethod') {
+ del = true
+ }
+ if (power[i].menuMethod == 'upStandardMethod') {
+ up = true
+ }
+ }
+ if (!del) {
+ this.componentData.do.splice(1, 1)
+ }
+ if (!up) {
+ this.componentData.do.splice(0, 1)
+ }
+ this.addPower = add
+ },
+ openAdd() {
+ this.$refs.ValueTable.openAddDia(this.$api.standardMethod.addStandardMethod);
+ },
+ selectTestObjectByName() {
+ this.$axios.get(this.$api.capacityScope.selectTestObjectByName).then(res => {
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.specimenName,
+ value: a.id
+ })
+ })
+ this.componentData.selectField.structureTestObjectId.select = data
+ this.componentData.tagField.structureTestObjectId.select = data
+ })
+ },
+ }
+ }
+</script>
--
Gitblit v1.9.3