From 4144ff22e181b58124f1a4ab6484d49975ca2d1f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期日, 28 四月 2024 10:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a7-standard-method.vue | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 101 insertions(+), 3 deletions(-)
diff --git a/src/components/view/a7-standard-method.vue b/src/components/view/a7-standard-method.vue
index 5176e02..60a635d 100644
--- a/src/components/view/a7-standard-method.vue
+++ b/src/components/view/a7-standard-method.vue
@@ -115,6 +115,19 @@
value: 1,
label: '鏄�'
}]
+ },
+ isUse: {
+ select: [{
+ value: 0,
+ type: 'info',
+ label: '鍚�'
+ }, {
+ value: 1,
+ label: '鏄�'
+ }]
+ },
+ qualificationId:{
+ select: []
}
},
selectField: {
@@ -124,15 +137,29 @@
isProduct: {
select: [{
value: 0,
+ type: 'info',
label: '鍚�'
}, {
value: 1,
label: '鏄�'
}]
+ },
+ isUse: {
+ select: [{
+ value: 0,
+ type: 'info',
+ label: '鍚�'
+ }, {
+ value: 1,
+ label: '鏄�'
+ }]
+ },
+ qualificationId:{
+ select: []
}
},
- requiredAdd: ['code', 'name', 'structureTestObjectId', 'isProduct'],
- requiredUp: ['code', 'name', 'structureTestObjectId', 'isProduct']
+ requiredAdd: ['code', 'name', 'structureTestObjectId', 'isProduct','isUse','nameEn'],
+ requiredUp: ['code', 'name', 'structureTestObjectId', 'isProduct','isUse','nameEn']
},
entityCopy: {},
upIndex: 0,
@@ -144,6 +171,7 @@
this.entityCopy = this.HaveJson(this.componentData.entity)
this.getPower()
this.selectTestObjectByName()
+ this.getQualificationList()
},
methods: {
refreshTable() {
@@ -157,4 +185,74 @@
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
+ })
+ },
+ getQualificationList(){
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "璧勮川鍚嶇О"
+ }).then(res => {
+ let list = res.data
+ this.componentData.selectField.qualificationId.select = list
+ this.componentData.tagField.qualificationId.select = list
+ })
+ // this.$axios.post(this.$api.certification.getCertificationDetail,{
+ // page: {
+ // current: -1,
+ // size: -1
+ // },
+ // entity:{
+ // name: null,
+ // }}, {
+ // headers: {
+ // 'Content-Type': 'application/json'
+ // }
+ // }).then(res => {
+ // if(res.code==200){
+ // let list = res.data.body.records.map(item => {
+ // item.label = item.name
+ // item.value = item.id
+ // return item
+ // });
+ // this.componentData.selectField.qualificationId.select = list
+ // this.componentData.tagField.qualificationId.select = list
+ // }
+ // })
+ }
+ }
+ }
+</script>
--
Gitblit v1.9.3