Merge remote-tracking branch 'origin/master'

src/views/school-center/university/university.vue

@@ -68,8 +68,8 @@
                 <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="揽装工号：">
                 <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="揽装工号：">
                     <a-input placeholder="揽装工号" v-decorator="[ 'universityPackageNumber', {rules: [{ required: true, message: '揽装工号不能为空！' ,validator: 'click'}]} ]"></a-input>
                     <a-input placeholder="揽装工号" v-decorator="[ 'universityPackageNumber', {rules: [{ required: true, message: '揽装工号不能为空！' ,validator: 'click'}]} ]"></a-input>
                 </a-form-item>
                 </a-form-item>
-                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="地址：">
-                    <a-input placeholder="地址" v-decorator="[ 'universityInstalledAddressId', {rules: [{ required: true, message: '地址不能为空！' ,validator: 'click'}]} ]"></a-input>
+                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="地址ID：">
+                    <a-input placeholder="地址ID" v-decorator="[ 'universityInstalledAddressId', {rules: [{ required: true, message: '地址ID不能为空！' ,validator: 'click'}]} ]"></a-input>
                 </a-form-item>
                 </a-form-item>
                 <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="用户类型：">
                 <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="用户类型：">
                     <a-input placeholder="如:校园天翼宽带用户" v-decorator="[ 'universityUserType', {rules: [{ required: true, message: '用户类型不能为空！' ,validator: 'click'}]} ]"></a-input>
                     <a-input placeholder="如:校园天翼宽带用户" v-decorator="[ 'universityUserType', {rules: [{ required: true, message: '用户类型不能为空！' ,validator: 'click'}]} ]"></a-input>
@@ -137,7 +137,7 @@
                     {dataIndex: 'universityInstalledAddress', width: 300, title: '装机地址'},
                     {dataIndex: 'universityInstalledAddress', width: 300, title: '装机地址'},
                     {dataIndex: 'universityExteriorLines', width: 120, title: '外线方式 '},
                     {dataIndex: 'universityExteriorLines', width: 120, title: '外线方式 '},
                     {dataIndex: 'universityPackageNumber', width: 100, title: '揽装工号 '},
                     {dataIndex: 'universityPackageNumber', width: 100, title: '揽装工号 '},
-                    {dataIndex: 'universityInstalledAddressId', width: 100, title: '地址 '},
+                    {dataIndex: 'universityInstalledAddressId', width: 150, title: '地址ID'},
                     {dataIndex: 'universityUserType', width: 150, title: '用户类型 '},
                     {dataIndex: 'universityUserType', width: 150, title: '用户类型 '},
                     {dataIndex: 'universityMonthlyRentType', width: 80, title: '月租类型 '},
                     {dataIndex: 'universityMonthlyRentType', width: 80, title: '月租类型 '},
                     {dataIndex: 'universityChargeMode', width: 120, title: '收费模式 '},
                     {dataIndex: 'universityChargeMode', width: 120, title: '收费模式 '},