Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
fec704c3 1 parent 8855465c

图标增加，序号增加，样式修正

Inline Side-by-side
Showing 6 changed files with 65 additions and 31 deletions
1 +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660113358419" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2396" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
2 +</style></defs><path d="M393.846154 78.769231c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.76923-78.769231-35.446154-78.769231-78.76923 35.446154-78.769231 78.769231-78.769231z m236.307692 0c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.76923-78.769231-35.446154-78.769231-78.76923 35.446154-78.769231 78.769231-78.769231zM393.846154 315.076923c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.769231z m236.307692 0c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.769231zM393.846154 551.384615c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.769231z m236.307692 0c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.769231zM393.846154 787.692308c43.323077 0 78.769231 35.446154 78.769231 78.76923s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.76923z m236.307692 0c43.323077 0 78.769231 35.446154 78.769231 78.76923s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.76923z" p-id="2397"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
...@@ -994,7 +994,7 @@ let tableHeaders = { ...@@ -994,7 +994,7 @@ let tableHeaders = {
994 status: 1 994 status: 1
995 }, 995 },
996 { 996 {
997 - columnChineseName: "航线优先级", 997 + columnChineseName: "航线配舱设置",
998 columnName: "flightRoute", 998 columnName: "flightRoute",
999 columnWidth: "", 999 columnWidth: "",
1000 status: 1 1000 status: 1
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
5 @dragstart="handleDragStart($event, item)" @dragover.prevent="handleDragOver($event, item)" 5 @dragstart="handleDragStart($event, item)" @dragover.prevent="handleDragOver($event, item)"
6 @dragenter="handleDragEnter($event, item)" @dragend="handleDragEnd($event, item)"> 6 @dragenter="handleDragEnter($event, item)" @dragend="handleDragEnd($event, item)">
7 <svg-icon v-if="!disabled" icon-class="drag-text" class="el-input__icon input-icon" style="color:#bfbfbf" /> 7 <svg-icon v-if="!disabled" icon-class="drag-text" class="el-input__icon input-icon" style="color:#bfbfbf" />
8 + <span style="margin-right:20px">{{index}}</span>
8 <span>{{ item.route }}</span> 9 <span>{{ item.route }}</span>
9 </div> 10 </div>
10 </transition-group> 11 </transition-group>
...@@ -81,10 +82,8 @@ export default { ...@@ -81,10 +82,8 @@ export default {
81 .container { 82 .container {
82 max-width: 350px; 83 max-width: 350px;
83 min-height: 32px; 84 min-height: 32px;
84 - // max-height: 150px; 85 + max-height: 150px;
85 overflow-y: scroll; 86 overflow-y: scroll;
86 - display: flex;
87 - flex-direction: column;
88 padding: 0; 87 padding: 0;
89 border: 1px solid #ccc; 88 border: 1px solid #ccc;
90 89
......
...@@ -22,8 +22,14 @@ ...@@ -22,8 +22,14 @@
22 </el-date-picker> 22 </el-date-picker>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 + <el-col :span="6" v-if="infoForm.route != null">
26 + <el-form-item label="航线">
27 + <el-input v-model.tirm="infoForm.route" @change="getRoutes" disabled>
28 + </el-input>
29 + </el-form-item>
30 + </el-col>
25 <el-col :span="7"> 31 <el-col :span="7">
26 - <el-form-item prop="route" label="航线："> 32 + <el-form-item prop="route" label="航线优先级">
27 <Drag :routes="routeList" :disabled="true" @drag="drag"> 33 <Drag :routes="routeList" :disabled="true" @drag="drag">
28 </Drag> 34 </Drag>
29 </el-form-item> 35 </el-form-item>
...@@ -79,10 +85,11 @@ ...@@ -79,10 +85,11 @@
79 <el-col :span="10"> 85 <el-col :span="10">
80 <el-input v-if="val.isLocation == '1'" v-model="val.location" 86 <el-input v-if="val.isLocation == '1'" v-model="val.location"
81 type="textarea" :rows="4" resize="none" style="width: 500px" 87 type="textarea" :rows="4" resize="none" style="width: 500px"
82 - placeholder="站点之间用回车符分隔"> 88 + placeholder="站点之间用回车符分隔" @change="change" @input="change($event)">
83 </el-input> 89 </el-input>
84 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4" 90 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4"
85 - resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"> 91 + resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"
92 + @change="change" @input="change($event)">
86 </el-input> 93 </el-input>
87 </el-col> 94 </el-col>
88 </el-form-item> 95 </el-form-item>
...@@ -91,14 +98,16 @@ ...@@ -91,14 +98,16 @@
91 <el-col :span="12"> 98 <el-col :span="12">
92 <el-form-item label="URSA包含"> 99 <el-form-item label="URSA包含">
93 <el-input v-model="val.includeUrsa" type="textarea" :rows="4" resize="none" 100 <el-input v-model="val.includeUrsa" type="textarea" :rows="4" resize="none"
94 - style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_"> 101 + style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_"
102 + @change="change" @input="change($event)">
95 </el-input> 103 </el-input>
96 </el-form-item> 104 </el-form-item>
97 </el-col> 105 </el-col>
98 <el-col :span="12"> 106 <el-col :span="12">
99 <el-form-item label="URSA不包含"> 107 <el-form-item label="URSA不包含">
100 <el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4" 108 <el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4"
101 - resize="none" style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_"> 109 + resize="none" style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_"
110 + @change="change" @input="change($event)">
102 </el-input> 111 </el-input>
103 </el-form-item> 112 </el-form-item>
104 </el-col> 113 </el-col>
...@@ -108,13 +117,15 @@ ...@@ -108,13 +117,15 @@
108 <el-form-item label="件数"> 117 <el-form-item label="件数">
109 <el-col :span="10"> 118 <el-col :span="10">
110 <el-input class="numberInput" v-model.trim="val.minNumOfPieces" 119 <el-input class="numberInput" v-model.trim="val.minNumOfPieces"
111 - oninput="value=value.replace(/[^\d\.\-]/g,'')"> 120 + oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
121 + @input="change($event)">
112 </el-input> 122 </el-input>
113 </el-col> 123 </el-col>
114 <el-col style="text-align: center" :span="1">-</el-col> 124 <el-col style="text-align: center" :span="1">-</el-col>
115 <el-col :span="10"> 125 <el-col :span="10">
116 <el-input class="numberInput" v-model.trim="val.maxNumOfPieces" 126 <el-input class="numberInput" v-model.trim="val.maxNumOfPieces"
117 - oninput="value=value.replace(/[^\d\.\-]/g,'')"> 127 + oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
128 + @input="change($event)">
118 </el-input> 129 </el-input>
119 </el-col> 130 </el-col>
120 </el-form-item> 131 </el-form-item>
...@@ -123,13 +134,15 @@ ...@@ -123,13 +134,15 @@
123 <el-form-item label="重量(KG)"> 134 <el-form-item label="重量(KG)">
124 <el-col :span="10"> 135 <el-col :span="10">
125 <el-input class="numberInput" v-model.trim="val.minWeight" 136 <el-input class="numberInput" v-model.trim="val.minWeight"
126 - oninput="value=value.replace(/[^\d\.\-]/g,'')"> 137 + oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
138 + @input="change($event)">
127 </el-input> 139 </el-input>
128 </el-col> 140 </el-col>
129 <el-col style="text-align: center" :span="1">-</el-col> 141 <el-col style="text-align: center" :span="1">-</el-col>
130 <el-col :span="10"> 142 <el-col :span="10">
131 <el-input class="numberInput" v-model.trim="val.maxWeight" 143 <el-input class="numberInput" v-model.trim="val.maxWeight"
132 - oninput="value=value.replace(/[^\d\.\-]/g,'')"> 144 + oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
145 + @input="change($event)">
133 </el-input> 146 </el-input>
134 </el-col> 147 </el-col>
135 </el-form-item> 148 </el-form-item>
...@@ -286,10 +299,12 @@ ...@@ -286,10 +299,12 @@
286 </el-col> 299 </el-col>
287 <el-col :span="10"> 300 <el-col :span="10">
288 <el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea" 301 <el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea"
289 - :rows="4" resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"> 302 + :rows="4" resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"
303 + @change="change" @input="change($event)">
290 </el-input> 304 </el-input>
291 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4" resize="none" 305 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4" resize="none"
292 - style="width: 500px" placeholder="站点之间用回车符分隔"> 306 + style="width: 500px" placeholder="站点之间用回车符分隔" @change="change"
307 + @input="change($event)">
293 </el-input> 308 </el-input>
294 </el-col> 309 </el-col>
295 </el-form-item> 310 </el-form-item>
...@@ -298,14 +313,16 @@ ...@@ -298,14 +313,16 @@
298 <el-col :span="12"> 313 <el-col :span="12">
299 <el-form-item label="URSA包含"> 314 <el-form-item label="URSA包含">
300 <el-input v-model="val.includeUrsa" type="textarea" :rows="4" resize="none" 315 <el-input v-model="val.includeUrsa" type="textarea" :rows="4" resize="none"
301 - style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_"> 316 + style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
317 + @input="change($event)">
302 </el-input> 318 </el-input>
303 </el-form-item> 319 </el-form-item>
304 </el-col> 320 </el-col>
305 <el-col :span="12"> 321 <el-col :span="12">
306 <el-form-item label="URSA不包含"> 322 <el-form-item label="URSA不包含">
307 <el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4" resize="none" 323 <el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4" resize="none"
308 - style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_"> 324 + style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
325 + @input="change($event)">
309 </el-input> 326 </el-input>
310 </el-form-item> 327 </el-form-item>
311 </el-col> 328 </el-col>
...@@ -315,13 +332,15 @@ ...@@ -315,13 +332,15 @@
315 <el-form-item label="件数"> 332 <el-form-item label="件数">
316 <el-col :span="10"> 333 <el-col :span="10">
317 <el-input class="numberInput" v-model.trim="val.minNumOfPieces" 334 <el-input class="numberInput" v-model.trim="val.minNumOfPieces"
318 - oninput="value=value.replace(/[^\d\.\-]/g,'')"> 335 + oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
336 + @input="change($event)">
319 </el-input> 337 </el-input>
320 </el-col> 338 </el-col>
321 <el-col style="text-align: center" :span="1">-</el-col> 339 <el-col style="text-align: center" :span="1">-</el-col>
322 <el-col :span="10"> 340 <el-col :span="10">
323 <el-input class="numberInput" v-model.trim="val.maxNumOfPieces" 341 <el-input class="numberInput" v-model.trim="val.maxNumOfPieces"
324 - oninput="value=value.replace(/[^\d\.\-]/g,'')"> 342 + oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
343 + @input="change($event)">
325 </el-input> 344 </el-input>
326 </el-col> 345 </el-col>
327 </el-form-item> 346 </el-form-item>
...@@ -330,13 +349,15 @@ ...@@ -330,13 +349,15 @@
330 <el-form-item label="重量(KG)"> 349 <el-form-item label="重量(KG)">
331 <el-col :span="10"> 350 <el-col :span="10">
332 <el-input class="numberInput" v-model.trim="val.minWeight" 351 <el-input class="numberInput" v-model.trim="val.minWeight"
333 - oninput="value=value.replace(/[^\d\.\-]/g,'')"> 352 + oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
353 + @input="change($event)">
334 </el-input> 354 </el-input>
335 </el-col> 355 </el-col>
336 <el-col style="text-align: center" :span="1">-</el-col> 356 <el-col style="text-align: center" :span="1">-</el-col>
337 <el-col :span="10"> 357 <el-col :span="10">
338 <el-input class="numberInput" v-model.trim="val.maxWeight" 358 <el-input class="numberInput" v-model.trim="val.maxWeight"
339 - oninput="value=value.replace(/[^\d\.\-]/g,'')"> 359 + oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
360 + @input="change($event)">
340 </el-input> 361 </el-input>
341 </el-col> 362 </el-col>
342 </el-form-item> 363 </el-form-item>
...@@ -861,9 +882,9 @@ export default { ...@@ -861,9 +882,9 @@ export default {
861 this.loading = false 882 this.loading = false
862 if (res.code === 200) { 883 if (res.code === 200) {
863 this.fltNoDisabled = true 884 this.fltNoDisabled = true
885 + this.$forceUpdate()
864 this.msgSuccess('保存成功！') 886 this.msgSuccess('保存成功！')
865 this.infoForm.list[val] = this.dataHandle(res.data) 887 this.infoForm.list[val] = this.dataHandle(res.data)
866 - this.$forceUpdate()
867 } else { 888 } else {
868 this.msgWarning(res.msg) 889 this.msgWarning(res.msg)
869 } 890 }
...@@ -1020,9 +1041,9 @@ export default { ...@@ -1020,9 +1041,9 @@ export default {
1020 val.location ? val.isLocation = '1' : '' 1041 val.location ? val.isLocation = '1' : ''
1021 val.notLocation ? val.isLocation = '2' : '' 1042 val.notLocation ? val.isLocation = '2' : ''
1022 val.maxNumOfPieces == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最大件数 1043 val.maxNumOfPieces == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最大件数
1023 - val.maxWeight == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最大重量 1044 + val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量
1024 - val.minNumOfPieces == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最小件数 1045 + val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数
1025 - val.minWeight == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最小件数 1046 + val.minWeight == null ? val.minWeight = undefined : val.minWeight = val.minWeight//最小件数
1026 val.typeOfGoods != null ? val.typeOfGoods = val.typeOfGoods.split(';') : val.typeOfGoods = []//申报类型 1047 val.typeOfGoods != null ? val.typeOfGoods = val.typeOfGoods.split(';') : val.typeOfGoods = []//申报类型
1027 val.declarationCategory != null ? val.declarationCategory = val.declarationCategory.split(';') : val.declarationCategory = []//货物类型 1048 val.declarationCategory != null ? val.declarationCategory = val.declarationCategory.split(';') : val.declarationCategory = []//货物类型
1028 val.puporpuxCode != null ? val.puporpuxCode = val.puporpuxCode.split(';') : val.puporpuxCode = []//取件扫描码 1049 val.puporpuxCode != null ? val.puporpuxCode = val.puporpuxCode.split(';') : val.puporpuxCode = []//取件扫描码
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto" 5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent> 6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
7 <el-form-item label="货站名称" prop="goodsStation"> 7 <el-form-item label="货站名称" prop="goodsStation">
8 - <el-input type="text" v-model="formData.goodsStation" maxlength="50" placeholder="请输入货站名称"> 8 + <el-input type="text" v-model="formData.goodsStation" maxlength="25" placeholder="请输入货站名称">
9 </el-input> 9 </el-input>
10 </el-form-item> 10 </el-form-item>
11 <el-form-item label="品名" prop="goodsList"> 11 <el-form-item label="品名" prop="goodsList">
12 - <el-input type="textarea" v-model="formData.goodsList" rows="4" maxlength="254" 12 + <el-input type="textarea" v-model="formData.goodsList" rows="4" maxlength="125"
13 placeholder="请输入品名，多个用“;”隔开"> 13 placeholder="请输入品名，多个用“;”隔开">
14 </el-input> 14 </el-input>
15 </el-form-item> 15 </el-form-item>
......
...@@ -5,12 +5,11 @@ ...@@ -5,12 +5,11 @@
5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto" 5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent> 6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
7 <el-form-item label="货站名称" prop="goodsStation"> 7 <el-form-item label="货站名称" prop="goodsStation">
8 - <el-input type="text" v-model="formData.goodsStation" maxlength="50" placeholder="请输入货站名称"> 8 + <el-input type="text" v-model="formData.goodsStation" maxlength="25" placeholder="请输入货站名称">
9 </el-input> 9 </el-input>
10 </el-form-item> 10 </el-form-item>
11 <el-form-item label="航班" prop="flightList"> 11 <el-form-item label="航班" prop="flightList">
12 - <el-input type="textarea" v-model="formData.flightList" rows="4" maxlength="254" 12 + <el-input type="textarea" v-model="flightList" rows="4" maxlength="125" placeholder="请输入航班，多个用“;”隔开">
13 - placeholder="请输入航班，多个用“;”隔开" oninput="value=value.replace(/[^A-Za-z0-9\;]/g, '')">
14 </el-input> 13 </el-input>
15 </el-form-item> 14 </el-form-item>
16 </el-form> 15 </el-form>
...@@ -64,7 +63,7 @@ export default { ...@@ -64,7 +63,7 @@ export default {
64 //提交 63 //提交
65 submit() { 64 submit() {
66 let obj = {} 65 let obj = {}
67 - obj.goodsStation = this.formData.goodsStationt 66 + obj.goodsStation = this.formData.goodsStation
68 if (this.formData.flightList != null && this.formData.flightList != '') { 67 if (this.formData.flightList != null && this.formData.flightList != '') {
69 this.formData.flightList = this.formData.flightList.toUpperCase() 68 this.formData.flightList = this.formData.flightList.toUpperCase()
70 obj.flightList = this.formData.flightList.split(';') 69 obj.flightList = this.formData.flightList.split(';')
...@@ -96,6 +95,19 @@ export default { ...@@ -96,6 +95,19 @@ export default {
96 this.$refs["addForm"].clearValidate(); 95 this.$refs["addForm"].clearValidate();
97 this.$emit('close') 96 this.$emit('close')
98 } 97 }
98 + },
99 + computed: {
100 + flightList: {
101 + get: function () {
102 + return this.formData.flightList
103 + },
104 + set: function (val) {
105 + const reg = /^([a-zA-Z0-9]{0,40}(\;[a-zA-Z0-9]{0,40})*)$/
106 + if (reg.test(val)) {
107 + this.formData.flightList = val
108 + }
109 + },
110 + },
99 } 111 }
100 } 112 }
101 113
......