朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 37fc0d84262e7586a082f1390798dd78fa452fda 1 个父辈 ad417333

跨天配置

内嵌 并排对比
正在显示 3 个修改的文件 包含 136 行增加 和 51 行删除
@@ -3,9 +3,9 @@ let baseUrl = 'nmms-server-import/nmms/mt1201' @@ -3,9 +3,9 @@ let baseUrl = 'nmms-server-import/nmms/mt1201'
3 let baseUrlCross = 'nmms-server-import/nmms/crossday' 3 let baseUrlCross = 'nmms-server-import/nmms/crossday'
4 4
5 //跨天配置 5 //跨天配置
6 -export const addCrossday=params=>{return http.get(`${baseUrlCross}/addCrossday`, params);};  
7 -export const ediCrossday=params=>{return http.get(`${baseUrlCross}/ediCrossday`, params);};  
8 -export const delCrossday=params=>{return http.get(`${baseUrlCross}/delCrossday`, params);}; 6 +export const addCrossday=params=>{return http.post(`${baseUrlCross}/addCrossday`, params);};
  7 +export const ediCrossday=params=>{return http.post(`${baseUrlCross}/ediCrossday`, params);};
  8 +export const delCrossday=params=>{return http.post(`${baseUrlCross}/delCrossday`, params);};
9 export const selectLists=params=>{return http.get(`${baseUrlCross}/selectLists`, params);}; 9 export const selectLists=params=>{return http.get(`${baseUrlCross}/selectLists`, params);};
10 10
11 11
@@ -4,17 +4,13 @@ @@ -4,17 +4,13 @@
4 <!--检索条件--> 4 <!--检索条件-->
5 <el-row class="toolbar" style="background-color: white;margin-bottom: 10px"> 5 <el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
6 <el-col :span="6"> 6 <el-col :span="6">
7 - <template>  
8 - 承运人  
9 - </template>  
10 - <el-input v-model="queryinfo.carrier" placeholder="承运人" style="width: 150px"> 7 + <el-input v-model="queryinfo.carrier" placeholder="承运人" style="width: 200px">
  8 + <template slot="prepend">承运人</template>
11 </el-input> 9 </el-input>
12 </el-col> 10 </el-col>
13 <el-col :span="6"> 11 <el-col :span="6">
14 - <template>  
15 - 航班号  
16 - </template>  
17 - <el-input v-model="queryinfo.flightno" placeholder="航班号" style="width: 150px"> 12 + <el-input v-model="queryinfo.flightno" placeholder="航班号" style="width: 200px">
  13 + <template slot="prepend">航班号</template>
18 </el-input> 14 </el-input>
19 </el-col> 15 </el-col>
20 16
@@ -55,15 +51,18 @@ @@ -55,15 +51,18 @@
55 </el-table-column> 51 </el-table-column>
56 <el-table-column 52 <el-table-column
57 prop="effectivedate" 53 prop="effectivedate"
58 - label="航班计划开始时间"> 54 + label="航班计划开始时间"
  55 + width="120">
59 </el-table-column> 56 </el-table-column>
60 <el-table-column 57 <el-table-column
61 prop="expirationdate" 58 prop="expirationdate"
62 - label="航班计划结束时间"> 59 + label="航班计划结束时间"
  60 + width="120">
63 </el-table-column> 61 </el-table-column>
64 <el-table-column 62 <el-table-column
65 prop="schedule" 63 prop="schedule"
66 - label="航班计划航班时刻"> 64 + label="航班计划航班时刻"
  65 + width="120">
67 </el-table-column> 66 </el-table-column>
68 <el-table-column 67 <el-table-column
69 prop="remark" 68 prop="remark"
@@ -72,7 +71,7 @@ @@ -72,7 +71,7 @@
72 <el-table-column 71 <el-table-column
73 fixed="right" 72 fixed="right"
74 label="操作" 73 label="操作"
75 - width="180"> 74 + width="150">
76 <template slot-scope="scope"> 75 <template slot-scope="scope">
77 <el-button type="success" size="small" @click="toEditDialog(scope.row)">编辑</el-button> 76 <el-button type="success" size="small" @click="toEditDialog(scope.row)">编辑</el-button>
78 <el-button type="danger" size="small" @click="del(scope.$index,scope.row)">删除</el-button> 77 <el-button type="danger" size="small" @click="del(scope.$index,scope.row)">删除</el-button>
@@ -82,6 +81,19 @@ @@ -82,6 +81,19 @@
82 </template> 81 </template>
83 </el-row> 82 </el-row>
84 <!--分页模块--> 83 <!--分页模块-->
  84 +<!-- <el-row style="float: right;margin-top: 20px">-->
  85 +<!-- <div class="block">-->
  86 +<!-- <el-pagination-->
  87 +<!-- @size-change="handleSizeChange"-->
  88 +<!-- @current-change="handleCurrentChange"-->
  89 +<!-- :current-page="currentPage"-->
  90 +<!-- :page-sizes="[10, 20, 30, 40]"-->
  91 +<!-- :page-size="pageSize"-->
  92 +<!-- layout="total, sizes, prev, pager, next, jumper"-->
  93 +<!-- :total="total">-->
  94 +<!-- </el-pagination>-->
  95 +<!-- </div>-->
  96 +<!-- </el-row>-->
85 <el-row style="float: right;margin-top: 20px"> 97 <el-row style="float: right;margin-top: 20px">
86 <div class="block"> 98 <div class="block">
87 <el-pagination 99 <el-pagination
@@ -98,37 +110,86 @@ @@ -98,37 +110,86 @@
98 <!-- 新增弹框--> 110 <!-- 新增弹框-->
99 <el-row> 111 <el-row>
100 <el-dialog :title="dialogMap[dialogStatus]" 112 <el-dialog :title="dialogMap[dialogStatus]"
101 - :visible.sync="dialogCross.addDialog" align="center" style="margin-top: -20px">  
102 - <el-form ref="form" :model="form" label-width="150px" label-position="right" :inline="true" :rules="rules">  
103 - <el-form-item label="启/禁用" style="margin-top: 15px"> 113 + :visible.sync="dialogCross.addDialog" align="center" style="margin-left: 40px" width="70%">
  114 + <el-form ref="form" :model="form" label-width="200px" label-position="right" :inline="true" :rules="rules">
  115 + <el-row>
  116 + <el-col :span="11">
  117 + <el-form-item label="" prop="state">
  118 + <div class="ipt" style="padding-right: 110px">
  119 + &emsp;&emsp;启/禁用&emsp;&emsp;
  120 + </div>
104 <el-select v-model="form.state" placeholder="请选择" style="width: 200px" :clearable="true"> 121 <el-select v-model="form.state" placeholder="请选择" style="width: 200px" :clearable="true">
105 <el-option label="启用" value="1"></el-option> 122 <el-option label="启用" value="1"></el-option>
106 <el-option label="禁用" value="0"></el-option> 123 <el-option label="禁用" value="0"></el-option>
107 </el-select> 124 </el-select>
108 -<!-- <el-input v-model="form.state" :clearable="true"></el-input>--> 125 + <!-- <el-input v-model="form.state" :clearable="true"></el-input>-->
109 </el-form-item> 126 </el-form-item>
110 - <el-form-item label="承运人">  
111 - <el-input v-model="form.carrier" :clearable="true"></el-input> 127 + </el-col>
  128 + <el-col :span="11">
  129 + <el-form-item label="" prop="carrier">
  130 + <el-input v-model="form.carrier" :clearable="true">
  131 + <template slot="prepend">&emsp;&emsp;承运人&emsp;&emsp;</template>
  132 + </el-input>
112 </el-form-item> 133 </el-form-item>
113 - <el-form-item label="航班号">  
114 - <el-input v-model="form.flightno" :clearable="true"></el-input> 134 + </el-col>
  135 + </el-row>
  136 + <el-row>
  137 + <el-col :span="11">
  138 + <el-form-item label="" prop="flightno">
  139 + <el-input v-model="form.flightno" :clearable="true">
  140 + <template slot="prepend">&emsp;&emsp;航班号&emsp;&emsp;</template>
  141 + </el-input>
115 </el-form-item> 142 </el-form-item>
116 - <el-form-item label="起始站">  
117 - <el-input v-model="form.originatingstation" :clearable="true"></el-input> 143 + </el-col>
  144 + <el-col :span="11">
  145 + <el-form-item label="" prop="originatingstation">
  146 + <el-input v-model="form.originatingstation" :clearable="true">
  147 + <template slot="prepend">&emsp;&emsp;起始站&emsp;&emsp;</template>
  148 + </el-input>
118 </el-form-item> 149 </el-form-item>
119 - <el-form-item label="目的站">  
120 - <el-input v-model="form.destinationstation" :clearable="true"></el-input> 150 + </el-col>
  151 + </el-row>
  152 + <el-row>
  153 + <el-col :span="11">
  154 + <el-form-item label="" prop="destinationstation">
  155 + <el-input v-model="form.destinationstation" :clearable="true">
  156 + <template slot="prepend">&emsp;&emsp;目的站&emsp;&emsp;</template>
  157 + </el-input>
121 </el-form-item> 158 </el-form-item>
122 - <el-form-item label="跨天天数">  
123 - <el-input v-model="form.crossdays" :clearable="true"></el-input> 159 + </el-col>
  160 + <el-col :span="11">
  161 + <el-form-item label="" prop="crossdays">
  162 + <el-input v-model="form.crossdays" :clearable="true">
  163 + <template slot="prepend">&emsp;跨天天数&emsp;&emsp;</template>
  164 + </el-input>
124 </el-form-item> 165 </el-form-item>
125 - <el-form-item label="航班计划开始时间">  
126 - <el-date-picker type="date" v-model="form.effectivedate" style="width: 200px" :clearable="true"></el-date-picker> 166 + </el-col>
  167 + </el-row>
  168 + <el-row>
  169 + <el-col :span="11">
  170 + <el-form-item label="" prop="effectivedate">
  171 + <div class="ipt" style="padding-right: 110px">
  172 + 航班计划开始时间
  173 + </div>
  174 + <el-date-picker type="date" v-model="form.effectivedate" value-format="yyyy-MM-dd" style="width: 200px" :clearable="true"></el-date-picker>
127 </el-form-item> 175 </el-form-item>
128 - <el-form-item label="航班计划结束时间">  
129 - <el-date-picker type="date" v-model="form.expirationdate" style="width: 200px" :clearable="true"></el-date-picker> 176 + </el-col>
  177 + <el-col :span="11">
  178 + <el-form-item label="" prop="expirationdate" >
  179 + <div class="ipt" style="padding-right: 110px">
  180 + 航班计划结束时间
  181 + </div>
  182 + <el-date-picker type="date" v-model="form.expirationdate" value-format="yyyy-MM-dd" style="width: 200px" :clearable="true"></el-date-picker>
  183 +<!-- <el-date-picker type="date" value-format="yyyyMMdd" v-model="form.expirationdate" style="width: 200px" :clearable="true"></el-date-picker>-->
130 </el-form-item> 184 </el-form-item>
131 - <el-form-item label="航班计划航班时刻"> 185 + </el-col>
  186 + </el-row>
  187 + <el-row>
  188 + <el-col :span="11">
  189 + <el-form-item label="" prop="schedule">
  190 + <div class="ipt" style="padding-right: 110px">
  191 + 航班计划航班时刻
  192 + </div>
132 <el-select v-model="form.schedule" placeholder="请选择" style="width: 200px" :clearable="true"> 193 <el-select v-model="form.schedule" placeholder="请选择" style="width: 200px" :clearable="true">
133 <el-option label="周一" value="1"></el-option> 194 <el-option label="周一" value="1"></el-option>
134 <el-option label="周二" value="2"></el-option> 195 <el-option label="周二" value="2"></el-option>
@@ -138,14 +199,20 @@ @@ -138,14 +199,20 @@
138 <el-option label="周六" value="6"></el-option> 199 <el-option label="周六" value="6"></el-option>
139 <el-option label="周日" value="7"></el-option> 200 <el-option label="周日" value="7"></el-option>
140 </el-select> 201 </el-select>
141 -<!-- <el-date-picker type="date" prefix-icon=0 v-model="form.schedule" style="width: 200px" :clearable="true"></el-date-picker>--> 202 + <!-- <el-date-picker type="date" prefix-icon=0 v-model="form.schedule" style="width: 200px" :clearable="true"></el-date-picker>-->
142 </el-form-item> 203 </el-form-item>
143 - <el-form-item label="备注">  
144 - <el-input v-model="form.remark" :clearable="true"></el-input> 204 + </el-col>
  205 + <el-col :span="11">
  206 + <el-form-item label="" prop="remark">
  207 + <el-input v-model="form.remark" :clearable="true">
  208 + <template slot="prepend">&emsp;&emsp;备&emsp;&emsp;注&emsp;&emsp;</template>
  209 + </el-input>
145 </el-form-item> 210 </el-form-item>
  211 + </el-col>
  212 + </el-row>
146 </el-form> 213 </el-form>
147 <div slot="footer" class="dialog-footer" align="center"> 214 <div slot="footer" class="dialog-footer" align="center">
148 - <el-button type="info" @click="dialogCross.addDialog = false">取消</el-button> 215 + <el-button type="info" @click="cancel">取消</el-button>
149 <el-button type="primary" @click="dialogStatus==='create'?add():edit()">提 交</el-button> 216 <el-button type="primary" @click="dialogStatus==='create'?add():edit()">提 交</el-button>
150 </div> 217 </div>
151 </el-dialog> 218 </el-dialog>
@@ -172,7 +239,7 @@ @@ -172,7 +239,7 @@
172 }, 239 },
173 total:0, 240 total:0,
174 tableData: [], 241 tableData: [],
175 - tableloading:true, 242 + tableloading:false,
176 dialogMap: { 243 dialogMap: {
177 update: '编辑', 244 update: '编辑',
178 create: '新增' 245 create: '新增'
@@ -225,16 +292,18 @@ @@ -225,16 +292,18 @@
225 this.getList() 292 this.getList()
226 }, 293 },
227 handleCurrentChange(val) { 294 handleCurrentChange(val) {
228 - this.queryinfo.pageNum = val 295 + this.queryinfo.currentPage = val
229 this.getList() 296 this.getList()
230 }, 297 },
231 - // 自动获取列表  
232 - activated(){ 298 + //取消
  299 + cancel(){
  300 + this.dialogCross.addDialog = false
233 this.getList(); 301 this.getList();
234 }, 302 },
235 //查询 303 //查询
236 getList() { 304 getList() {
237 const _this = this 305 const _this = this
  306 + this.tableloading = true;
238 selectLists(this.queryinfo).then((response) => { 307 selectLists(this.queryinfo).then((response) => {
239 const res = response.data 308 const res = response.data
240 if (res.code != '200') { 309 if (res.code != '200') {
@@ -244,6 +313,7 @@ @@ -244,6 +313,7 @@
244 _this.tableData = res.data.list 313 _this.tableData = res.data.list
245 // 获取列表的总记录数 314 // 获取列表的总记录数
246 _this.total = res.data.total 315 _this.total = res.data.total
  316 + this.tableloading = false;
247 _this.$message.success('获取消息收发记录，成功！') 317 _this.$message.success('获取消息收发记录，成功！')
248 }).catch(error => { 318 }).catch(error => {
249 // 关闭加载 319 // 关闭加载
@@ -266,10 +336,6 @@ @@ -266,10 +336,6 @@
266 schedule:'', 336 schedule:'',
267 remark:'' 337 remark:''
268 } 338 }
269 -  
270 - // this.$nextTick(() => {  
271 - // this.form = Object.assign({}, row)  
272 - // })  
273 }, 339 },
274 // 新增功能 340 // 新增功能
275 add() { 341 add() {
@@ -303,7 +369,7 @@ @@ -303,7 +369,7 @@
303 this.form=row; 369 this.form=row;
304 }, 370 },
305 // 编辑功能 371 // 编辑功能
306 - edit() { 372 + edit(row) {
307 // 进行表单的预验证 373 // 进行表单的预验证
308 this.$refs.form.validate(valid => { 374 this.$refs.form.validate(valid => {
309 // 未通过，表单预校验 375 // 未通过，表单预校验
@@ -334,13 +400,13 @@ @@ -334,13 +400,13 @@
334 } 400 }
335 ).then(() => { 401 ).then(() => {
336 console.log(row); 402 console.log(row);
337 - delCrossday(row.autoid).then((response) => { 403 + delCrossday(row).then((response) => {
338 // console.log(row) 404 // console.log(row)
339 const res = response.data 405 const res = response.data
340 this.$message.success(res.msg) 406 this.$message.success(res.msg)
341 this.getList() 407 this.getList()
342 }).catch(error => { 408 }).catch(error => {
343 - this.$message.error(res.msg) 409 + this.$message.error(error.msg)
344 }) 410 })
345 }).catch(() => { 411 }).catch(() => {
346 }) 412 })
@@ -351,7 +417,10 @@ @@ -351,7 +417,10 @@
351 // this.$refs.dangerousAddForm.resetFields() 417 // this.$refs.dangerousAddForm.resetFields()
352 // }, 418 // },
353 }, 419 },
354 - 420 +// 自动获取列表
  421 + activated(){
  422 + this.getList();
  423 + },
355 } 424 }
356 </script> 425 </script>
357 426
@@ -359,4 +428,20 @@ @@ -359,4 +428,20 @@
359 .el-input-group{ 428 .el-input-group{
360 display: table; 429 display: table;
361 } 430 }
  431 + .ipt{
  432 + max-width: 100px;
  433 + margin-right: -4px;
  434 + display: inline-block;
  435 + background-color: #6F8294;
  436 + color: #ffffff;
  437 + border: 1px solid #DCDFE6;
  438 + vertical-align: middle;
  439 + padding: 0 18px;
  440 + white-space: nowrap;
  441 + border-top-right-radius: 0px;
  442 + border-top-left-radius: 4px;
  443 + border-bottom-left-radius: 4px;
  444 + border-bottom-right-radius: 0px;
  445 + font-size: 10px;
  446 + }
362 </style> 447 </style>
1 { 1 {
2 - "nmmsVer": "1.09" 2 + "nmmsVer": "1.10"
3 } 3 }