Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
0c1e579e 1 parent a8c4f19e

发件人帐号字段输入最大值增加，checkbox限时固定宽。

Inline Side-by-side
Showing 3 changed files with 90 additions and 61 deletions
...@@ -64,14 +64,14 @@ ...@@ -64,14 +64,14 @@
64 </el-empty> 64 </el-empty>
65 <el-row class="rowPadding" v-else> 65 <el-row class="rowPadding" v-else>
66 <el-button type="primary" size="mini" @click="submit(idx)">保 存</el-button> 66 <el-button type="primary" size="mini" @click="submit(idx)">保 存</el-button>
67 - <el-button type="primary" v-if="val.status === '1'" size="mini" 67 + <el-button type="primary" v-if="val.status === '1'" size="mini" icon="el-icon-video-pause"
68 - icon="el-icon-video-pause" @click="changeStatus(idx)"> 68 + @click="changeStatus(idx)">
69 停 用</el-button> 69 停 用</el-button>
70 - <el-button type="primary" v-if="val.status === '3'" size="mini" 70 + <el-button type="primary" v-if="val.status === '3'" size="mini" icon="el-icon-video-pause"
71 - icon="el-icon-video-pause" @click="changeStatus(idx)"> 71 + @click="changeStatus(idx)">
72 启 用</el-button> 72 启 用</el-button>
73 - <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" 73 + <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">删
74 - @click="del(idx)">删 除 74 + 除
75 </el-button> 75 </el-button>
76 <el-divider></el-divider> 76 <el-divider></el-divider>
77 <el-col :span="24"> 77 <el-col :span="24">
...@@ -83,13 +83,13 @@ ...@@ -83,13 +83,13 @@
83 </el-radio-group> 83 </el-radio-group>
84 </el-col> 84 </el-col>
85 <el-col :span="10"> 85 <el-col :span="10">
86 - <el-input v-if="val.isLocation == '1'" v-model="val.location" 86 + <el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea"
87 - type="textarea" :rows="4" resize="none" style="width: 500px" 87 + :rows="4" resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"
88 - placeholder="站点之间用回车符分隔" @change="change" @input="change($event)"> 88 + @change="change" @input="change($event)">
89 </el-input> 89 </el-input>
90 <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"
91 - resize="none" style="width: 500px" placeholder="站点之间用回车符分隔" 91 + resize="none" style="width: 500px" placeholder="站点之间用回车符分隔" @change="change"
92 - @change="change" @input="change($event)"> 92 + @input="change($event)">
93 </el-input> 93 </el-input>
94 </el-col> 94 </el-col>
95 </el-form-item> 95 </el-form-item>
...@@ -98,16 +98,16 @@ ...@@ -98,16 +98,16 @@
98 <el-col :span="12"> 98 <el-col :span="12">
99 <el-form-item label="URSA包含"> 99 <el-form-item label="URSA包含">
100 <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"
101 - style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_" 101 + style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
102 - @change="change" @input="change($event)"> 102 + @input="change($event)">
103 </el-input> 103 </el-input>
104 </el-form-item> 104 </el-form-item>
105 </el-col> 105 </el-col>
106 <el-col :span="12"> 106 <el-col :span="12">
107 <el-form-item label="URSA不包含"> 107 <el-form-item label="URSA不包含">
108 - <el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4" 108 + <el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4" resize="none"
109 - resize="none" style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_" 109 + style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
110 - @change="change" @input="change($event)"> 110 + @input="change($event)">
111 </el-input> 111 </el-input>
112 </el-form-item> 112 </el-form-item>
113 </el-col> 113 </el-col>
...@@ -153,8 +153,7 @@ ...@@ -153,8 +153,7 @@
153 <el-card shadow="never" style="width: 95%"> 153 <el-card shadow="never" style="width: 95%">
154 <el-checkbox-group v-model="val.typeOfGoods" @change="change"> 154 <el-checkbox-group v-model="val.typeOfGoods" @change="change">
155 <el-row> 155 <el-row>
156 - <el-col v-for="item in checkBoxItem.cargoType" :span="2" 156 + <el-col v-for="item in checkBoxItem.cargoType" :span="2" :key="item.id">
157 - :key="item.id">
158 <el-checkbox v-if="item.status === 1" :label="item.chineseName" 157 <el-checkbox v-if="item.status === 1" :label="item.chineseName"
159 :name="item.chineseName" :key="item.code"> 158 :name="item.chineseName" :key="item.code">
160 <Tooltips :content="item.chineseName" :refName="item.code"> 159 <Tooltips :content="item.chineseName" :refName="item.code">
...@@ -189,8 +188,7 @@ ...@@ -189,8 +188,7 @@
189 <el-card shadow="never" style="width: 95%"> 188 <el-card shadow="never" style="width: 95%">
190 <el-checkbox-group v-model="val.puporpuxCode" @change="change"> 189 <el-checkbox-group v-model="val.puporpuxCode" @change="change">
191 <el-row> 190 <el-row>
192 - <el-col :span="2" v-for="item in checkBoxItem.puporpux" 191 + <el-col :span="2" v-for="item in checkBoxItem.puporpux" :key="item.id">
193 - :key="item.id">
194 <el-checkbox 192 <el-checkbox
195 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)" 193 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)"
196 :label="item.chineseName" :name="item.chineseName" 194 :label="item.chineseName" :name="item.chineseName"
...@@ -230,7 +228,18 @@ ...@@ -230,7 +228,18 @@
230 <el-form-item label="Handling Code"> 228 <el-form-item label="Handling Code">
231 <el-card shadow="never" style="width: 95%"> 229 <el-card shadow="never" style="width: 95%">
232 <el-checkbox-group v-model="val.handlingCode" @change="change"> 230 <el-checkbox-group v-model="val.handlingCode" @change="change">
233 - <el-row> 231 + <div class="checkboxItem" v-for="item in checkBoxItem.handlingCode"
232 + :key="item.id">
233 + <el-checkbox
234 + v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
235 + :label="item.chineseName" :name="item.chineseName"
236 + :disabled="val.handlingCode.includes(item.chineseName) && item.status == 0"
237 + :key="item.code">
238 + <Tooltips :content="item.chineseName" :refName="item.code">
239 + </Tooltips>
240 + </el-checkbox>
241 + </div>
242 + <!-- <el-row>
234 <el-col v-for="item in checkBoxItem.handlingCode" :span="2" 243 <el-col v-for="item in checkBoxItem.handlingCode" :span="2"
235 :key="item.id"> 244 :key="item.id">
236 <el-checkbox 245 <el-checkbox
...@@ -242,7 +251,7 @@ ...@@ -242,7 +251,7 @@
242 </Tooltips> 251 </Tooltips>
243 </el-checkbox> 252 </el-checkbox>
244 </el-col> 253 </el-col>
245 - </el-row> 254 + </el-row> -->
246 </el-checkbox-group> 255 </el-checkbox-group>
247 </el-card> 256 </el-card>
248 </el-form-item> 257 </el-form-item>
...@@ -251,19 +260,23 @@ ...@@ -251,19 +260,23 @@
251 <el-form-item label="Sub Category"> 260 <el-form-item label="Sub Category">
252 <el-card shadow="never" style="width: 95%"> 261 <el-card shadow="never" style="width: 95%">
253 <el-checkbox-group v-model="val.subCategory" @change="change"> 262 <el-checkbox-group v-model="val.subCategory" @change="change">
254 - <el-row> 263 + <div class="checkboxItem" v-for="item in checkBoxItem.subCategory"
264 + :key="item.id">
265 + <el-checkbox
266 + v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
267 + :label="item.chineseName" :name="item.chineseName"
268 + :disabled="val.subCategory.includes(item.chineseName) && item.status == 0"
269 + :key="item.code">
270 + <Tooltips :content="item.chineseName" :refName="item.code">
271 + </Tooltips>
272 + </el-checkbox>
273 + </div>
274 + <!-- <el-row>
255 <el-col v-for="item in checkBoxItem.subCategory" :span="2" 275 <el-col v-for="item in checkBoxItem.subCategory" :span="2"
256 :key="item.id"> 276 :key="item.id">
257 - <el-checkbox 277 +
258 - v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
259 - :label="item.chineseName" :name="item.chineseName"
260 - :disabled="val.subCategory.includes(item.chineseName) && item.status == 0"
261 - :key="item.code">
262 - <Tooltips :content="item.chineseName" :refName="item.code">
263 - </Tooltips>
264 - </el-checkbox>
265 </el-col> 278 </el-col>
266 - </el-row> 279 + </el-row> -->
267 </el-checkbox-group> 280 </el-checkbox-group>
268 </el-card> 281 </el-card>
269 </el-form-item> 282 </el-form-item>
...@@ -299,9 +312,9 @@ ...@@ -299,9 +312,9 @@
299 </el-radio-group> 312 </el-radio-group>
300 </el-col> 313 </el-col>
301 <el-col :span="10"> 314 <el-col :span="10">
302 - <el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea" 315 + <el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea" :rows="4"
303 - :rows="4" resize="none" style="width: 500px" placeholder="站点之间用回车符分隔" 316 + resize="none" style="width: 500px" placeholder="站点之间用回车符分隔" @change="change"
304 - @change="change" @input="change($event)"> 317 + @input="change($event)">
305 </el-input> 318 </el-input>
306 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4" resize="none" 319 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4" resize="none"
307 style="width: 500px" placeholder="站点之间用回车符分隔" @change="change" 320 style="width: 500px" placeholder="站点之间用回车符分隔" @change="change"
...@@ -442,18 +455,21 @@ ...@@ -442,18 +455,21 @@
442 <el-form-item label="Handling Code"> 455 <el-form-item label="Handling Code">
443 <el-card shadow="never" style="width: 95%"> 456 <el-card shadow="never" style="width: 95%">
444 <el-checkbox-group v-model="val.handlingCode" @change="change"> 457 <el-checkbox-group v-model="val.handlingCode" @change="change">
445 - <el-row> 458 + <div class="checkboxItem" v-for="item in checkBoxItem.handlingCode" :key="item.id">
459 + <el-checkbox
460 + v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
461 + :label="item.chineseName" :name="item.chineseName"
462 + :disabled="val.handlingCode.includes(item.chineseName) && item.status == 0"
463 + :key="item.code">
464 + <Tooltips :content="item.chineseName" :refName="item.code">
465 + </Tooltips>
466 + </el-checkbox>
467 + </div>
468 + <!-- <el-row>
446 <el-col v-for="item in checkBoxItem.handlingCode" :span="2" :key="item.id"> 469 <el-col v-for="item in checkBoxItem.handlingCode" :span="2" :key="item.id">
447 - <el-checkbox 470 +
448 - v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
449 - :label="item.chineseName" :name="item.chineseName"
450 - :disabled="val.handlingCode.includes(item.chineseName) && item.status == 0"
451 - :key="item.code">
452 - <Tooltips :content="item.chineseName" :refName="item.code">
453 - </Tooltips>
454 - </el-checkbox>
455 </el-col> 471 </el-col>
456 - </el-row> 472 + </el-row> -->
457 </el-checkbox-group> 473 </el-checkbox-group>
458 </el-card> 474 </el-card>
459 </el-form-item> 475 </el-form-item>
...@@ -462,7 +478,17 @@ ...@@ -462,7 +478,17 @@
462 <el-form-item label="Sub Category"> 478 <el-form-item label="Sub Category">
463 <el-card shadow="never" style="width: 95%"> 479 <el-card shadow="never" style="width: 95%">
464 <el-checkbox-group v-model="val.subCategory" @change="change"> 480 <el-checkbox-group v-model="val.subCategory" @change="change">
465 - <el-row> 481 + <div class="checkboxItem" v-for="item in checkBoxItem.subCategory" :key="item.id">
482 + <el-checkbox
483 + v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
484 + :label="item.chineseName" :name="item.chineseName"
485 + :disabled="val.subCategory.includes(item.chineseName) && item.status == 0"
486 + :key="item.code">
487 + <Tooltips :content="item.chineseName" :refName="item.code">
488 + </Tooltips>
489 + </el-checkbox>
490 + </div>
491 + <!-- <el-row>
466 <el-col v-for="item in checkBoxItem.subCategory" :span="2" :key="item.id"> 492 <el-col v-for="item in checkBoxItem.subCategory" :span="2" :key="item.id">
467 <el-checkbox 493 <el-checkbox
468 v-if="item.status === 1 || val.subCategory.includes(item.chineseName)" 494 v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
...@@ -473,7 +499,7 @@ ...@@ -473,7 +499,7 @@
473 </Tooltips> 499 </Tooltips>
474 </el-checkbox> 500 </el-checkbox>
475 </el-col> 501 </el-col>
476 - </el-row> 502 + </el-row> -->
477 </el-checkbox-group> 503 </el-checkbox-group>
478 </el-card> 504 </el-card>
479 </el-form-item> 505 </el-form-item>
...@@ -1245,7 +1271,7 @@ export default { ...@@ -1245,7 +1271,7 @@ export default {
1245 text-align: center; 1271 text-align: center;
1246 } 1272 }
1247 } 1273 }
1248 -</style> 1274 +
1249 .fontWeight { 1275 .fontWeight {
1250 font-size: 16px; 1276 font-size: 16px;
1251 font-weight: 700; 1277 font-weight: 700;
...@@ -1269,3 +1295,9 @@ export default { ...@@ -1269,3 +1295,9 @@ export default {
1269 text-align: center; 1295 text-align: center;
1270 } 1296 }
1271 } 1297 }
1298 +
1299 +.checkboxItem {
1300 + display: inline-block;
1301 + width: 110px;
1302 +}
1303 +</style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-dialog :title="title" :visible.sync="dialogVisible" width="60%" top="8vh" :before-close="close" 3 + <el-dialog :title="title" :visible.sync="dialogVisible" width="60%" top="8vh" :before-close="close" append-to-body
4 - append-to-body :close-on-click-modal="false" @submit.native.prevent @close="close"> 4 + :close-on-click-modal="false" @submit.native.prevent @close="close">
5 <el-form class="form-header" ref="superAllocationForm" :model="formData" label-width="auto" 5 <el-form class="form-header" ref="superAllocationForm" :model="formData" label-width="auto"
6 label-position="left" style="margin-bottom:10px" @submit.native.prevent size="small" :rules="rules"> 6 label-position="left" style="margin-bottom:10px" @submit.native.prevent size="small" :rules="rules">
7 <el-row> 7 <el-row>
8 <el-col :span="22"> 8 <el-col :span="22">
9 <el-form-item label="发件人账号" prop="shipperAccount"> 9 <el-form-item label="发件人账号" prop="shipperAccount">
10 <el-input type="textarea" v-model="formData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割" 10 <el-input type="textarea" v-model="formData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割"
11 - maxlength="50" rows="4" :disabled="disabled" /> 11 + maxlength="3000" rows="4" :disabled="disabled" />
12 </el-form-item> 12 </el-form-item>
13 </el-col> 13 </el-col>
14 <el-col :span="12"> 14 <el-col :span="12">
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
20 </el-col> 20 </el-col>
21 <el-col :span="12"> 21 <el-col :span="12">
22 <el-form-item label="航班日期" prop="flightDate"> 22 <el-form-item label="航班日期" prop="flightDate">
23 - <el-date-picker class="formItem" v-model="formData.flightDate" type="date" 23 + <el-date-picker class="formItem" v-model="formData.flightDate" type="date" placeholder="选择日期"
24 - placeholder="选择日期" value-format="yyyy-MM-dd" @change="getRoute" :disabled="disabled"> 24 + value-format="yyyy-MM-dd" @change="getRoute" :disabled="disabled">
25 </el-date-picker> 25 </el-date-picker>
26 </el-form-item> 26 </el-form-item>
27 </el-col> 27 </el-col>
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
30 <el-col :span="12"> 30 <el-col :span="12">
31 <el-form-item label="航线" prop="flightRoute"> 31 <el-form-item label="航线" prop="flightRoute">
32 <el-select class="formItem" v-model="formData.flightRoute" placeholder="未设置" 32 <el-select class="formItem" v-model="formData.flightRoute" placeholder="未设置"
33 - :loading="routeLoading" :disabled="routeList.length == 0 || disabled" 33 + :loading="routeLoading" :disabled="routeList.length == 0 || disabled" @change="routeChange">
34 - @change="routeChange">
35 <el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route" 34 <el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route"
36 :key="item.id"> 35 :key="item.id">
37 <Tooltips :content="item.route" :refName="item.route"></Tooltips> 36 <Tooltips :content="item.route" :refName="item.route"></Tooltips>
...@@ -50,8 +49,8 @@ ...@@ -50,8 +49,8 @@
50 <el-row> 49 <el-row>
51 <el-col :span="12"> 50 <el-col :span="12">
52 <el-form-item label="URSA包含" prop="includeUrsa"> 51 <el-form-item label="URSA包含" prop="includeUrsa">
53 - <el-input class="formItem" v-model="formData.includeUrsa" 52 + <el-input class="formItem" v-model="formData.includeUrsa" placeholder="URSA之间用分号分隔，例：F2;F3;P_"
54 - placeholder="URSA之间用分号分隔，例：F2;F3;P_" type="textarea" rows="3" maxlength="100"> 53 + type="textarea" rows="3" maxlength="100">
55 </el-input> 54 </el-input>
56 </el-form-item> 55 </el-form-item>
57 </el-col> 56 </el-col>
...@@ -305,6 +304,4 @@ export default { ...@@ -305,6 +304,4 @@ export default {
305 } 304 }
306 </script> 305 </script>
307 306
308 -<style lang="scss" scoped>
309 -
310 -</style>
...\ No newline at end of file ...\ No newline at end of file
307 +<style lang="scss" scoped></style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <el-col :span="6"> 6 <el-col :span="6">
7 <el-form-item label="发件人账号"> 7 <el-form-item label="发件人账号">
8 <el-input type="textarea" v-model="selectionData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割" 8 <el-input type="textarea" v-model="selectionData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割"
9 - maxlength="50" rows="4" /> 9 + maxlength="3000" rows="4" />
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 </el-row> 12 </el-row>
......