朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 68aff9bf4c231f071e8cbe8b3363aa6cfd30b7c9 1 个父辈 25baa635

预/确报申报配置

内嵌 并排对比
正在显示 2 个修改的文件 包含 16 行增加 和 15 行删除
1 <template> 1 <template>
2 - <el-container> 2 + <div style="height: 850px;overflow: scroll;margin-left: 25px;background-color: rgb(255,255,255)">
3 <el-main> 3 <el-main>
4 <el-row class="row-bg"> 4 <el-row class="row-bg">
5 <el-col :span="24"> 5 <el-col :span="24">
@@ -7,21 +7,21 @@ @@ -7,21 +7,21 @@
7 </el-col> 7 </el-col>
8 </el-row> 8 </el-row>
9 <!-- 搜索区域--> 9 <!-- 搜索区域-->
10 - <el-row> 10 + <el-row style="padding-top: 10px">
11 <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight" 11 <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 <el-row> 13 <el-row>
14 - <el-col :span="4" > 14 + <el-col :span="5" style="margin-right: 70px">
15 <el-form-item label="承运人" prop="carrier" label-width="70px"> 15 <el-form-item label="承运人" prop="carrier" label-width="70px">
16 <el-input v-model="queryConfigure.carrier" style="width:120px"></el-input> 16 <el-input v-model="queryConfigure.carrier" style="width:120px"></el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 - <el-col :span="4" > 19 + <el-col :span="5" style="margin-right: 70px">
20 <el-form-item label="航班号" prop="flightno" label-width="70px"> 20 <el-form-item label="航班号" prop="flightno" label-width="70px">
21 <el-input v-model="queryConfigure.flightno" style="width:120px"></el-input> 21 <el-input v-model="queryConfigure.flightno" style="width:120px"></el-input>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 - <el-col :span="5" > 24 + <el-col :span="8" >
25 <el-button type="primary" icon="el-icon-search" @click="submitForm()">查询</el-button> 25 <el-button type="primary" icon="el-icon-search" @click="submitForm()">查询</el-button>
26 <el-button type="success" icon="el-icon-edit" @click="addForm()">新增</el-button> 26 <el-button type="success" icon="el-icon-edit" @click="addForm()">新增</el-button>
27 27
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <el-table 35 <el-table
36 :data="tableData" 36 :data="tableData"
37 border 37 border
38 - v-loading="tableloading"> 38 + v-loading="tableloading" style="margin-bottom: 20px;margin-top: 20px">
39 <el-table-column 39 <el-table-column
40 prop="carrier" 40 prop="carrier"
41 label="承运人"> 41 label="承运人">
@@ -231,7 +231,7 @@ @@ -231,7 +231,7 @@
231 </el-col> 231 </el-col>
232 <el-col :span="6"> 232 <el-col :span="6">
233 <el-form-item label="配置状态" prop="configstatus" label-width="130px"> 233 <el-form-item label="配置状态" prop="configstatus" label-width="130px">
234 -<!-- <el-input v-model="configure_editForm.configstatus"></el-input>--> 234 + <!-- <el-input v-model="configure_editForm.configstatus"></el-input>-->
235 <el-select v-model="configure_editForm.configstatus" placeholder="请选择" size="mini"> 235 <el-select v-model="configure_editForm.configstatus" placeholder="请选择" size="mini">
236 <el-option label="0-禁用" value="0"></el-option> 236 <el-option label="0-禁用" value="0"></el-option>
237 <el-option label="1-生效" value="1"></el-option> 237 <el-option label="1-生效" value="1"></el-option>
@@ -240,7 +240,7 @@ @@ -240,7 +240,7 @@
240 </el-col> 240 </el-col>
241 <el-col :span="6"> 241 <el-col :span="6">
242 <el-form-item label="配置类型" prop="type" label-width="130px"> 242 <el-form-item label="配置类型" prop="type" label-width="130px">
243 -<!-- <el-input v-model="configure_editForm.type"></el-input>--> 243 + <!-- <el-input v-model="configure_editForm.type"></el-input>-->
244 <el-select v-model="configure_editForm.type" placeholder="请选择" size="mini"> 244 <el-select v-model="configure_editForm.type" placeholder="请选择" size="mini">
245 <el-option label="2-入境" value="2"></el-option> 245 <el-option label="2-入境" value="2"></el-option>
246 <el-option label="1-出境" value="1"></el-option> 246 <el-option label="1-出境" value="1"></el-option>
@@ -331,7 +331,8 @@ @@ -331,7 +331,8 @@
331 </el-dialog> 331 </el-dialog>
332 </el-row> 332 </el-row>
333 </el-main> 333 </el-main>
334 - </el-container> 334 +
  335 + </div>
335 </template> 336 </template>
336 337
337 338
@@ -414,7 +415,7 @@ @@ -414,7 +415,7 @@
414 }, 415 },
415 rules: { 416 rules: {
416 carrier: [ 417 carrier: [
417 - { required: true, message: '请输入', trigger: 'blur' }, 418 + { required: true, message: '', trigger: 'blur' },
418 // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } 419 // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
419 ], 420 ],
420 flightno: [ 421 flightno: [
@@ -7,21 +7,21 @@ @@ -7,21 +7,21 @@
7 </el-col> 7 </el-col>
8 </el-row> 8 </el-row>
9 <!-- 搜索区域--> 9 <!-- 搜索区域-->
10 - <el-row> 10 + <el-row style="padding-top: 10px">
11 <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight" 11 <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 <el-row> 13 <el-row>
14 - <el-col :span="4" > 14 + <el-col :span="5" style="margin-right: 70px">
15 <el-form-item label="承运人" prop="awcd" label-width="70px"> 15 <el-form-item label="承运人" prop="awcd" label-width="70px">
16 <el-input v-model="queryConfigure.awcd" style="width:120px"></el-input> 16 <el-input v-model="queryConfigure.awcd" style="width:120px"></el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 - <el-col :span="4" > 19 + <el-col :span="5" style="margin-right: 70px">
20 <el-form-item label="航班号" prop="flightNo" label-width="70px"> 20 <el-form-item label="航班号" prop="flightNo" label-width="70px">
21 <el-input v-model="queryConfigure.flightNo" style="width:120px"></el-input> 21 <el-input v-model="queryConfigure.flightNo" style="width:120px"></el-input>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 - <el-col :span="5" > 24 + <el-col :span="8" >
25 <el-button type="primary" icon="el-icon-search" @click="submitForm()">查询</el-button> 25 <el-button type="primary" icon="el-icon-search" @click="submitForm()">查询</el-button>
26 <el-button type="success" icon="el-icon-edit" @click="addForm()">新增</el-button> 26 <el-button type="success" icon="el-icon-edit" @click="addForm()">新增</el-button>
27 27
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <el-table 35 <el-table
36 :data="tableData" 36 :data="tableData"
37 border 37 border
38 - v-loading="tableloading"> 38 + v-loading="tableloading" style="margin-bottom: 20px;margin-top: 20px">
39 <el-table-column 39 <el-table-column
40 prop="awcd" 40 prop="awcd"
41 label="承运人"> 41 label="承运人">