Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
shanyunduo.cheng
656c5564 2 parents df6f2618 62efedf3

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

Inline Side-by-side
Showing 2 changed files with 144 additions and 31 deletions
...@@ -187,9 +187,6 @@ ...@@ -187,9 +187,6 @@
187 'id': 1, 187 'id': 1,
188 'name': '有效' 188 'name': '有效'
189 },{ 189 },{
190 - 'id': 2,
191 - 'name': '执行中'
192 - },{
193 'id': 3, 190 'id': 3,
194 'name': '停用' 191 'name': '停用'
195 }], 192 }],
......
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
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="flightDate">
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.flightDate" 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="sourceFlightNo">
22 <el-input v-model="queryParams.sourceFlightNo" placeholder="请输入航班号" clearable size="small" /> 22 <el-input v-model="queryParams.sourceFlightNo" placeholder="请输入航班号" clearable size="small" />
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
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="status">
38 <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small"> 38 <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
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="status">
46 <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small"> 46 <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
...@@ -132,48 +132,148 @@ ...@@ -132,48 +132,148 @@
132 132
133 <!-- 添加或修改对话框 --> 133 <!-- 添加或修改对话框 -->
134 <el-dialog :title="title" :visible.sync="open" width="60%"> 134 <el-dialog :title="title" :visible.sync="open" width="60%">
135 - <el-form ref="form" :model="form" :rules="rules" label-width="100px"> 135 + <el-form ref="form" :model="form" :rules="rules" label-width="125px">
136 <el-row> 136 <el-row>
137 - <el-col :span="10"> 137 + <el-col :span="12">
138 - <el-form-item label="原航班" prop="sourceFlightNo"> 138 + <el-form-item label="航班号" prop="sourceFlightNo">
139 - <el-input v-model="form.sourceFlightNo" placeholder="请输入原航班号" /> 139 + <el-input style="width:93%;" v-model="form.sourceFlightNo" placeholder="请输入航班号" />
140 + </el-form-item>
141 + </el-col>
142 + <!-- <el-col :span="1"> &#12288;</el-col> -->
143 + <el-col :span="12">
144 + <el-form-item label="航班日期" prop="sourceFlightNo">
145 +
146 + <el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate"
147 + type="date" value-format="yyyy-MM-dd" placeholder="选择开始时间">
148 + </el-date-picker>
140 </el-form-item> 149 </el-form-item>
141 </el-col> 150 </el-col>
142 </el-row> 151 </el-row>
143 <el-row> 152 <el-row>
144 <el-col :span="12"> 153 <el-col :span="12">
145 - <el-form-item label="有效开始时间" prop="startDate"> 154 + <el-form-item label="航班路线" prop="sourceFlightNo">
146 - <el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate" 155 + <el-input style="width:93%" v-model="form.sourceFlightNo" placeholder="请输入航班路线" />
147 - type="date" value-format="yyyy-MM-dd" placeholder="选择开始时间">
148 - </el-date-picker>
149 </el-form-item> 156 </el-form-item>
150 </el-col> 157 </el-col>
158 +
151 <el-col :span="12"> 159 <el-col :span="12">
152 - <el-form-item label="有效结束时间" prop="endDate"> 160 + <el-form-item label="航班起飞时间" prop="sourceFlightNo">
153 - <el-date-picker clearable size="small" :picker-options="pickerOptionsEnd" v-model="form.endDate" 161 + <el-time-picker
154 - type="date" value-format="yyyy-MM-dd" placeholder="选择结束时间"> 162 + v-model="form.startDate"
155 - </el-date-picker> 163 + placeholder="航班起飞时间">
164 + </el-time-picker>
156 </el-form-item> 165 </el-form-item>
157 </el-col> 166 </el-col>
167 + </el-row>
158 168
159 - <el-col :span="24" style="margin-bottom: 5%;"> 169 + <el-row>
160 - <span style="color: red;margin-left: 10%;">提示:配载航班之同请用分号分隔【符号不区分中英文】,例:CA1053:C7433</span><br /> 170 + <el-col :span="12">
161 - <span style="color: red;margin-left: 10%;">提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1:CZ433-1</span> 171 + <el-form-item label="航班种类" prop="startDate">
172 + <el-select v-model="form.value" placeholder="请选择航班种类">
173 + <el-option
174 + v-for="item in options"
175 + :key="item.value"
176 + :label="item.label"
177 + :value="item.value">
178 + </el-option>
179 + </el-select>
180 + </el-form-item>
162 </el-col> 181 </el-col>
163 - <el-col :span="24"> 182 + <el-col :span="12">
164 - <el-form-item label="配载航班" prop="flightRank"> 183 + <el-form-item label="航班类型" prop="startDate">
165 - <el-input type="textarea" v-model="form.flightRank" :rows="4"></el-input> 184 + <el-select v-model="form.value1" placeholder="请选择航班类型">
185 + <el-option
186 + v-for="item in options"
187 + :key="item.value"
188 + :label="item.label"
189 + :value="item.value">
190 + </el-option>
191 + </el-select>
166 </el-form-item> 192 </el-form-item>
167 </el-col> 193 </el-col>
168 - <el-col :span="24"> 194 +
169 - <el-form-item label="周期段"> 195 +
170 - <el-checkbox-group v-model="dayOfWeek"> 196 + <el-col :span="12">
171 - <el-checkbox v-for="item in dayOfWeekList" :key="item" :label="item" :name="item"></el-checkbox> 197 + <el-form-item label="航班状态" prop="startDate">
172 - </el-checkbox-group> 198 + <el-select v-model="form.value2" placeholder="请选择航班状态">
199 + <el-option
200 + v-for="item in options"
201 + :key="item.value"
202 + :label="item.label"
203 + :value="item.value">
204 + </el-option>
205 + </el-select>
173 </el-form-item> 206 </el-form-item>
174 </el-col> 207 </el-col>
208 + <el-col :span="12">
209 + <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>
211 + </el-form-item>
212 + </el-col>
213 +
214 + <el-col :span="12">
215 + <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>
217 + </el-form-item>
218 + </el-col>
219 +
220 + <el-col :span="12">
221 + <el-form-item label="是否限制一票一件" prop="startDate" >
222 + <el-switch
223 + v-model="form.value4"
224 + active-color="#13ce66"
225 + >
226 + </el-switch>
227 + </el-form-item>
228 + </el-col>
229 +
230 + <el-col :span="12">
231 + <el-form-item label="高价百分比" prop="startDate" >
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>
233 + </el-form-item>
234 + </el-col>
175 235
236 + <el-col :span="12">
237 + <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>
239 + </el-form-item>
240 + </el-col>
241 +
242 + <el-col :span="12">
243 + <el-form-item label="已配重量（KG）" prop="startDate" >
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>
245 + </el-form-item>
246 + </el-col>
247 +
248 + <el-col :span="12">
249 + <el-form-item label="航班优先级" prop="startDate" >
250 + <el-select v-model="form.value5" placeholder="请选择航班优先级">
251 + <el-option
252 + v-for="item in options"
253 + :key="item.value"
254 + :label="item.label"
255 + :value="item.value">
256 + </el-option>
257 + </el-select>
258 + </el-form-item>
259 + </el-col>
260 +
261 +
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>
176 </el-row> 274 </el-row>
275 +
276 +
177 </el-form> 277 </el-form>
178 <div slot="footer" class="dialog-footer"> 278 <div slot="footer" class="dialog-footer">
179 <el-button type="primary" @click="submitForm">确 定</el-button> 279 <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -193,6 +293,22 @@ ...@@ -193,6 +293,22 @@
193 name: "SourceFlightRules", 293 name: "SourceFlightRules",
194 data() { 294 data() {
195 return { 295 return {
296 + options: [{
297 + value: '选项1',
298 + label: '黄金糕'
299 + }, {
300 + value: '选项2',
301 + label: '双皮奶'
302 + }, {
303 + value: '选项3',
304 + label: '蚵仔煎'
305 + }, {
306 + value: '选项4',
307 + label: '龙须面'
308 + }, {
309 + value: '选项5',
310 + label: '北京烤鸭'
311 + }],
196 // 选中数组 312 // 选中数组
197 ids: [], 313 ids: [],
198 // 非单个禁用 314 // 非单个禁用
...@@ -322,7 +438,7 @@ ...@@ -322,7 +438,7 @@
322 handleAdd() { 438 handleAdd() {
323 this.form = {}; 439 this.form = {};
324 this.open = true; 440 this.open = true;
325 - this.title = "添加原航班顺位规则"; 441 + this.title = "添加航班信息";
326 this.form.id = -1; 442 this.form.id = -1;
327 this.dayOfWeek = []; 443 this.dayOfWeek = [];
328 444
......