Merge branch 'master-500-dev-xwx' into 'master-500-dev'

AJ配置信息弹框样式调整



See merge request !422

 <div>
 	<el-select @visible-change="selectClose" v-model="modelValueLabel" :filter-method="selectFilterMethod"
-		style="min-width: 120px;" :size="size" placeholder="资源类型" :filterable="isFilter" clearable
+		style="min-width: 550px;" :size="size" placeholder="资源类型" :filterable="isFilter" clearable
 		:collapse-tags="true" @change="selectChangeMethod">
 		<el-option :value="modelValue" style="height: auto;padding: 0;">
 			<el-tree ref="resTypeTree" :data="list" :check-on-click-node="true" :default-expand-all="isDefaultAll"

@@ -126,16 +126,13 @@
             <el-form-item label="资源类型" prop="resType" v-if="ajConfigFrom.type==2" style="text-align: left">
                 <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.resType" clearable></el-input>-->
                 <el-dropdown>
-                    <el-icon class="el-icon--right">
-                        <arrow-down/>
-                    </el-icon>
                     <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
                 </el-dropdown>
             </el-form-item>
 
             <el-form-item label="厂商" prop="provider" v-if="ajConfigFrom.type==2" style="text-align: left">
                 <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>-->
-                <el-select v-model="ajConfigFrom.provider" filterable clearable collapse-tags  placeholder="请选择厂商" style="margin-top: 10px">
+                <el-select v-model="ajConfigFrom.provider" filterable clearable collapse-tags  placeholder="请选择厂商" style="width: 550px">
                     <el-option
                             v-for="item in ddicProvider"
                             :label="item.ddicName" :value="item.ddicCode"></el-option>
@@ -145,7 +142,7 @@
 
             <el-form-item label="操作系统" prop="os" v-if="ajConfigFrom.type==2" style="text-align: left">
                 <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>-->
-                <el-select v-model="ajConfigFrom.os" filterable clearable collapse-tags  placeholder="请选择操作类型" style="margin-top: 10px">
+                <el-select v-model="ajConfigFrom.os" filterable clearable collapse-tags  placeholder="请选择操作类型" style="width: 550px">
                     <el-option
                             v-for="item in ddicOS"
                             :label="item.ddicName" :value="item.ddicCode"></el-option>