Merge branch 'master' into ouqian

src/components/Template/BaseInfoFormPackage.vue

@@ -437,7 +437,7 @@ export default {
             return {
                 ...sItem,
                 key: sItem.subKey,
-                disabled: sItem.subDisabled || sItem.disabled,
+                disabled: sItem.subDisabled,
                 fillType: sItem.subFillType || sItem.fillType
             }
         },
@@ -446,7 +446,7 @@ export default {
                 ...sItem,
                 key: sItem.fourthKey,
                 buttonName:sItem.fourthButtonName,
-                disabled: sItem.fourthDisabled || sItem.disabled,
+                disabled: sItem.fourthDisabled,
                 fillType: sItem.fourthFillType || sItem.fillType
             }
         },