Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
shanyunduo.cheng
b8b1c400 2 parents becb87f7 018cc389

Merge branch 'master' of http://118.178.128.178/Fedex/imac-vue

Inline Side-by-side
Showing 4 changed files with 248 additions and 219 deletions
1 +import request from '@/utils/request'
2 +
3 +// 航班信息维护查询条件
4 +export function findFltConditionDataApi() {
5 + return request({
6 + url: '/FlightPreserveController/findFltConditionData',
7 + method: 'post'
8 +
9 + })
10 +}
11 +// 航班信息维护查询
12 +export function findAllFltDataApi(data) {
13 + return request({
14 + url: '/FlightPreserveController/findAllFltData',
15 + method: 'post',
16 + data: data
17 +
18 + })
19 +}
...@@ -7,6 +7,7 @@ const baseURL = process.env.VUE_APP_BASE_API ...@@ -7,6 +7,7 @@ const baseURL = process.env.VUE_APP_BASE_API
7 7
8 // 日期格式化 8 // 日期格式化
9 export function parseTime(time, pattern) { 9 export function parseTime(time, pattern) {
10 + debugger
10 if (arguments.length === 0 || !time) { 11 if (arguments.length === 0 || !time) {
11 return null 12 return null
12 } 13 }
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
236 }, 236 },
237 /** 查询原航班顺位规则*/ 237 /** 查询原航班顺位规则*/
238 findSourceFlightRules() { 238 findSourceFlightRules() {
239 - //this.loading = true; 239 + this.loading = true;
240 if (this.queryParams.pageNum > 1) { 240 if (this.queryParams.pageNum > 1) {
241 this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit 241 this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit
242 } else { 242 } else {
......
...@@ -4,47 +4,47 @@ ...@@ -4,47 +4,47 @@
4 <el-row> 4 <el-row>
5 <el-col :span="8"> 5 <el-col :span="8">
6 6
7 - <el-form-item label="航班日期从" prop="flightDate"> 7 + <el-form-item label="航班日期从" prop="fltDateStart">
8 - <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.flightDate" type="date" placeholder="选择日期"> 8 + <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期">
9 </el-date-picker> 9 </el-date-picker>
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 12
13 <el-col :span="8"> 13 <el-col :span="8">
14 - <el-form-item label="到" prop="flightDate"> 14 + <el-form-item label="到" prop="fltDateEnd">
15 - <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.flightDate" type="date" placeholder="选择日期"> 15 + <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期">
16 </el-date-picker> 16 </el-date-picker>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 19
20 <el-col :span="8"> 20 <el-col :span="8">
21 - <el-form-item label="航班号" prop="sourceFlightNo"> 21 + <el-form-item label="航班号" prop="fltNo">
22 - <el-input v-model="queryParams.sourceFlightNo" placeholder="请输入航班号" clearable size="small" /> 22 + <el-input v-model="queryParams.fltNo" placeholder="请输入航班号" clearable size="small" />
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 25
26 </el-row> 26 </el-row>
27 <el-row> 27 <el-row>
28 <el-col :span="8"> 28 <el-col :span="8">
29 - <el-form-item label="航班类型" prop="status"> 29 + <el-form-item label="航班类型" prop="typeId">
30 - <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small"> 30 + <el-select v-model="queryParams.typeId" placeholder="请选择航班类型" clearable size="small">
31 - <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" /> 31 + <el-option v-for="dict in flightTypelist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
32 </el-select> 32 </el-select>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 35
36 <el-col :span="8"> 36 <el-col :span="8">
37 - <el-form-item label="航班状态" prop="status"> 37 + <el-form-item label="航班状态" prop="statusId">
38 - <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small"> 38 + <el-select v-model="queryParams.statusId" placeholder="请选择航班状态" clearable size="small">
39 - <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" /> 39 + <el-option v-for="dict in flightStatuslist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
40 </el-select> 40 </el-select>
41 </el-form-item> 41 </el-form-item>
42 </el-col> 42 </el-col>
43 43
44 <el-col :span="8"> 44 <el-col :span="8">
45 - <el-form-item label="航班种类" prop="status"> 45 + <el-form-item label="航班种类" prop="flightKindId">
46 - <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small"> 46 + <el-select v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable size="small">
47 - <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" /> 47 + <el-option v-for="dict in flightKindlist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
48 </el-select> 48 </el-select>
49 </el-form-item> 49 </el-form-item>
50 </el-col> 50 </el-col>
...@@ -66,37 +66,45 @@ ...@@ -66,37 +66,45 @@
66 </el-button> 66 </el-button>
67 </el-col> 67 </el-col>
68 <el-col :span="1.5"> 68 <el-col :span="1.5">
69 - <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除 69 + <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple">删除
70 </el-button> 70 </el-button>
71 </el-col> 71 </el-col>
72 </el-row> 72 </el-row>
73 - <el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="sourceFlightRulesList" 73 + <el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="findAllFltDatList"
74 @selection-change="handleSelectionChange"> 74 @selection-change="handleSelectionChange">
75 <el-table-column type="selection" width="55" align="center" /> 75 <el-table-column type="selection" width="55" align="center" />
76 - <el-table-column label="航班日期" align="center" prop="sourceFlightNo" /> 76 + <el-table-column label="航班日期" align="center" prop="fltDate" width="120" />
77 - <el-table-column label="航班起飞时间" align="center" prop="flightRank" width="280" /> 77 + <el-table-column label="航班起飞时间" align="center" prop="takeOffTime" width="120" />
78 - <el-table-column label="航班号" align="center" prop="dayOfWeek" width="180" /> 78 + <el-table-column label="航班号" align="center" prop="fltNo" />
79 - <el-table-column label="航班路线" align="center" prop="status" :formatter="statusFormat" /> 79 + <el-table-column label="航班路线" align="center" prop="route" />
80 - <el-table-column label="航班类型" align="center" prop="startDate" width="100" /> 80 + <el-table-column label="航班类型" align="center" prop="typeName" width="100" />
81 - <el-table-column label="航班种类" align="center" prop="endDate" width="100" /> 81 + <el-table-column label="航班种类" align="center" prop="flightKindName" width="130" />
82 - <el-table-column label="航班状态" align="center" prop="updateUserName" /> 82 + <el-table-column label="航班状态" align="center" prop="statusName" />
83 - <el-table-column label="总重量(KG)" align="center" prop="updateTime" width="130" /> 83 + <el-table-column label="总重量(KG)" align="center" prop="totalWeight" width="130" />
84 - <el-table-column label="原始重量(KG)" align="center" prop="updateTime" width="130" /> 84 + <el-table-column label="原始重量(KG)" align="center" prop="originalWeight" width="130" />
85 - <el-table-column label="总体积(cm³)" align="center" prop="updateTime" width="130" /> 85 + <el-table-column label="总体积(cm³)" align="center" prop="totalVolume" width="130" />
86 - <el-table-column label="是否限制一票一件" align="center" prop="updateTime" width="150" /> 86 + <el-table-column label="是否限制一票一件" align="center" prop="ticketToPiece" width="150" :formatter="ticketToPieceFormat" />
87 - <el-table-column label="是否需要预审" align="center" prop="updateTime" width="150" /> 87 + <el-table-column label="是否需要预审" align="center" prop="needRequired" width="150" :formatter="needRequiredFormat" />
88 - <el-table-column label="额外增重百分比" align="center" prop="updateTime" width="150" /> 88 + <el-table-column label="额外增重百分比" align="center" prop="extraWeightPercent" width="150" />
89 - <el-table-column label="高价百分比" align="center" prop="updateTime" width="150" /> 89 + <el-table-column label="高价百分比" align="center" prop="highPriceWeightPercent" width="150" />
90 - <el-table-column label="低价百分比" align="center" prop="updateTime" width="150" /> 90 + <el-table-column label="低价百分比" align="center" prop="lowPriceWeightPercent" width="150" />
91 - <el-table-column label="是否开启高地价" align="center" prop="updateTime" width="150" /> 91 + <el-table-column label="是否开启高地价" align="center" prop="highLowPriceFlg" width="150":formatter="highLowPriceFlgFormat"/>
92 - <el-table-column label="已配重量(KG)" align="center" prop="updateTime" width="150" /> 92 + <el-table-column label="已配重量(KG)" align="center" prop="alloctedWeight" width="150" />
93 - <el-table-column label="已配体积(cm³)" align="center" prop="updateTime" width="150" /> 93 + <el-table-column label="已配体积(cm³)" align="center" prop="alloctedVolume" width="150" />
94 - <el-table-column label="航班优先级" align="center" prop="updateTime" width="150" /> 94 + <el-table-column label="航班优先级" align="center" prop="priorityName" width="150" />
95 - <el-table-column label="配舱优先级" align="center" prop="updateTime" width="150" /> 95 + <el-table-column label="配舱优先级" align="center" prop="priorityRuleName" width="150" />
96 - <el-table-column label="创建人" align="center" prop="updateTime" width="100" /> 96 + <el-table-column label="创建人" align="center" prop="createUserName" width="120" />
97 - <el-table-column label="创建时间" align="center" prop="updateTime" width="100" /> 97 + <el-table-column label="创建时间" align="center" prop="createTime" width="155">
98 - <el-table-column label="最后修改人" align="center" prop="updateTime" width="100" /> 98 + <template slot-scope="scope">
99 - <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100" /> 99 + <span>{{ renderTime(scope.row.createTime) }}</span>
100 + </template>
101 + </el-table-column>
102 + <el-table-column label="最后修改人" align="center" prop="lastModifyUserName" width="120" />
103 + <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="155">
104 + <template slot-scope="scope">
105 + <span>{{ renderTime(scope.row.lastModifyTime) }}</span>
106 + </template>
107 + </el-table-column>
100 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130" fixed="right"> 108 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130" fixed="right">
101 <template slot-scope="scope"> 109 <template slot-scope="scope">
102 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button> 110 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
...@@ -107,27 +115,9 @@ ...@@ -107,27 +115,9 @@
107 </el-table> 115 </el-table>
108 116
109 <pagination v-show="total>0" :total="total" layout=" prev, pager, next, jumper, sizes,total" 117 <pagination v-show="total>0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
110 - :page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" /> 118 + :page.sync="queryParams.pageNum" :limit.sync="queryParams.limitSize" @pagination="findAllFltData" />
111 - 119 +
112 - 120 +
113 - <!-- 查看目的航班对话框 -->
114 - <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%">
115 - <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
116 -
117 - <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
118 - <el-table-column label="实际配载航班" align="center" prop="actualFlight" width="280" />
119 - <el-table-column label="航班日期" align="center" prop="flightDate" />
120 - <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
121 - <template slot-scope="scope">
122 - <el-button size="mini" type="text" icon="el-icon-edit"
123 - @click="handleClick(scope.row.sourceFlightNo, 'detail')">查看配置维度</el-button>
124 - </template>
125 - </el-table-column>
126 - </el-table>
127 - <div slot="footer" class="dialog-footer">
128 - <el-button @click="cancelFlightDate">返 回</el-button>
129 - </div>
130 - </el-dialog>
131 121
132 122
133 <!-- 添加或修改对话框 --> 123 <!-- 添加或修改对话框 -->
...@@ -136,16 +126,16 @@ ...@@ -136,16 +126,16 @@
136 <el-row> 126 <el-row>
137 <el-col :span="12"> 127 <el-col :span="12">
138 <el-form-item label="航班号" prop="sourceFlightNo"> 128 <el-form-item label="航班号" prop="sourceFlightNo">
139 - <el-input style="width:93%;" v-model="form.sourceFlightNo" placeholder="请输入航班号" /> 129 + <el-input style="width:93%;" v-model="form.sourceFlightNo" placeholder="请输入航班号" />
140 </el-form-item> 130 </el-form-item>
141 </el-col> 131 </el-col>
142 - <!-- <el-col :span="1"> &#12288;</el-col> --> 132 + <!-- <el-col :span="1"> &#12288;</el-col> -->
143 <el-col :span="12"> 133 <el-col :span="12">
144 <el-form-item label="航班日期" prop="sourceFlightNo"> 134 <el-form-item label="航班日期" prop="sourceFlightNo">
145 135
146 - <el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate" 136 + <el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate"
147 - type="date" value-format="yyyy-MM-dd" placeholder="选择开始时间"> 137 + type="date" value-format="yyyy-MM-dd" placeholder="选择开始时间">
148 - </el-date-picker> 138 + </el-date-picker>
149 </el-form-item> 139 </el-form-item>
150 </el-col> 140 </el-col>
151 </el-row> 141 </el-row>
...@@ -158,10 +148,8 @@ ...@@ -158,10 +148,8 @@
158 148
159 <el-col :span="12"> 149 <el-col :span="12">
160 <el-form-item label="航班起飞时间" prop="sourceFlightNo"> 150 <el-form-item label="航班起飞时间" prop="sourceFlightNo">
161 - <el-time-picker 151 + <el-time-picker v-model="form.startDate" placeholder="航班起飞时间">
162 - v-model="form.startDate" 152 + </el-time-picker>
163 - placeholder="航班起飞时间">
164 - </el-time-picker>
165 </el-form-item> 153 </el-form-item>
166 </el-col> 154 </el-col>
167 </el-row> 155 </el-row>
...@@ -170,107 +158,102 @@ ...@@ -170,107 +158,102 @@
170 <el-col :span="12"> 158 <el-col :span="12">
171 <el-form-item label="航班种类" prop="startDate"> 159 <el-form-item label="航班种类" prop="startDate">
172 <el-select v-model="form.value" placeholder="请选择航班种类"> 160 <el-select v-model="form.value" placeholder="请选择航班种类">
173 - <el-option 161 + <el-option v-for="item in flightKindlist" :key="item.id" :label="item.label" :value="item.id">
174 - v-for="item in options" 162 + </el-option>
175 - :key="item.value" 163 + </el-select>
176 - :label="item.label"
177 - :value="item.value">
178 - </el-option>
179 - </el-select>
180 </el-form-item> 164 </el-form-item>
181 </el-col> 165 </el-col>
182 <el-col :span="12"> 166 <el-col :span="12">
183 <el-form-item label="航班类型" prop="startDate"> 167 <el-form-item label="航班类型" prop="startDate">
184 - <el-select v-model="form.value1" placeholder="请选择航班类型"> 168 + <!-- <el-select v-model="form.value1" placeholder="请选择航班类型">
185 - <el-option 169 + <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
186 - v-for="item in options" 170 + </el-option>
187 - :key="item.value" 171 + </el-select> -->
188 - :label="item.label"
189 - :value="item.value">
190 - </el-option>
191 - </el-select>
192 </el-form-item> 172 </el-form-item>
193 </el-col> 173 </el-col>
194 174
195 175
196 <el-col :span="12"> 176 <el-col :span="12">
197 <el-form-item label="航班状态" prop="startDate"> 177 <el-form-item label="航班状态" prop="startDate">
198 - <el-select v-model="form.value2" placeholder="请选择航班状态"> 178 + <!-- <el-select v-model="form.value2" placeholder="请选择航班状态">
199 - <el-option 179 + <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
200 - v-for="item in options" 180 + </el-option>
201 - :key="item.value" 181 + </el-select> -->
202 - :label="item.label"
203 - :value="item.value">
204 - </el-option>
205 - </el-select>
206 </el-form-item> 182 </el-form-item>
207 </el-col> 183 </el-col>
208 <el-col :span="12"> 184 <el-col :span="12">
209 - <el-form-item label="原始重量(KG)" prop="startDate" > 185 + <el-form-item label="原始重量(KG)" prop="startDate">
210 - <el-input placeholder="请输入原始重量(KG)" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input> 186 + <el-input placeholder="请输入原始重量(KG)" style="width:93%" min="0"
187 + oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
188 + v-model="form.input"></el-input>
189 + </el-form-item>
190 + </el-col>
191 +
192 + <el-col :span="12">
193 + <el-form-item label="额外增重百分比" prop="startDate">
194 + <el-input placeholder="请输入额外增重百分比" style="width:93%" min="0"
195 + oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
196 + v-model="form.input"></el-input>
197 + </el-form-item>
198 + </el-col>
199 +
200 + <el-col :span="12">
201 + <el-form-item label="是否限制一票一件" prop="startDate">
202 + <el-switch v-model="form.value4" active-color="#13ce66">
203 + </el-switch>
211 </el-form-item> 204 </el-form-item>
212 </el-col> 205 </el-col>
213 206
214 <el-col :span="12"> 207 <el-col :span="12">
215 - <el-form-item label="额外增重百分比" prop="startDate" > 208 + <el-form-item label="高价百分比" prop="startDate">
216 - <el-input placeholder="请输入额外增重百分比" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input> 209 + <el-input placeholder="请输入高价百分比" style="width:93%" min="0"
210 + oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
211 + v-model="form.input"></el-input>
217 </el-form-item> 212 </el-form-item>
218 </el-col> 213 </el-col>
219 214
220 - <el-col :span="12"> 215 + <el-col :span="12">
221 - <el-form-item label="是否限制一票一件" prop="startDate" > 216 + <el-form-item label="低价百分比" prop="startDate">
222 - <el-switch 217 + <el-input placeholder="请输入低价百分比" style="width:93%" min="0"
223 - v-model="form.value4" 218 + oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
224 - active-color="#13ce66" 219 + v-model="form.input"></el-input>
225 - > 220 + </el-form-item>
226 - </el-switch> 221 + </el-col>
227 - </el-form-item> 222 +
228 - </el-col> 223 + <el-col :span="12">
229 - 224 + <el-form-item label="已配重量（KG）" prop="startDate">
230 - <el-col :span="12"> 225 + <el-input placeholder="请输入已配重量（KG）" style="width:93%" min="0"
231 - <el-form-item label="高价百分比" prop="startDate" > 226 + oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
232 - <el-input placeholder="请输入高价百分比" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input> 227 + v-model="form.input"></el-input>
233 - </el-form-item> 228 + </el-form-item>
234 - </el-col> 229 + </el-col>
235 - 230 +
236 - <el-col :span="12"> 231 + <el-col :span="12">
237 - <el-form-item label="低价百分比" prop="startDate" > 232 + <el-form-item label="航班优先级" prop="startDate">
238 - <el-input placeholder="请输入低价百分比" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input> 233 + <!-- <el-select v-model="form.value5" placeholder="请选择航班优先级">
239 - </el-form-item> 234 + <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
240 - </el-col> 235 + </el-option>
241 - 236 + </el-select> -->
242 - <el-col :span="12"> 237 + </el-form-item>
243 - <el-form-item label="已配重量（KG）" prop="startDate" > 238 + </el-col>
244 - <el-input placeholder="请输入已配重量（KG）" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input> 239 +
245 - </el-form-item> 240 +
246 - </el-col> 241 + <el-col :span="12">
247 - 242 + <el-form-item label="总体积 （cm³）" prop="startDate">
248 - <el-col :span="12"> 243 + <el-input placeholder="请输入总体积 （cm³）" style="width:93%" min="0"
249 - <el-form-item label="航班优先级" prop="startDate" > 244 + oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
250 - <el-select v-model="form.value5" placeholder="请选择航班优先级"> 245 + v-model="form.input"></el-input>
251 - <el-option 246 + </el-form-item>
252 - v-for="item in options" 247 + </el-col>
253 - :key="item.value" 248 +
254 - :label="item.label" 249 + <el-col :span="12">
255 - :value="item.value"> 250 + <el-form-item label="已配体积（cm³）" prop="startDate">
256 - </el-option> 251 + <el-input placeholder="请输入已配体积（cm³）" style="width:93%" min="0"
257 - </el-select> 252 + oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
258 - </el-form-item> 253 + v-model="form.input"></el-input>
259 - </el-col> 254 +
260 - 255 + </el-form-item>
261 - 256 + </el-col>
262 - <el-col :span="12">
263 - <el-form-item label="总体积 （cm³）" prop="startDate" >
264 - <el-input placeholder="请输入总体积 （cm³）" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input>
265 - </el-form-item>
266 - </el-col>
267 -
268 - <el-col :span="12">
269 - <el-form-item label="已配体积（cm³）" prop="startDate" >
270 - <el-input placeholder="请输入已配体积（cm³）" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input>
271 -
272 - </el-form-item>
273 - </el-col>
274 </el-row> 257 </el-row>
275 258
276 259
...@@ -284,31 +267,20 @@ ...@@ -284,31 +267,20 @@
284 </template> 267 </template>
285 <script> 268 <script>
286 import { 269 import {
287 - findSourceFlightRulesApi, 270 + findFltConditionDataApi,
288 - sourceFlightRulesSaveApi, 271 + findAllFltDataApi
289 - delOrEnableORDisableApi, 272 +
290 - findSourceFlightAndFlightDateApi 273 + } from "@/api/findAllFltData";
291 - } from "@/api/sourceFlightRules";
292 export default { 274 export default {
293 - name: "SourceFlightRules", 275 + name: "findAllFltData",
294 data() { 276 data() {
295 return { 277 return {
296 - options: [{ 278 + //航班种类
297 - value: '选项1', 279 + flightKindlist: [],
298 - label: '黄金糕' 280 + //航班状态
299 - }, { 281 + flightStatuslist: [],
300 - value: '选项2', 282 + //航班类型
301 - label: '双皮奶' 283 + flightTypelist: [],
302 - }, {
303 - value: '选项3',
304 - label: '蚵仔煎'
305 - }, {
306 - value: '选项4',
307 - label: '龙须面'
308 - }, {
309 - value: '选项5',
310 - label: '北京烤鸭'
311 - }],
312 // 选中数组 284 // 选中数组
313 ids: [], 285 ids: [],
314 // 非单个禁用 286 // 非单个禁用
...@@ -337,9 +309,6 @@ ...@@ -337,9 +309,6 @@
337 } 309 }
338 } 310 }
339 }, 311 },
340 -
341 - //周期段
342 - dayOfWeekList: ['D1', 'D2', 'D3', 'D4', 'D5', 'D6', 'D7'],
343 // 遮罩层 312 // 遮罩层
344 loading: false, 313 loading: false,
345 // 遮罩层 314 // 遮罩层
...@@ -349,7 +318,7 @@ ...@@ -349,7 +318,7 @@
349 // 总条数 318 // 总条数
350 total: 0, 319 total: 0,
351 // 原航班规则数据 320 // 原航班规则数据
352 - sourceFlightRulesList: [], 321 + findAllFltDatList: [],
353 //目的航班数据 322 //目的航班数据
354 sourceFlightAndFlightDate: [], 323 sourceFlightAndFlightDate: [],
355 statusList: [{ 324 statusList: [{
...@@ -365,19 +334,22 @@ ...@@ -365,19 +334,22 @@
365 openFlightDate: false, 334 openFlightDate: false,
366 // 查询参数 335 // 查询参数
367 queryParams: { 336 queryParams: {
368 - start: 0, //当前条数【代表第几条数据 +1开始】 337 + limitStart: 0, //当前条数【代表第几条数据 +1开始】
369 pageNum: 1, 338 pageNum: 1,
370 - limit: 20, //一页显示多少条数据 339 + limitSize: 20, //一页显示多少条数据
371 - sourceFlightNo: undefined, //原航班号 340 + fltDateStart: undefined, //航班日期开始
372 - status: undefined, //状态 341 + fltDateEnd: undefined, //航班日期结束
373 - flightDate: undefined //日期 342 + typeId: undefined, //航班类型
343 + statusId: undefined, //航班状态
344 + flightKindId: undefined, //航班种类
345 + fltNo: undefined //航班号，要大写
374 }, 346 },
375 - dayOfWeek: [], 347 +
376 // 表单参数 348 // 表单参数
377 form: { 349 form: {
378 - dayOfWeek: [] 350 +
379 }, 351 },
380 - currentRow: null, 352 +
381 // 表单校验 353 // 表单校验
382 rules: { 354 rules: {
383 sourceFlightNo: [{ 355 sourceFlightNo: [{
...@@ -394,9 +366,60 @@ ...@@ -394,9 +366,60 @@
394 }; 366 };
395 }, 367 },
396 created() { 368 created() {
397 - this.findSourceFlightRules(); 369 + //查询条件数据源
370 + this.findFltConditionData();
371 + this.findAllFltData();
398 }, 372 },
399 methods: { 373 methods: {
374 + // 是否一票一件
375 + ticketToPieceFormat(row) {
376 + if (row.ticketToPiece === 1) {
377 + return '是'
378 + } else {
379 + return '否'
380 + }
381 + return row.ticketToPiece;
382 + },
383 + // 是否需要预审 1 预审 0 取消预审
384 + needRequiredFormat(row) {
385 + if (row.needRequired === 1) {
386 + return '预审'
387 + } else {
388 + return '取消预审'
389 + }
390 + return row.ticketToPiece;
391 + },
392 + //是否开启高低价
393 + highLowPriceFlgFormat(row) {
394 + if (row.highLowPriceFlg === 1) {
395 + return '开启'
396 + } else {
397 + return '未开启'
398 + }
399 + return row.ticketToPiece;
400 + },
401 + //时间格式化
402 + renderTime(date) {
403 + var dateee = new Date(date).toJSON();
404 + return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
405 + },
406 + //查询条件数据源
407 + findFltConditionData() {
408 + findFltConditionDataApi().then(response => {
409 + if (response.code == 200) {
410 + //航班种类
411 + this.flightKindlist = response.data.flightKind;
412 + //航班类型
413 + this.flightTypelist = response.data.flightType;
414 + //航班状态
415 + this.flightStatuslist = response.data.flightStatus;
416 +
417 + } else {
418 + this.msgError(response.msg);
419 + }
420 +
421 + });
422 + },
400 423
401 // 多选框选中数据 424 // 多选框选中数据
402 handleSelectionChange(selection) { 425 handleSelectionChange(selection) {
...@@ -404,27 +427,23 @@ ...@@ -404,27 +427,23 @@
404 this.single = selection.length != 1 427 this.single = selection.length != 1
405 this.multiple = !selection.length 428 this.multiple = !selection.length
406 }, 429 },
407 - //跳转到查看，修改页面 430 +
408 - handleClick(flightiId, handle) { 431 + /** 航班信息维护查询*/
409 - this.$router.push({ 432 + findAllFltData() {
410 - name: "Info", 433 + this.loading = true;
411 - params: {
412 - handle: handle,
413 - id: flightiId
414 - },
415 - });
416 - },
417 - /** 查询原航班顺位规则*/
418 - findSourceFlightRules() {
419 - //this.loading = true;
420 if (this.queryParams.pageNum > 1) { 434 if (this.queryParams.pageNum > 1) {
421 - this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit 435 + this.queryParams.limitStart = (this.queryParams.pageNum - 1) * this.queryParams.limitSize
422 } else { 436 } else {
423 - this.queryParams.start = 0; 437 + this.queryParams.limitStart = 0;
424 } 438 }
425 - findSourceFlightRulesApi(this.queryParams).then(response => { 439 + if (this.queryParams.fltNo != null && this.queryParams.fltNo != undefined && this.queryParams.fltNo != '') {
440 + this.queryParams.fltNo = this.queryParams.fltNo.toUpperCase();
441 + }
442 +
443 + findAllFltDataApi(this.queryParams).then(response => {
426 if (response.code == 200) { 444 if (response.code == 200) {
427 - this.sourceFlightRulesList = response.data.list; 445 +
446 + this.findAllFltDatList = response.data.list;
428 this.total = response.data.totalCount; 447 this.total = response.data.totalCount;
429 this.loading = false; 448 this.loading = false;
430 } else { 449 } else {
...@@ -481,7 +500,7 @@ ...@@ -481,7 +500,7 @@
481 return delOrEnableORDisableApi(disable); 500 return delOrEnableORDisableApi(disable);
482 }).then(response => { 501 }).then(response => {
483 if (response.code == 200) { 502 if (response.code == 200) {
484 - this.findSourceFlightRules(); 503 + this.findAllFltData();
485 this.msgSuccess(statusText + "成功"); 504 this.msgSuccess(statusText + "成功");
486 } else { 505 } else {
487 this.msgError(response.msg); 506 this.msgError(response.msg);
...@@ -499,7 +518,7 @@ ...@@ -499,7 +518,7 @@
499 if (response.code === 200) { 518 if (response.code === 200) {
500 this.msgSuccess("保存成功"); 519 this.msgSuccess("保存成功");
501 this.open = false; 520 this.open = false;
502 - this.findSourceFlightRules(); 521 + this.findAllFltData();
503 } else { 522 } else {
504 this.msgError(response.msg); 523 this.msgError(response.msg);
505 } 524 }
...@@ -554,17 +573,7 @@ ...@@ -554,17 +573,7 @@
554 this.open = false; 573 this.open = false;
555 // this.reset(); 574 // this.reset();
556 }, 575 },
557 - // 状态字典翻译 576 +
558 - statusFormat(row) {
559 - if (row.status === '1') {
560 - return '有效'
561 - } else if (row.status === '2') {
562 - return '配置中'
563 - } else if (row.status === '3') {
564 - return '停用'
565 - }
566 - return row.status;
567 - },
568 /** 重置按钮操作 */ 577 /** 重置按钮操作 */
569 resetQuery() { 578 resetQuery() {
570 this.resetForm("queryForm"); 579 this.resetForm("queryForm");
...@@ -574,7 +583,7 @@ ...@@ -574,7 +583,7 @@
574 handleQuery() { 583 handleQuery() {
575 this.queryParams.pageNum = 1; 584 this.queryParams.pageNum = 1;
576 this.queryParams.start = 0; 585 this.queryParams.start = 0;
577 - this.findSourceFlightRules(); 586 + this.findAllFltData();
578 } 587 }
579 588
580 } 589 }
......