commit

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: {}}

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}不能为空`

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -367,11 +367,14 @@
                                         </template>
                                         <el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
-                                                <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.useLevel">
+                                                <el-select :disabled="DrawerType === 'see'" v-model="addForm.useLevel" filterable placeholder="请选择采标程度" style="width: 100%;">
-                                                    <el-radio label="等同" value="等同"></el-radio>
+                                                    <el-option
-                                                    <el-radio label="修改" value="修改"></el-radio>
+                                                            v-for="(item, index) in CBList"
-                                                    <el-radio label="非等效" value="非等效"></el-radio>
+                                                            :key="index"
-                                                </el-radio-group>
+                                                            :label="item.label"
+                                                            :value="item.value">
+                                                    </el-option>
+                                                </el-select>
                                             </div>
                                         </el-form-item>
                                         <el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
@@ -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 => {
             })
         },