合并分支 'fix_foton' 到 'FOTON'

Fix foton

查看合并请求 laws-foton-slrs/foton-laws-system-front!8

src/pages/config/pages/roleManage/index.vue

@@ -171,7 +171,7 @@
           :data="treeData3"
           :props="defaultProps3"
           :default-checked-keys="nodeList2"
-          default-expand-all
+          :default-expanded-keys="defaultExpandedKeys"
           highlight-current
           :expand-on-click-node="false"
           :show-checkbox="true"
@@ -202,7 +202,7 @@
           :data="treeData4"
           :props="defaultProps3"
           :default-checked-keys="nodeList4"
-          default-expand-all
+          :default-expanded-keys="defaultExpandedKeys"
           highlight-current
           :expand-on-click-node="false"
           :show-checkbox="true"
@@ -468,7 +468,8 @@ export default {
         children: 'children',
         label: 'menuName'
       },
-      nodeList: []
+      nodeList: [],
+      defaultExpandedKeys:[]//默认展开的key
     }
   },
   methods: {
@@ -685,6 +686,8 @@ export default {
         this.treeData4 = this.sortByKey(list1,"displaySeq")
       }
 
+      // 默认展开的key
+      this.defaultExpandedKeys =  list1.map(item=>item.id)
 
     },
     sortByKey(ary, key) {

src/pages/details/otherStandardDetails/index.vue

@@ -2161,7 +2161,10 @@ export default {
     child6Func(child6) {
       const list = []
       if (child6 && child6.length > 1) {
-        list.push(child6[0])
+        for(let i = 0 ; i < child6.length ; i++){
+          list.push(child6[i])
+        }
+        // list.push(child6[0])
         return list
       }
       return child6

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -756,6 +756,7 @@
                     :disabled="formdisableflag"
                     :show-modify-name="true"
                     @fileSuccess="fileSuccess"
+                    :limit="['FBGBJBD','FBGYWBD','XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8"
                   ></custom-file>
                 </template>
                 <template v-else-if="field.attrType === 'TEXTAREA'">
@@ -3732,6 +3733,7 @@ export default {
             })
             this.dynamicFormField = displayLocation
             this.loading = false
+            console.log(this.dynamicFormField)
           })
         })
       })

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -854,6 +854,7 @@
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
                     :show-modify-name="true"
+                    :limit="['FBGBJBD','FBGYWBD','XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8"
                   ></custom-file>
                 </template>
                 <template v-else-if="field.attrType === 'TEXTAREA'">
@@ -3874,6 +3875,7 @@ export default {
             })
             this.dynamicFormField = displayLocation
             this.loading = false
+            console.log(this.dynamicFormField)
           })
           this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
           this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter()

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -951,6 +951,7 @@
                         :disabled="formdisableflag"
                         :show-modify-name="true"
                         @fileSuccess="fileSuccess"
+                        :limit="20"
                       ></custom-file>
                     </template>
                     <template v-else-if="field.attrType === 'FILE' && field.attrField === 'FBGYWBD'">
@@ -960,6 +961,7 @@
                           :disabled="formdisableflag"
                           :show-modify-name="true"
                           @fileSuccess="fileSuccess"
+                          :limit="20"
                       ></custom-file>
                     </template>
                   </template>
@@ -1207,6 +1209,7 @@
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
                     @fileSuccess="fileSuccess"
+                    :limit="['XDB','KWJ','ZBJBD'].some(item => item===field.attrField) ? 20 : 8"
                   ></custom-file>
                 </template>
                 <template v-else-if="field.attrType === 'TEXTAREA'">
@@ -3136,6 +3139,7 @@ export default {
             })
             this.dynamicFormField = displayLocation
             this.loading = false
+            console.log(this.dynamicFormField)
           })
         })
       })