diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index fb95df303..6d892b758 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -267,7 +267,11 @@ export default {
},
uploadSuccess(res, file, fileList) {
if (res.ok) {
- // this.value += res.data.id + ','
+ let obj = {name: '', response: {}}
+ obj.name = file.response.data.oldFileName
+ obj.response.data = file.response.data
+ this.showFileList.push(obj)
+ // this.value += res.data.id + ','
this.$emit('input', this.value ? this.value + ','+ res.data.id + ',' : this.value+ res.data.id + ',')
this.$emit('success')
this.$message({
@@ -314,7 +318,6 @@ export default {
this.$emit('input', '')
}
}
-
const showFileList = []
fileList.map(item => {
let obj = {name: '', response: {}}
diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue
index b50ead6cd..cd4220446 100644
--- a/src/components/CustomFormComponents/InputForAllStandards2.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards2.vue
@@ -196,7 +196,11 @@
},
computed: {
placeholder () {
- return `${this.placeholderText}`
+ if (this.placeholderText){
+ return `${this.placeholderText}`
+ } else {
+ return `请输入${this.config.attrName}`
+ }
},
showMessage () {
return `${this.config.attrName}不能为空`
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index f894c6b21..5c970f03d 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -367,11 +367,14 @@
-
-
-
-
-
+
+
+
+
@@ -591,6 +594,7 @@
},
data() {
return {
+ CBList: [],
BZList: [],
TXJGList: [],
TXJGmodal: false,
@@ -761,7 +765,7 @@
this.$message.warning('请选择要带入的标准')
} else {
this.addForm.rqbJson = this.QYBZformSelect[0].id
- this.addForm.rqbName = this.QYBZformSelect[0].standName
+ this.addForm.rqbName = this.QYBZformSelect[0].standCode
this.clearQYBZ()
this.QYBZmodal = false
}
@@ -1092,7 +1096,7 @@
this.standSystemOptions = res.data.TXLBBUSS // 体系结构
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
this.BZList = res.data.ENERGYTYPES
- console.log(res.data);
+ this.CBList = res.data.DEGREESTANDARD
}, e => {
})
},