Merge remote-tracking branch 'origin/master'

src/views/modules/common/Chooselist_eam.vue

@@ -1,21 +1,33 @@
 <template>
-  <el-dialog :title="baseListData.description" :close-on-click-modal="false"  :close-on-press-escape="false" @close="closeDialog" :visible.sync="visible" width="685px" v-drag>
-    <el-form label-position="top" inline="inline" size="mini" label-width="120px">
+  <el-dialog class="yzzInput" :title="baseListData.description" :close-on-click-modal="false"  :close-on-press-escape="false" @close="closeDialog" :visible.sync="visible" width="685px" v-drag>
+    <el-form label-position="top" inline="inline" size="mini" >
+      <el-row :gutter="10">
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption1" v-if="baseListData.caption1 != '' && baseListData.caption1 != null">
         <el-input v-model="param1"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption2" v-if="baseListData.caption2 != '' && baseListData.caption2 != null">
         <el-input v-model="param2"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption3" v-if="baseListData.caption3 != '' && baseListData.caption3 != null">
         <el-input v-model="param3"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption4" v-if="baseListData.caption4 != '' && baseListData.caption4 != null">
         <el-input v-model="param4"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption5" v-if="baseListData.caption5 != '' && baseListData.caption5 != null">
         <el-input v-model="param5"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption6" v-if="baseListData.caption6 != '' && baseListData.caption6 != null ">
         <el-select v-model="param6" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -23,11 +35,18 @@
           <el-option label="不在用" value="N"></el-option>
         </el-select>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption7" v-if="baseListData.caption7 != '' && baseListData.caption7 != null">
         <el-input v-model="param7"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-button style="margin-top: 18px" type="primary" @click="getDataList(false)">查询
       </el-button>
+        </el-col>
+
+      </el-row>
     </el-form>
 
     <el-table