Merge branch 'fanghuisheng' of http://47.111.81.118:3000/uskycloud/usky-web-mobile into 165

src/pages/business/mhxf/unitInfoCollection/index.vue

@@ -25,7 +25,7 @@
                 <u-input v-model="form.delegateName" placeholder="请输入法人代表" border="none" />
               </u-form-item>
               <u-form-item label="所属街镇" prop="streetTown" required :borderBottom="true" @click="handleAction('所属街镇')">
-                <u-input v-model="form.streetTown" placeholder="请选择所属街镇" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" />
+                <u-input v-model="form.streetTown" placeholder="请选择所属街镇" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
               </u-form-item>
               <u-form-item label="单位地址" prop="address" required :borderBottom="true">
                 <u-input v-model="form.address" placeholder="请输入单位地址" border="none" />
@@ -49,7 +49,7 @@
                 <u-input type="number" v-model="form.fixedAssets" placeholder="请输入固定资产(万元）" suffixIcon="万元" suffixIconStyle="color:#999999;font-size:15px" border="none" />
               </u-form-item>
               <u-form-item label="单位性质" prop="companyNature" :borderBottom="true" @click="handleAction('单位性质')">
-                <u-input v-model="form.companyNature" placeholder="请选择单位性质" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" />
+                <u-input v-model="form.companyNature" placeholder="请选择单位性质" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
               </u-form-item>
               <u-form-item label="单位建筑面积" prop="buildArea" :borderBottom="true">
                 <u-input type="number" v-model="form.buildArea" placeholder="请输入单位建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
@@ -87,7 +87,7 @@
                 <u-input v-model="li.address" placeholder="请输入建筑地址" border="none" />
               </u-form-item>
               <u-form-item label="建筑结构" prop="li.buildStructure" required :borderBottom="true" @click="handleAction('建筑结构', index)">
-                <u-input v-model="li.buildStructure" placeholder="请选择建筑结构" border="none" suffixIcon="arrow-right" suffixIconStyle="color: #909399" />
+                <u-input v-model="li.buildStructure" placeholder="请选择建筑结构" border="none" suffixIcon="arrow-right" suffixIconStyle="color: #909399" disabledColor="transparent" disabled />
               </u-form-item>
               <u-form-item label="地上层数" prop="li.aboveFloor" required :borderBottom="true">
                 <u-input v-model="li.aboveFloor" placeholder="请输入地上层数" border="none" />
@@ -102,7 +102,7 @@
                 <u-input v-model="li.underSpace" placeholder="请输入地下空间面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
               </u-form-item>
               <u-form-item label="使用性质" prop="li.useCharacter" required :borderBottom="true" @click="handleAction('使用性质', index)">
-                <u-input v-model="li.useCharacter" placeholder="请选择使用性质" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" />
+                <u-input v-model="li.useCharacter" placeholder="请选择使用性质" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
               </u-form-item>
               <u-form-item label="建成年份" prop="li.completeYear" required :borderBottom="true" @click="handleDateTime('建成年份', index, li.completeYear)">
                 <u-input v-model="li.completeYear" placeholder="请选择建成年份" suffixIcon="calendar" suffixIconStyle="color: #909399;font-size:22px" border="none" />

src/uni_modules/uview-plus/components/u-form/u-form.vue

@@ -146,7 +146,7 @@
 							const propertyName =
 								propertyChain[propertyChain.length - 1];
 
-							const rule = this.formRules[child.prop];
+							let rule = this.formRules[child.prop];
 
 							if(!rule){
 								rule=uni.$u.getProperty(