Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
2d69a11c 1 parent e656ba18

modify

Inline Side-by-side
Showing 5 changed files with 711 additions and 1699 deletions
...@@ -2,13 +2,12 @@ ...@@ -2,13 +2,12 @@
2 <el-card> 2 <el-card>
3 <div class="row"> 3 <div class="row">
4 <div class="col-6"> 4 <div class="col-6">
5 - <draggable class="list-group" tag="ul" v-model="list" v-bind="dragOptions" @start="drag = true" 5 + <draggable class="list-group" tag="ul" v-model="routeList" v-bind="dragOptions" @start="dragStart" @end="dragEnd">
6 - @end="drag = false">
7 <transition-group type="transition" :name="!drag ? 'flip-list' : null"> 6 <transition-group type="transition" :name="!drag ? 'flip-list' : null">
8 - <li class="list-group-item" v-for="element in list" :key="element.order"> 7 + <li class="list-group-item" v-for="item in routeList" :key="item.routePriority">
9 - <i :class="element.fixed ? 'fa fa-anchor' : 'glyphicon glyphicon-pushpin' 8 + <i :class="item.fixed ? 'fa fa-anchor' : 'glyphicon glyphicon-pushpin'
10 - " @click="element.fixed = !element.fixed" aria-hidden="true"></i> 9 + " @click="item.fixed = !item.fixed" aria-hidden="true"></i>
11 - {{ element.name }} 10 + {{ item.route }}
12 </li> 11 </li>
13 </transition-group> 12 </transition-group>
14 </draggable> 13 </draggable>
...@@ -19,53 +18,56 @@ ...@@ -19,53 +18,56 @@
19 18
20 <script> 19 <script>
21 import draggable from "vuedraggable"; 20 import draggable from "vuedraggable";
22 -const message = [
23 - "vue.draggable",
24 - "draggable",
25 - "component",
26 - "for",
27 - "vue.js 2.0",
28 - "based",
29 - "on",
30 - "Sortablejs"
31 -];
32 export default { 21 export default {
33 - name: "transition-example-2", 22 + name: "YlDraggable",
34 - display: "Transitions", 23 + props: {
35 - order: 7, 24 + routeList: {
25 + // 航线
26 + type: Array,
27 + default: () => [],
28 + },
29 + dragOptions: {
30 + // 拖拽配置
31 + type: Object,
32 + default: () => {
33 + return {
34 + animation: 200,
35 + group: "description",
36 + disabled: false,
37 + ghostClass: "ghost"
38 + }
39 + },
40 + },
41 + },
36 components: { 42 components: {
37 draggable 43 draggable
38 }, 44 },
39 data() { 45 data() {
40 - return { 46 + return {};
41 - list: message.map((name, index) => {
42 - return { name, order: index + 1 };
43 - }),
44 - drag: false
45 - };
46 }, 47 },
48 + created() {},
47 methods: { 49 methods: {
50 + // 排序
48 sort() { 51 sort() {
49 - this.list = this.list.sort((a, b) => a.order - b.order); 52 + this.routeList = this.routeList.sort((a, b) => a.routePriority - b.routePriority);
50 - } 53 + },
54 + // 开始拖拽
55 + dragStart() {
56 +
57 + },
58 + // 结束拖拽
59 + dragEnd() {
60 + this.$emit("dragEnd", this.routeList);
61 + },
51 }, 62 },
52 - computed: {
53 - dragOptions() {
54 - return {
55 - animation: 200,
56 - group: "description",
57 - disabled: false,
58 - ghostClass: "ghost"
59 - };
60 - }
61 - }
62 }; 63 };
63 </script> 64 </script>
64 65
65 <style lang="scss"> 66 <style lang="scss">
66 .el-card__body { 67 .el-card__body {
67 - padding: 15px 10px 0px 10px !important; 68 + padding: 15px 10px 0px 10px !important;
68 } 69 }
70 +
69 .list-group { 71 .list-group {
70 min-height: 20px; 72 min-height: 20px;
71 max-height: 150px; 73 max-height: 150px;
......
1 <template> 1 <template>
2 <div ref="routeInfo" class="route-container"> 2 <div ref="routeInfo" class="route-container">
3 - <el-collapse accordion v-model="routesInfo" @change="collapseChange"> 3 + <el-collapse
4 - <el-collapse-item v-for="(item, index) in routesInfo" :key="item.route"> 4 + value="1"
5 + accordion
6 + v-model="activeNames"
7 + @change="collapseChange"
8 + >
9 + <el-collapse-item
10 + v-for="(item, index) in routesInfo"
11 + :key="item.route"
12 + :name="index"
13 + >
5 <!-- 航线名 --> 14 <!-- 航线名 -->
6 <template slot="title"> 15 <template slot="title">
7 <strong>{{ item.route }}</strong> 16 <strong>{{ item.route }}</strong>
...@@ -10,186 +19,376 @@ ...@@ -10,186 +19,376 @@
10 <div class="route-info info-item"> 19 <div class="route-info info-item">
11 <el-card class="route-info-card"> 20 <el-card class="route-info-card">
12 <!-- 有数据时 --> 21 <!-- 有数据时 -->
13 - <section v-if="item.data"> 22 + <section v-if="item.config">
14 <div slot="header" class="route-config-header"> 23 <div slot="header" class="route-config-header">
15 - <el-button type="primary" round size="small" :disabled="item.disabled" 24 + <el-button
16 - :loading="item.loading">保存</el-button> 25 + type="primary"
26 + size="mini"
27 + :disabled="item.status == '3'"
28 + :loading="item.loading"
29 + v-if="item.status == '1'"
30 + >保 存</el-button
31 + >
32 + <el-button
33 + type="primary"
34 + size="mini"
35 + icon="el-icon-video-pause"
36 + :disabled="item.status == '3'"
37 + :loading="item.loading"
38 + v-if="item.status == '1' && item.ruleDate"
39 + >{{ item.status == '1' ? '停 用' : item.status == '3' ? '启 用' : '停 用'}}</el-button
40 + >
41 + <el-button
42 + type="danger"
43 + size="mini"
44 + icon="el-icon-delete"
45 + :disabled="item.disabled"
46 + :loading="item.loading"
47 + v-if="item.status == '1' && item.ruleDate"
48 + >删 除</el-button
49 + >
17 <span class="flight-route-title">普通规则</span> 50 <span class="flight-route-title">普通规则</span>
18 </div> 51 </div>
52 + <el-divider></el-divider>
19 <div class="route-config-info"> 53 <div class="route-config-info">
20 - <el-col :span="24"> 54 + <el-form label-position="right" label-width="120px">
21 - <el-form-item label="始发站"> 55 + <el-row>
22 - <el-col :span="4"> 56 + <el-col :span="24">
23 - <el-radio-group v-model="item.location" @change="changeLocation"> 57 + <el-form-item label="始发站">
24 - <el-radio label="1">包含始发站</el-radio> 58 + <el-col :span="2">
25 - <el-radio label="2">不包含始发站</el-radio> 59 + <el-radio-group
26 - </el-radio-group> 60 + v-model="item.isLocation"
61 + @change="changeLocation"
62 + >
63 + <el-radio label="1">包含始发站</el-radio>
64 + <el-radio label="2">不包含始发站</el-radio>
65 + </el-radio-group>
66 + </el-col>
67 + <el-col :span="10">
68 + <el-input
69 + v-if="item.isLocation == '1'"
70 + type="textarea"
71 + v-model="item.location"
72 + :rows="4"
73 + placeholder="始发站之间用回车符分隔"
74 + style="width: 500px"
75 + >
76 + </el-input>
77 + <el-input
78 + v-else
79 + type="textarea"
80 + v-model="item.notLocation"
81 + :rows="4"
82 + placeholder="始发站之间用回车符分隔"
83 + style="width: 500px"
84 + >
85 + </el-input>
86 + </el-col>
87 + </el-form-item>
27 </el-col> 88 </el-col>
28 - <el-col :span="10"> 89 + <el-col :span="24">
29 - <el-input type="textarea" v-model="item.location" :rows="4" placeholder="始发站之间用回车符分隔" 90 + <el-form-item label="目的站">
30 - style="width: 500px"> 91 + <el-col :span="2">
31 - </el-input> 92 + <el-radio-group
93 + v-model="item.isDestinationSite"
94 + @change="changeDestinationSite"
95 + >
96 + <el-radio label="1">包含目的站</el-radio>
97 + <el-radio label="2">不包含目的站</el-radio>
98 + </el-radio-group>
99 + </el-col>
100 + <el-col :span="10">
101 + <el-input
102 + v-if="item.isDestinationSite == '1'"
103 + type="textarea"
104 + v-model="item.destinationSite"
105 + :rows="4"
106 + placeholder="目的站之间用回车符分隔"
107 + style="width: 500px"
108 + >
109 + </el-input>
110 + <el-input
111 + v-else
112 + type="textarea"
113 + v-model="item.notDestinationSite"
114 + :rows="4"
115 + placeholder="目的站之间用回车符分隔"
116 + style="width: 500px"
117 + >
118 + </el-input>
119 + </el-col>
120 + </el-form-item>
32 </el-col> 121 </el-col>
33 - </el-form-item> 122 + <el-col :span="24">
34 - </el-col>
35 - <el-col :span="24">
36 - <el-form-item label="目的站">
37 - <el-col :span="4">
38 - <el-radio-group v-model="isDestinationSite" @change="changeDestinationSite">
39 - <el-radio label="1">包含目的站</el-radio>
40 - <el-radio label="2">不包含目的站</el-radio>
41 - </el-radio-group>
42 - </el-col>
43 - <el-col :span="10">
44 - <el-input type="textarea" v-model="item.destinationSite" :rows="4" placeholder="目的站之间用回车符分隔"
45 - style="width: 500px">
46 - </el-input>
47 - </el-col>
48 - </el-form-item>
49 - </el-col>
50 - <el-col :span="24">
51 - <el-col :span="12">
52 - <el-form-item label="URSA包含">
53 - <el-input type="textarea" v-model="item.includeUrsa" :rows="4" placeholder="URSA之间用分号分隔，例：F2;F3;P_">
54 - </el-input>
55 - </el-form-item>
56 - </el-col>
57 - <el-col :span="12">
58 - <el-form-item label="URSA不包含">
59 - <el-input type="textarea" v-model="item.notIncludeUrsa" :rows="4"
60 - placeholder="URSA之间用分号分隔，例：F2;F3;P_">
61 - </el-input>
62 - </el-form-item>
63 - </el-col>
64 - </el-col>
65 - <el-col :span="24">
66 - <el-col :span="9">
67 - <el-form-item label="件数">
68 - <el-col :span="10">
69 - <el-input class="numberInput" v-model.trim="item.minNumOfPieces">
70 - </el-input>
71 - <span ref="minNumOfPieces" class="el-form-item__error"></span>
72 - </el-col>
73 - <el-col style="text-align: center" :span="1">-</el-col>
74 - <el-col :span="10">
75 - <el-input class="numberInput" v-model.trim="item.maxNumOfPieces">
76 - </el-input>
77 - </el-col>
78 - </el-form-item>
79 - </el-col>
80 - <el-col :span="9">
81 - <el-form-item label="重量(KG)">
82 <el-col :span="10"> 123 <el-col :span="10">
83 - <el-input class="numberInput" v-model.trim="item.minWeight"> 124 + <el-form-item label="URSA包含">
84 - </el-input> 125 + <el-input
85 - <span ref="minWeight" class="el-form-item__error"></span> 126 + type="textarea"
127 + v-model="item.includeUrsa"
128 + :rows="4"
129 + placeholder="URSA之间用分号分隔，例：F2;F3;P_"
130 + >
131 + </el-input>
132 + </el-form-item>
86 </el-col> 133 </el-col>
87 - <el-col style="text-align: center" :span="1">-</el-col>
88 <el-col :span="10"> 134 <el-col :span="10">
89 - <el-input class="numberInput" v-model.trim="item.maxWeight"> 135 + <el-form-item label="URSA不包含">
90 - </el-input> 136 + <el-input
137 + type="textarea"
138 + v-model="item.notIncludeUrsa"
139 + :rows="4"
140 + placeholder="URSA之间用分号分隔，例：F2;F3;P_"
141 + >
142 + </el-input>
143 + </el-form-item>
91 </el-col> 144 </el-col>
92 - </el-form-item> 145 + </el-col>
93 - </el-col> 146 + <el-col :span="24">
94 - </el-col> 147 + <el-col :span="9">
95 - <el-col :span="24"> 148 + <el-form-item label="件数">
96 - <el-form-item label="申报类别"> 149 + <el-col :span="10">
97 - <el-card shadow="never" style="width: 95%"> 150 + <el-input
98 - <el-checkbox-group v-model="item.typeOfGoods" @change="changeCargoType"> 151 + class="numberInput"
99 - <el-row> 152 + v-model.trim="item.minNumOfPieces"
100 - <el-col v-for="item in cargoType" :span="2" :key="item.id"> 153 + >
101 - <el-checkbox :label="item.chineseName" :name="item.chineseName" :key="item.code"> 154 + </el-input>
102 - <Tooltips :content="item.chineseName" :refName="item.code"> 155 + <span
103 - </Tooltips> 156 + ref="minNumOfPieces"
104 - </el-checkbox> 157 + class="el-form-item__error"
158 + ></span>
105 </el-col> 159 </el-col>
106 - </el-row> 160 + <el-col style="text-align: center" :span="1"
107 - </el-checkbox-group> 161 + >-</el-col
108 - </el-card> 162 + >
109 - </el-form-item> 163 + <el-col :span="10">
110 - </el-col> 164 + <el-input
111 - <el-col :span="24"> 165 + class="numberInput"
112 - <el-form-item label="货物类型"> 166 + v-model.trim="item.maxNumOfPieces"
113 - <el-card shadow="never" style="width: 95%"> 167 + >
114 - <el-checkbox-group v-model="item.cargoType" @change="changeCargoStatus"> 168 + </el-input>
115 - <el-row>
116 - <el-col :span="3" v-for="item in cargoStatus" :key="item.id">
117 - <el-checkbox :label="item.chineseName" :name="item.chineseName" :key="item.code" disabled>
118 - <Tooltips :content="item.chineseName" :refName="item.code">
119 - </Tooltips>
120 - </el-checkbox>
121 </el-col> 169 </el-col>
122 - </el-row> 170 + </el-form-item>
123 - </el-checkbox-group> 171 + </el-col>
124 - </el-card> 172 + <el-col :span="9">
125 - </el-form-item> 173 + <el-form-item label="重量(KG)">
126 - </el-col> 174 + <el-col :span="10">
127 - <el-col :span="24"> 175 + <el-input
128 - <el-form-item label="取件扫描号"> 176 + class="numberInput"
129 - <el-card shadow="never" style="width: 95%"> 177 + v-model.trim="item.minWeight"
130 - <el-checkbox-group v-model="item.puporpuxCode" @change="changePuporpux"> 178 + >
131 - <el-row> 179 + </el-input>
132 - <el-col :span="2" v-for="item in puporpux" :key="item.id"> 180 + <span
133 - <el-checkbox :label="item.chineseName" :name="item.chineseName" :key="item.code"> 181 + ref="minWeight"
134 - <Tooltips :content="item.chineseName" :refName="item.code"> 182 + class="el-form-item__error"
135 - </Tooltips> 183 + ></span>
136 - </el-checkbox>
137 </el-col> 184 </el-col>
138 - </el-row> 185 + <el-col style="text-align: center" :span="1"
139 - </el-checkbox-group> 186 + >-</el-col
140 - </el-card> 187 + >
141 - </el-form-item> 188 + <el-col :span="10">
142 - </el-col> 189 + <el-input
143 - <el-col :span="24"> 190 + class="numberInput"
144 - <el-form-item label="Service Code"> 191 + v-model.trim="item.maxWeight"
145 - <el-card shadow="never" style="width: 95%"> 192 + >
146 - <el-checkbox-group v-model="item.serviceCode" @change="changeServiceCode"> 193 + </el-input>
147 - <el-row>
148 - <el-col :span="2" v-for="item in serviceCode" :key="item.id">
149 - <el-checkbox :label="item.chineseName" :name="item.chineseName" :key="item.code">
150 - <Tooltips :content="item.chineseName" :refName="item.code">
151 - </Tooltips>
152 - </el-checkbox>
153 </el-col> 194 </el-col>
154 - </el-row> 195 + </el-form-item>
155 - </el-checkbox-group> 196 + </el-col>
156 - </el-card> 197 + </el-col>
157 - </el-form-item> 198 + <el-col :span="24">
158 - </el-col> 199 + <el-form-item label="申报类别">
159 - <el-col :span="24"> 200 + <el-card shadow="never" style="width: 95%">
160 - <el-form-item label="Handling Code"> 201 + <el-checkbox-group
161 - <el-card shadow="never" style="width: 95%"> 202 + v-model="item.typeOfGoods"
162 - <el-checkbox-group v-model="item.handlingCode" @change="changeHandlingCode"> 203 + @change="changeCargoType"
163 - <div class="checkboxItem" v-for="item in handlingCode" :key="item.id"> 204 + >
164 - <el-checkbox :label="item.chineseName" :name="item.chineseName" :key="item.code"> 205 + <el-row>
165 - <Tooltips :content="item.chineseName" :refName="item.code"> 206 + <el-col
166 - </Tooltips> 207 + v-for="item in cargoType"
167 - </el-checkbox> 208 + :span="2"
168 - </div> 209 + :key="item.id"
169 - </el-checkbox-group> 210 + >
170 - </el-card> 211 + <el-checkbox
171 - </el-form-item> 212 + :label="item.chineseName"
172 - </el-col> 213 + :name="item.chineseName"
173 - <el-col :span="24"> 214 + :key="item.code"
174 - <el-form-item label="Sub Category"> 215 + >
175 - <el-card shadow="never" style="width: 95%"> 216 + <Tooltips
176 - <el-checkbox-group v-model="item.subCategory" @change="changeSubCategory"> 217 + :content="item.chineseName"
177 - <div class="checkboxItem" v-for="item in subCategory" :key="item.id"> 218 + :refName="item.code"
178 - <el-checkbox :label="item.chineseName" :name="item.chineseName" :key="item.code"> 219 + >
179 - <Tooltips :content="item.chineseName" :refName="item.code"> 220 + </Tooltips>
180 - </Tooltips> 221 + </el-checkbox>
181 - </el-checkbox> 222 + </el-col>
182 - </div> 223 + </el-row>
183 - </el-checkbox-group> 224 + </el-checkbox-group>
184 - </el-card> 225 + </el-card>
185 - </el-form-item> 226 + </el-form-item>
186 - </el-col> 227 + </el-col>
228 + <el-col :span="24">
229 + <el-form-item label="货物类型">
230 + <el-card shadow="never" style="width: 95%">
231 + <el-checkbox-group
232 + v-model="item.cargoType"
233 + @change="changeCargoStatus"
234 + >
235 + <el-row>
236 + <el-col
237 + :span="3"
238 + v-for="item in cargoStatus"
239 + :key="item.id"
240 + >
241 + <el-checkbox
242 + :label="item.chineseName"
243 + :name="item.chineseName"
244 + :key="item.code"
245 + disabled
246 + >
247 + <Tooltips
248 + :content="item.chineseName"
249 + :refName="item.code"
250 + >
251 + </Tooltips>
252 + </el-checkbox>
253 + </el-col>
254 + </el-row>
255 + </el-checkbox-group>
256 + </el-card>
257 + </el-form-item>
258 + </el-col>
259 + <el-col :span="24">
260 + <el-form-item label="取件扫描号">
261 + <el-card shadow="never" style="width: 95%">
262 + <el-checkbox-group
263 + v-model="item.puporpuxCode"
264 + @change="changePuporpux"
265 + >
266 + <el-row>
267 + <el-col
268 + :span="2"
269 + v-for="item in puporpux"
270 + :key="item.id"
271 + >
272 + <el-checkbox
273 + :label="item.chineseName"
274 + :name="item.chineseName"
275 + :key="item.code"
276 + >
277 + <Tooltips
278 + :content="item.chineseName"
279 + :refName="item.code"
280 + >
281 + </Tooltips>
282 + </el-checkbox>
283 + </el-col>
284 + </el-row>
285 + </el-checkbox-group>
286 + </el-card>
287 + </el-form-item>
288 + </el-col>
289 + <el-col :span="24">
290 + <el-form-item label="Service Code">
291 + <el-card shadow="never" style="width: 95%">
292 + <el-checkbox-group
293 + v-model="item.serviceCode"
294 + @change="changeServiceCode"
295 + >
296 + <el-row>
297 + <el-col
298 + :span="2"
299 + v-for="item in serviceCode"
300 + :key="item.id"
301 + >
302 + <el-checkbox
303 + :label="item.chineseName"
304 + :name="item.chineseName"
305 + :key="item.code"
306 + >
307 + <Tooltips
308 + :content="item.chineseName"
309 + :refName="item.code"
310 + >
311 + </Tooltips>
312 + </el-checkbox>
313 + </el-col>
314 + </el-row>
315 + </el-checkbox-group>
316 + </el-card>
317 + </el-form-item>
318 + </el-col>
319 + <el-col :span="24">
320 + <el-form-item label="Handling Code">
321 + <el-card shadow="never" style="width: 95%">
322 + <el-checkbox-group
323 + v-model="item.handlingCode"
324 + @change="changeHandlingCode"
325 + >
326 + <el-row>
327 + <el-col
328 + :span="2"
329 + v-for="item in handlingCode"
330 + :key="item.id"
331 + >
332 + <el-checkbox
333 + :label="item.chineseName"
334 + :name="item.chineseName"
335 + :key="item.code"
336 + >
337 + <Tooltips
338 + :content="item.chineseName"
339 + :refName="item.code"
340 + >
341 + </Tooltips>
342 + </el-checkbox>
343 + </el-col>
344 + </el-row>
345 + </el-checkbox-group>
346 + </el-card>
347 + </el-form-item>
348 + </el-col>
349 + <el-col :span="24">
350 + <el-form-item label="Sub Category">
351 + <el-card shadow="never" style="width: 95%">
352 + <el-checkbox-group
353 + v-model="item.subCategory"
354 + @change="changeSubCategory"
355 + >
356 + <el-row>
357 + <el-col
358 + :span="2"
359 + v-for="item in subCategory"
360 + :key="item.id"
361 + >
362 + <el-checkbox
363 + :label="item.chineseName"
364 + :name="item.chineseName"
365 + :key="item.code"
366 + >
367 + <Tooltips
368 + :content="item.chineseName"
369 + :refName="item.code"
370 + >
371 + </Tooltips>
372 + </el-checkbox>
373 + </el-col>
374 + </el-row>
375 + </el-checkbox-group>
376 + </el-card>
377 + </el-form-item>
378 + </el-col>
379 + </el-row>
380 + </el-form>
187 </div> 381 </div>
188 </section> 382 </section>
189 <!-- 没有数据时 --> 383 <!-- 没有数据时 -->
190 <div class="no-data" v-else> 384 <div class="no-data" v-else>
191 <el-empty description="未设置规则！"> 385 <el-empty description="未设置规则！">
192 - <el-button type="primary" size="small" @click="addRouteRule(index)">新增规则</el-button> 386 + <el-button
387 + type="primary"
388 + size="small"
389 + @click="addRouteRule(index)"
390 + >新增规则</el-button
391 + >
193 </el-empty> 392 </el-empty>
194 </div> 393 </div>
195 </el-card> 394 </el-card>
...@@ -202,41 +401,50 @@ ...@@ -202,41 +401,50 @@
202 export default { 401 export default {
203 name: "routeInfo", 402 name: "routeInfo",
204 props: { 403 props: {
205 - routesInfo: { // 航线规则信息 404 + routesInfo: {
405 + // 航线规则信息
206 type: Array, 406 type: Array,
207 - default: () => [] 407 + default: () => [],
208 }, 408 },
209 - cargoType: { // 申报类别 409 + cargoType: {
410 + // 申报类别
210 type: Array, 411 type: Array,
211 - default: () => [] 412 + default: () => [],
212 }, 413 },
213 - cargoStatus: { // 货物类型 414 + cargoStatus: {
415 + // 货物类型
214 type: Array, 416 type: Array,
215 - default: () => [] 417 + default: () => [],
216 }, 418 },
217 - puporpux: { // 取件扫描号 419 + puporpux: {
420 + // 取件扫描号
218 type: Array, 421 type: Array,
219 - default: () => [] 422 + default: () => [],
220 }, 423 },
221 - serviceCode: { // Service Code 424 + serviceCode: {
425 + // Service Code
222 type: Array, 426 type: Array,
223 - default: () => [] 427 + default: () => [],
224 }, 428 },
225 - handlingCode: { // Handling Code 429 + handlingCode: {
430 + // Handling Code
226 type: Array, 431 type: Array,
227 - default: () => [] 432 + default: () => [],
228 }, 433 },
229 - subCategory: { // Sub Category 434 + subCategory: {
435 + // Sub Category
230 type: Array, 436 type: Array,
231 - default: () => [] 437 + default: () => [],
232 }, 438 },
233 }, 439 },
234 data() { 440 data() {
235 - return {}; 441 + return {
442 + activeNames: [0], // 展开指定项
443 + };
236 }, 444 },
237 computed: {}, 445 computed: {},
238 - created() { }, 446 + created() {},
239 - mounted() { }, 447 + mounted() {},
240 methods: { 448 methods: {
241 // 当前激活面板改变时触发 449 // 当前激活面板改变时触发
242 collapseChange(name) { 450 collapseChange(name) {
...@@ -277,19 +485,36 @@ export default { ...@@ -277,19 +485,36 @@ export default {
277 // 新增规则 485 // 新增规则
278 addRouteRule(index) { 486 addRouteRule(index) {
279 this.$emit("addRlue", index); 487 this.$emit("addRlue", index);
280 - } 488 + },
281 }, 489 },
282 }; 490 };
283 </script> 491 </script>
284 -<style lang='scss'> 492 +<style lang="scss">
493 +.el-collapse-item__header {
494 + background-color: #d9ecff !important;
495 + border-bottom: 1px solid #ccc;
496 + padding-left: 40px;
497 +}
498 +
285 .route-container { 499 .route-container {
500 + strong {
501 + font-size: 14px;
502 + }
503 +
286 .route-info { 504 .route-info {
287 .route-info-card { 505 .route-info-card {
288 - .route-config-header { 506 + section {
289 - .flight-route-title {} 507 + padding: 12px 70px;
508 +
509 + .route-config-header {
510 + .flight-route-title {
511 + margin-left: 8px;
512 + }
513 + }
290 } 514 }
291 515
292 - .route-config-info {} 516 + .route-config-info {
517 + }
293 } 518 }
294 } 519 }
295 } 520 }
......
...@@ -2,8 +2,8 @@ export const formConfig = [ ...@@ -2,8 +2,8 @@ export const formConfig = [
2 { 2 {
3 label: "航班号", 3 label: "航班号",
4 type: "Input", 4 type: "Input",
5 - name: "fltNo", 5 + name: "purposeOfFlightNo",
6 - prop: "fltNo", 6 + prop: "purposeOfFlightNo",
7 placeholder: "请输入航班号", 7 placeholder: "请输入航班号",
8 span: 5, 8 span: 5,
9 trigger: "blur", 9 trigger: "blur",
...@@ -12,8 +12,8 @@ export const formConfig = [ ...@@ -12,8 +12,8 @@ export const formConfig = [
12 { 12 {
13 label: "航班日期", 13 label: "航班日期",
14 type: "Date", 14 type: "Date",
15 - name: "startTime", 15 + name: "flightDate",
16 - prop: "startTime", 16 + prop: "flightDate",
17 placeholder: "请选择航班日期", 17 placeholder: "请选择航班日期",
18 format: "yyyy-MM-dd", 18 format: "yyyy-MM-dd",
19 colWidth: "23%", 19 colWidth: "23%",
...@@ -22,8 +22,8 @@ export const formConfig = [ ...@@ -22,8 +22,8 @@ export const formConfig = [
22 { 22 {
23 label: "航线", 23 label: "航线",
24 type: "Input", 24 type: "Input",
25 - name: "route", 25 + name: "flightRoute",
26 - prop: "route", 26 + prop: "flightRoute",
27 placeholder: "", 27 placeholder: "",
28 span: 5, 28 span: 5,
29 labelWidth: "40px", 29 labelWidth: "40px",
...@@ -42,21 +42,22 @@ export const formConfig = [ ...@@ -42,21 +42,22 @@ export const formConfig = [
42 ]; 42 ];
43 // 航线规则表单 43 // 航线规则表单
44 export const routeRuleForm = { 44 export const routeRuleForm = {
45 + config: true,
45 flightRoute: "", // 飞行航线 46 flightRoute: "", // 飞行航线
46 - location: "", // 包含始发站 47 + location: null, // 包含始发站
47 - notLocation: "", // 不包含始发站 48 + notLocation: null, // 不包含始发站
48 - destinationSite: "", // 包含目的站 49 + destinationSite: null, // 包含目的站
49 - notDestinationSite: "", // 不包含目的站 50 + notDestinationSite: null, // 不包含目的站
50 includeUrsa: "", // URSA包含 51 includeUrsa: "", // URSA包含
51 notIncludeUrsa: "", // URSA不包含 52 notIncludeUrsa: "", // URSA不包含
52 minNumOfPieces: "", // 最小件数 53 minNumOfPieces: "", // 最小件数
53 maxNumOfPieces: "", // 最大件数 54 maxNumOfPieces: "", // 最大件数
54 minWeight: "", // 最小重量 55 minWeight: "", // 最小重量
55 maxWeight: "", // 最大重量 56 maxWeight: "", // 最大重量
56 - typeOfGoods: "", // 申报类别 57 + typeOfGoods: [], // 申报类别
57 - cargoType: "", // 货物类型 58 + cargoType: [], // 货物类型
58 - puporpuxCode: "", // 取件扫描号 59 + puporpuxCode: [], // 取件扫描号
59 - serviceCode: "", // Service Code 60 + serviceCode: [], // Service Code
60 - handlingCode: "", // Handling Code 61 + handlingCode: [], // Handling Code
61 - subCategory: "", // Sub Category 62 + subCategory: [], // Sub Category
62 -} 63 +};
......
1 -export const routeData = { 1 +export const routeData1 = {
2 code: 200, 2 code: 200,
3 msg: "操作成功", 3 msg: "操作成功",
4 data: { 4 data: {
5 list: [ 5 list: [
6 { 6 {
7 - id: 3022, 7 + id: 3337,
8 - createTime: "2023-09-14 16:00:18", 8 + createTime: "2023-09-21 09:50:01",
9 - createUserId: "5750", 9 + createUserId: "5749",
10 - createUserName: "ysy", 10 + createUserName: "wjh",
11 - updateTime: "2023-09-20 18:24:47", 11 + updateTime: null,
12 - updateUserName: "ysy", 12 + updateUserName: null,
13 - purposeOfFlightNo: "LK001", 13 + purposeOfFlightNo: "JC001",
14 - location: "AAE;AB5;AB4;AB1",
15 - includeUrsa: "P_",
16 - notIncludeUrsa: "P4;P5;P6",
17 - minNumOfPieces: null,
18 - maxNumOfPieces: 10,
19 - minWeight: 6,
20 - maxWeight: 25,
21 - serviceCode: "FICP;FO;IED;IPE;IPF",
22 - declarationCategory: null,
23 - typeOfGoods: "D;C",
24 - subCategory: "Blank;Bond;BSO",
25 - status: "1",
26 - whetherHistory: "0",
27 - historyId: null,
28 - updateUserId: 5750,
29 - notLocation: null,
30 - handlingCode: "BLANK;ABC;CHM;DG",
31 - portName: "PVG",
32 - puporpuxCode: "PUP;BLANK;PUX46",
33 - flightRoute: "SZX",
34 - routePriority: "2",
35 - ruleDate: null,
36 - routeSpecifyDateSeq: "TSN;SZX;CAN;CAN-PVG",
37 - destinationSite: null,
38 - notDestinationSite: "91A;84A;ZWO;ZYIA",
39 - },
40 - {
41 - id: 3267,
42 - createTime: "2023-09-19 15:23:53",
43 - createUserId: "5750",
44 - createUserName: "ysy",
45 - updateTime: "2023-09-20 18:24:47",
46 - updateUserName: "ysy",
47 - purposeOfFlightNo: "LK001",
48 location: null, 14 location: null,
49 includeUrsa: "P_", 15 includeUrsa: "P_",
50 - notIncludeUrsa: "P5;P6;P7", 16 + notIncludeUrsa: null,
51 - minNumOfPieces: 3, 17 + minNumOfPieces: null,
52 maxNumOfPieces: null, 18 maxNumOfPieces: null,
53 minWeight: null, 19 minWeight: null,
54 maxWeight: null, 20 maxWeight: null,
55 - serviceCode: "ces0193;FICP;FO;IE;IED", 21 + serviceCode: null,
56 declarationCategory: null, 22 declarationCategory: null,
57 - typeOfGoods: "D", 23 + typeOfGoods: null,
58 - subCategory: "Blank;Bond;BSO", 24 + subCategory: null,
59 status: "1", 25 status: "1",
60 whetherHistory: "0", 26 whetherHistory: "0",
61 - historyId: "3266", 27 + historyId: null,
62 - updateUserId: 5750, 28 + updateUserId: null,
63 notLocation: null, 29 notLocation: null,
64 - handlingCode: "BLANK;ABC;BON;CHM", 30 + handlingCode: null,
65 portName: "PVG", 31 portName: "PVG",
66 - puporpuxCode: "POM01;POM03;PUP;POM02;PUX46", 32 + puporpuxCode: null,
67 - flightRoute: "CAN", 33 + flightRoute: "USA",
68 - routePriority: "3", 34 + routePriority: "1",
69 - ruleDate: null, 35 + ruleDate: "2023-09-21",
70 - routeSpecifyDateSeq: "TSN;SZX;CAN;CAN-PVG", 36 + routeSpecifyDateSeq: "USA;SEYB",
71 destinationSite: null, 37 destinationSite: null,
72 notDestinationSite: null, 38 notDestinationSite: null,
73 }, 39 },
74 { 40 {
75 - id: 3023, 41 + id: 3338,
76 - createTime: "2023-09-14 16:05:56", 42 + createTime: "2023-09-21 09:50:03",
77 - createUserId: "5750", 43 + createUserId: "5749",
78 - createUserName: "ysy", 44 + createUserName: "wjh",
79 - updateTime: "2023-09-20 18:24:47", 45 + updateTime: null,
80 - updateUserName: "ysy", 46 + updateUserName: null,
81 - purposeOfFlightNo: "LK001", 47 + purposeOfFlightNo: "JC001",
82 location: null, 48 location: null,
83 - includeUrsa: "P_;W_", 49 + includeUrsa: "P_",
84 - notIncludeUrsa: "P1;P7;P6", 50 + notIncludeUrsa: null,
85 - minNumOfPieces: 5, 51 + minNumOfPieces: null,
86 maxNumOfPieces: null, 52 maxNumOfPieces: null,
87 - minWeight: 10, 53 + minWeight: null,
88 - maxWeight: 30, 54 + maxWeight: null,
89 - serviceCode: "FO;IE", 55 + serviceCode: null,
90 declarationCategory: null, 56 declarationCategory: null,
91 typeOfGoods: null, 57 typeOfGoods: null,
92 subCategory: null, 58 subCategory: null,
93 status: "1", 59 status: "1",
94 whetherHistory: "0", 60 whetherHistory: "0",
95 historyId: null, 61 historyId: null,
96 - updateUserId: 5750, 62 + updateUserId: null,
97 - notLocation: "SHAA;KCAA", 63 + notLocation: null,
98 - handlingCode: "ABC;BON;KMW1", 64 + handlingCode: null,
99 portName: "PVG", 65 portName: "PVG",
100 - puporpuxCode: "POM01;POM03;PUP;PUX46;PUX79", 66 + puporpuxCode: null,
101 - flightRoute: "TSN", 67 + flightRoute: "SEYB",
102 - routePriority: "1", 68 + routePriority: "2",
103 - ruleDate: null, 69 + ruleDate: "2023-09-21",
104 - routeSpecifyDateSeq: "TSN;SZX;CAN;CAN-PVG", 70 + routeSpecifyDateSeq: "USA;SEYB",
105 destinationSite: null, 71 destinationSite: null,
106 - notDestinationSite: "PEK;PVG", 72 + notDestinationSite: null,
107 }, 73 },
108 ], 74 ],
109 routeList: [ 75 routeList: [
110 { 76 {
111 - fltNo: "LK001", 77 + fltNo: "JC001",
112 - route: "TSN", 78 + route: "USA",
113 routePriority: "1", 79 routePriority: "1",
114 }, 80 },
115 { 81 {
116 - fltNo: "LK001", 82 + fltNo: "JC001",
117 - route: "SZX", 83 + route: "SEYB",
118 routePriority: "2", 84 routePriority: "2",
119 }, 85 },
120 - {
121 - fltNo: "LK001",
122 - route: "CAN",
123 - routePriority: "3",
124 - },
125 - {
126 - fltNo: "LK001",
127 - route: "CAN-PVG",
128 - routePriority: "4",
129 - },
130 ], 86 ],
131 }, 87 },
132 }; 88 };
133 89
134 -export const routeInfo = { 90 +export const routeData2 = {
135 code: 200, 91 code: 200,
136 msg: "操作成功", 92 msg: "操作成功",
137 data: { 93 data: {
138 - cargoType: [ 94 + list: [
139 - {
140 - id: 83944,
141 - code: "cargoType10",
142 - chineseName: "A",
143 - englishName: "A",
144 - description: "A",
145 - status: 1,
146 - dictId: 50125,
147 - dictCode: "cargoType",
148 - parentId: null,
149 - ext1: 84010,
150 - ext2: null,
151 - ext3: null,
152 - ordinal: 10,
153 - ext4: null,
154 - ext5: null,
155 - ext6: null,
156 - },
157 - {
158 - id: 83945,
159 - code: "cargoType20",
160 - chineseName: "B",
161 - englishName: "B",
162 - description: "B",
163 - status: 1,
164 - dictId: 50125,
165 - dictCode: "cargoType",
166 - parentId: null,
167 - ext1: null,
168 - ext2: null,
169 - ext3: null,
170 - ordinal: 20,
171 - ext4: null,
172 - ext5: null,
173 - ext6: null,
174 - },
175 - {
176 - id: 83946,
177 - code: "cargoType30",
178 - chineseName: "C",
179 - englishName: "C",
180 - description: "C",
181 - status: 1,
182 - dictId: 50125,
183 - dictCode: "cargoType",
184 - parentId: null,
185 - ext1: 84011,
186 - ext2: null,
187 - ext3: null,
188 - ordinal: 30,
189 - ext4: null,
190 - ext5: null,
191 - ext6: null,
192 - },
193 - {
194 - id: 83947,
195 - code: "cargoType40",
196 - chineseName: "D",
197 - englishName: "D",
198 - description: "D",
199 - status: 1,
200 - dictId: 50125,
201 - dictCode: "cargoType",
202 - parentId: null,
203 - ext1: 84009,
204 - ext2: null,
205 - ext3: null,
206 - ordinal: 40,
207 - ext4: null,
208 - ext5: null,
209 - ext6: null,
210 - },
211 - ],
212 - subCategory: [
213 - {
214 - id: 107980,
215 - code: "subCategory40",
216 - chineseName: "Blank",
217 - englishName: "Blank",
218 - description: "blank",
219 - status: 1,
220 - dictId: 60230,
221 - dictCode: "subCategory",
222 - parentId: null,
223 - ext1: null,
224 - ext2: null,
225 - ext3: null,
226 - ordinal: 1,
227 - ext4: null,
228 - ext5: null,
229 - ext6: null,
230 - },
231 - {
232 - id: 108696,
233 - code: "subCategory60",
234 - chineseName: "98563",
235 - englishName: null,
236 - description: null,
237 - status: 0,
238 - dictId: 60230,
239 - dictCode: "subCategory",
240 - parentId: null,
241 - ext1: null,
242 - ext2: null,
243 - ext3: null,
244 - ordinal: 2,
245 - ext4: null,
246 - ext5: null,
247 - ext6: null,
248 - },
249 - {
250 - id: 107978,
251 - code: "subCategory20",
252 - chineseName: "Bond",
253 - englishName: "Bond",
254 - description: "bond",
255 - status: 1,
256 - dictId: 60230,
257 - dictCode: "subCategory",
258 - parentId: null,
259 - ext1: null,
260 - ext2: null,
261 - ext3: null,
262 - ordinal: 3,
263 - ext4: null,
264 - ext5: null,
265 - ext6: null,
266 - },
267 - {
268 - id: 107977,
269 - code: "subCategory10",
270 - chineseName: "BSO",
271 - englishName: "BSO",
272 - description: "BSO",
273 - status: 1,
274 - dictId: 60230,
275 - dictCode: "subCategory",
276 - parentId: null,
277 - ext1: null,
278 - ext2: null,
279 - ext3: null,
280 - ordinal: 4,
281 - ext4: null,
282 - ext5: null,
283 - ext6: null,
284 - },
285 - {
286 - id: 108735,
287 - code: "subCategory70",
288 - chineseName: "cecececececececececec",
289 - englishName: "cecececececececececec",
290 - description: null,
291 - status: 1,
292 - dictId: 60230,
293 - dictCode: "subCategory",
294 - parentId: null,
295 - ext1: null,
296 - ext2: null,
297 - ext3: null,
298 - ordinal: 5,
299 - ext4: null,
300 - ext5: null,
301 - ext6: null,
302 - },
303 - {
304 - id: 107979,
305 - code: "subCategory30",
306 - chineseName: "Ecommerce",
307 - englishName: "Ecommerce",
308 - description: "ecommerce",
309 - status: 1,
310 - dictId: 60230,
311 - dictCode: "subCategory",
312 - parentId: null,
313 - ext1: null,
314 - ext2: null,
315 - ext3: null,
316 - ordinal: 6,
317 - ext4: null,
318 - ext5: null,
319 - ext6: null,
320 - },
321 - {
322 - id: 108290,
323 - code: "subCategory50",
324 - chineseName: "KMW5",
325 - englishName: "KMW5",
326 - description: "KMW5",
327 - status: 0,
328 - dictId: 60230,
329 - dictCode: "subCategory",
330 - parentId: null,
331 - ext1: null,
332 - ext2: null,
333 - ext3: null,
334 - ordinal: 7,
335 - ext4: null,
336 - ext5: null,
337 - ext6: null,
338 - },
339 - {
340 - id: 108858,
341 - code: "subCategory100",
342 - chineseName: "TEsT",
343 - englishName: "TEsT",
344 - description: null,
345 - status: 1,
346 - dictId: 60230,
347 - dictCode: "subCategory",
348 - parentId: null,
349 - ext1: null,
350 - ext2: null,
351 - ext3: null,
352 - ordinal: 8,
353 - ext4: null,
354 - ext5: null,
355 - ext6: null,
356 - },
357 - {
358 - id: 108808,
359 - code: "subCategory90",
360 - chineseName: "testtesttest",
361 - englishName: "testtesttest",
362 - description: null,
363 - status: 1,
364 - dictId: 60230,
365 - dictCode: "subCategory",
366 - parentId: null,
367 - ext1: null,
368 - ext2: null,
369 - ext3: null,
370 - ordinal: 9,
371 - ext4: null,
372 - ext5: null,
373 - ext6: null,
374 - },
375 - {
376 - id: 108807,
377 - code: "subCategory80",
378 - chineseName: "testtesttesttesttesttesttesttesttesttesttesttestte",
379 - englishName: "testtesttesttesttesttesttesttesttesttesttesttestte",
380 - description: null,
381 - status: 1,
382 - dictId: 60230,
383 - dictCode: "subCategory",
384 - parentId: null,
385 - ext1: null,
386 - ext2: null,
387 - ext3: null,
388 - ordinal: 10,
389 - ext4: null,
390 - ext5: null,
391 - ext6: null,
392 - },
393 - ],
394 - cargoStatus: [
395 - {
396 - id: 107776,
397 - code: "cargoStatus200",
398 - chineseName: "海关查验货",
399 - englishName: "海关查验货",
400 - description: "海关查验货",
401 - status: 1,
402 - dictId: 50127,
403 - dictCode: "cargoStatus",
404 - parentId: null,
405 - ext1: null,
406 - ext2: null,
407 - ext3: null,
408 - ordinal: 21,
409 - ext4: 1,
410 - ext5: null,
411 - ext6: null,
412 - },
413 - {
414 - id: 107777,
415 - code: "cargoStatus210",
416 - chineseName: "海关退单货",
417 - englishName: "海关退单货",
418 - description: "海关退单货",
419 - status: 1,
420 - dictId: 50127,
421 - dictCode: "cargoStatus",
422 - parentId: null,
423 - ext1: null,
424 - ext2: null,
425 - ext3: null,
426 - ordinal: 22,
427 - ext4: 1,
428 - ext5: null,
429 - ext6: null,
430 - },
431 - {
432 - id: 107778,
433 - code: "cargoStatus220",
434 - chineseName: "退回货",
435 - englishName: "退回货",
436 - description: "退回货",
437 - status: 1,
438 - dictId: 50127,
439 - dictCode: "cargoStatus",
440 - parentId: null,
441 - ext1: null,
442 - ext2: null,
443 - ext3: null,
444 - ordinal: 23,
445 - ext4: 1,
446 - ext5: null,
447 - ext6: null,
448 - },
449 - {
450 - id: 107779,
451 - code: "cargoStatus230",
452 - chineseName: "扣关货",
453 - englishName: "扣关货",
454 - description: "扣关货",
455 - status: 1,
456 - dictId: 50127,
457 - dictCode: "cargoStatus",
458 - parentId: null,
459 - ext1: null,
460 - ext2: null,
461 - ext3: null,
462 - ordinal: 24,
463 - ext4: 1,
464 - ext5: null,
465 - ext6: null,
466 - },
467 - {
468 - id: 107780,
469 - code: "cargoStatus240",
470 - chineseName: "报关货",
471 - englishName: "报关货",
472 - description: "报关货",
473 - status: 1,
474 - dictId: 50127,
475 - dictCode: "cargoStatus",
476 - parentId: null,
477 - ext1: null,
478 - ext2: null,
479 - ext3: null,
480 - ordinal: 25,
481 - ext4: 1,
482 - ext5: null,
483 - ext6: null,
484 - },
485 - {
486 - id: 107781,
487 - code: "cargoStatus250",
488 - chineseName: "爆仓货",
489 - englishName: "爆仓货",
490 - description: "爆仓货",
491 - status: 1,
492 - dictId: 50127,
493 - dictCode: "cargoStatus",
494 - parentId: null,
495 - ext1: null,
496 - ext2: null,
497 - ext3: null,
498 - ordinal: 26,
499 - ext4: 1,
500 - ext5: null,
501 - ext6: null,
502 - },
503 - {
504 - id: 107782,
505 - code: "cargoStatus260",
506 - chineseName: "新鲜货",
507 - englishName: "新鲜货",
508 - description: "新鲜货",
509 - status: 1,
510 - dictId: 50127,
511 - dictCode: "cargoStatus",
512 - parentId: null,
513 - ext1: null,
514 - ext2: null,
515 - ext3: null,
516 - ordinal: 27,
517 - ext4: 1,
518 - ext5: null,
519 - ext6: null,
520 - },
521 - {
522 - id: 107964,
523 - code: "cargoStatus280",
524 - chineseName: "海关放行",
525 - englishName: "海关放行",
526 - description: "海关放行",
527 - status: 1,
528 - dictId: 50127,
529 - dictCode: "cargoStatus",
530 - parentId: null,
531 - ext1: null,
532 - ext2: null,
533 - ext3: null,
534 - ordinal: 29,
535 - ext4: 1,
536 - ext5: null,
537 - ext6: null,
538 - },
539 - ],
540 - serviceCode: [
541 - {
542 - id: 108298,
543 - code: "serviceCode12",
544 - chineseName: "CESHI",
545 - englishName: "CESHI",
546 - description: "CESHI",
547 - status: 1,
548 - dictId: 60189,
549 - dictCode: "serviceCode",
550 - parentId: null,
551 - ext1: null,
552 - ext2: null,
553 - ext3: null,
554 - ordinal: 4,
555 - ext4: null,
556 - ext5: null,
557 - ext6: null,
558 - },
559 - {
560 - id: 108289,
561 - code: "serviceCode10",
562 - chineseName: "CHESHI",
563 - englishName: "CHESHI",
564 - description: "测试",
565 - status: 1,
566 - dictId: 60189,
567 - dictCode: "serviceCode",
568 - parentId: null,
569 - ext1: null,
570 - ext2: null,
571 - ext3: null,
572 - ordinal: 6,
573 - ext4: null,
574 - ext5: null,
575 - ext6: null,
576 - },
577 - {
578 - id: 108198,
579 - code: "serviceCode8",
580 - chineseName: "FICP",
581 - englishName: "FICP",
582 - description: "FICP",
583 - status: 1,
584 - dictId: 60189,
585 - dictCode: "serviceCode",
586 - parentId: null,
587 - ext1: null,
588 - ext2: null,
589 - ext3: null,
590 - ordinal: 7,
591 - ext4: null,
592 - ext5: null,
593 - ext6: null,
594 - },
595 - {
596 - id: 108195,
597 - code: "serviceCode5",
598 - chineseName: "FO",
599 - englishName: "FO",
600 - description: "FO",
601 - status: 1,
602 - dictId: 60189,
603 - dictCode: "serviceCode",
604 - parentId: null,
605 - ext1: null,
606 - ext2: null,
607 - ext3: null,
608 - ordinal: 8,
609 - ext4: null,
610 - ext5: null,
611 - ext6: null,
612 - },
613 - {
614 - id: 108196,
615 - code: "serviceCode6",
616 - chineseName: "IE",
617 - englishName: "IE",
618 - description: "IE",
619 - status: 1,
620 - dictId: 60189,
621 - dictCode: "serviceCode",
622 - parentId: null,
623 - ext1: null,
624 - ext2: null,
625 - ext3: null,
626 - ordinal: 9,
627 - ext4: null,
628 - ext5: null,
629 - ext6: null,
630 - },
631 - {
632 - id: 108191,
633 - code: "serviceCode1",
634 - chineseName: "IED",
635 - englishName: "IED",
636 - description: "IED",
637 - status: 1,
638 - dictId: 60189,
639 - dictCode: "serviceCode",
640 - parentId: null,
641 - ext1: null,
642 - ext2: null,
643 - ext3: null,
644 - ordinal: 10,
645 - ext4: null,
646 - ext5: null,
647 - ext6: null,
648 - },
649 - {
650 - id: 108194,
651 - code: "serviceCode4",
652 - chineseName: "IEF",
653 - englishName: "IEF",
654 - description: "IEF",
655 - status: 1,
656 - dictId: 60189,
657 - dictCode: "serviceCode",
658 - parentId: null,
659 - ext1: null,
660 - ext2: null,
661 - ext3: null,
662 - ordinal: 11,
663 - ext4: null,
664 - ext5: null,
665 - ext6: null,
666 - },
667 - {
668 - id: 108197,
669 - code: "serviceCode7",
670 - chineseName: "IP",
671 - englishName: "IP",
672 - description: "IP",
673 - status: 1,
674 - dictId: 60189,
675 - dictCode: "serviceCode",
676 - parentId: null,
677 - ext1: null,
678 - ext2: null,
679 - ext3: null,
680 - ordinal: 12,
681 - ext4: null,
682 - ext5: null,
683 - ext6: null,
684 - },
685 - {
686 - id: 108192,
687 - code: "serviceCode2",
688 - chineseName: "IPD",
689 - englishName: "IPD",
690 - description: "IPD",
691 - status: 1,
692 - dictId: 60189,
693 - dictCode: "serviceCode",
694 - parentId: null,
695 - ext1: null,
696 - ext2: null,
697 - ext3: null,
698 - ordinal: 13,
699 - ext4: null,
700 - ext5: null,
701 - ext6: null,
702 - },
703 - {
704 - id: 108199,
705 - code: "serviceCode9",
706 - chineseName: "IPE",
707 - englishName: "IPE",
708 - description: "IPE",
709 - status: 1,
710 - dictId: 60189,
711 - dictCode: "serviceCode",
712 - parentId: null,
713 - ext1: null,
714 - ext2: null,
715 - ext3: null,
716 - ordinal: 14,
717 - ext4: null,
718 - ext5: null,
719 - ext6: null,
720 - },
721 - {
722 - id: 108193,
723 - code: "serviceCode3",
724 - chineseName: "IPF",
725 - englishName: "IPF",
726 - description: "IPF",
727 - status: 1,
728 - dictId: 60189,
729 - dictCode: "serviceCode",
730 - parentId: null,
731 - ext1: null,
732 - ext2: null,
733 - ext3: null,
734 - ordinal: 15,
735 - ext4: null,
736 - ext5: null,
737 - ext6: null,
738 - },
739 - {
740 - id: 108368,
741 - code: "serviceCode14",
742 - chineseName: "ce321",
743 - englishName: "ce321",
744 - description: null,
745 - status: 1,
746 - dictId: 60189,
747 - dictCode: "serviceCode",
748 - parentId: null,
749 - ext1: null,
750 - ext2: null,
751 - ext3: null,
752 - ordinal: 1,
753 - ext4: null,
754 - ext5: null,
755 - ext6: null,
756 - },
757 - {
758 - id: 108369,
759 - code: "serviceCode15",
760 - chineseName: "ces0193",
761 - englishName: "ces0193",
762 - description: "ces0193",
763 - status: 1,
764 - dictId: 60189,
765 - dictCode: "serviceCode",
766 - parentId: null,
767 - ext1: null,
768 - ext2: null,
769 - ext3: null,
770 - ordinal: 2,
771 - ext4: null,
772 - ext5: null,
773 - ext6: null,
774 - },
775 - {
776 - id: 108367,
777 - code: "serviceCode13",
778 - chineseName: "ces1234",
779 - englishName: "ces1234",
780 - description: "ces1234",
781 - status: 1,
782 - dictId: 60189,
783 - dictCode: "serviceCode",
784 - parentId: null,
785 - ext1: null,
786 - ext2: null,
787 - ext3: null,
788 - ordinal: 3,
789 - ext4: null,
790 - ext5: null,
791 - ext6: null,
792 - },
793 - ],
794 - handlingCode: [
795 - {
796 - id: 108091,
797 - code: "handlingCode40",
798 - chineseName: "ABC",
799 - englishName: "ABC",
800 - description: "ABC",
801 - status: 1,
802 - dictId: 60349,
803 - dictCode: "handlingCode",
804 - parentId: null,
805 - ext1: null,
806 - ext2: null,
807 - ext3: null,
808 - ordinal: 2,
809 - ext4: null,
810 - ext5: null,
811 - ext6: null,
812 - },
813 - {
814 - id: 108093,
815 - code: "handlingCode60",
816 - chineseName: "BLANK",
817 - englishName: "BLANK",
818 - description: "BLANK",
819 - status: 1,
820 - dictId: 60349,
821 - dictCode: "handlingCode",
822 - parentId: null,
823 - ext1: null,
824 - ext2: null,
825 - ext3: null,
826 - ordinal: 1,
827 - ext4: null,
828 - ext5: null,
829 - ext6: null,
830 - },
831 - {
832 - id: 108090,
833 - code: "handlingCode30",
834 - chineseName: "BON",
835 - englishName: "BON",
836 - description: "BON",
837 - status: 1,
838 - dictId: 60349,
839 - dictCode: "handlingCode",
840 - parentId: null,
841 - ext1: null,
842 - ext2: null,
843 - ext3: null,
844 - ordinal: 3,
845 - ext4: null,
846 - ext5: null,
847 - ext6: null,
848 - },
849 - {
850 - id: 108656,
851 - code: "handlingCode100",
852 - chineseName: "CES01;CES02",
853 - englishName: "CES01;CES02",
854 - description: "CES01;CES02",
855 - status: 0,
856 - dictId: 60349,
857 - dictCode: "handlingCode",
858 - parentId: null,
859 - ext1: null,
860 - ext2: null,
861 - ext3: null,
862 - ordinal: 5,
863 - ext4: null,
864 - ext5: null,
865 - ext6: null,
866 - },
867 - {
868 - id: 108657,
869 - code: "handlingCode110",
870 - chineseName: "CES03",
871 - englishName: "CES03",
872 - description: "123",
873 - status: 0,
874 - dictId: 60349,
875 - dictCode: "handlingCode",
876 - parentId: null,
877 - ext1: null,
878 - ext2: null,
879 - ext3: null,
880 - ordinal: 6,
881 - ext4: null,
882 - ext5: null,
883 - ext6: null,
884 - },
885 - {
886 - id: 108088,
887 - code: "handlingCode10",
888 - chineseName: "CHM",
889 - englishName: "CHM",
890 - description: "CHM",
891 - status: 1,
892 - dictId: 60349,
893 - dictCode: "handlingCode",
894 - parentId: null,
895 - ext1: null,
896 - ext2: null,
897 - ext3: null,
898 - ordinal: 11,
899 - ext4: null,
900 - ext5: null,
901 - ext6: null,
902 - },
903 - {
904 - id: 108092,
905 - code: "handlingCode50",
906 - chineseName: "DG",
907 - englishName: "DG",
908 - description: "DG",
909 - status: 1,
910 - dictId: 60349,
911 - dictCode: "handlingCode",
912 - parentId: null,
913 - ext1: null,
914 - ext2: null,
915 - ext3: null,
916 - ordinal: 12,
917 - ext4: null,
918 - ext5: null,
919 - ext6: null,
920 - },
921 - {
922 - id: 108286,
923 - code: "handlingCode70",
924 - chineseName: "KMW1",
925 - englishName: "KMW1",
926 - description: "测试",
927 - status: 1,
928 - dictId: 60349,
929 - dictCode: "handlingCode",
930 - parentId: null,
931 - ext1: null,
932 - ext2: null,
933 - ext3: null,
934 - ordinal: 13,
935 - ext4: null,
936 - ext5: null,
937 - ext6: null,
938 - },
939 - {
940 - id: 108089,
941 - code: "handlingCode20",
942 - chineseName: "O50",
943 - englishName: "O50",
944 - description: "O50",
945 - status: 1,
946 - dictId: 60349,
947 - dictCode: "handlingCode",
948 - parentId: null,
949 - ext1: null,
950 - ext2: null,
951 - ext3: null,
952 - ordinal: 14,
953 - ext4: null,
954 - ext5: null,
955 - ext6: null,
956 - },
957 - {
958 - id: 108324,
959 - code: "handlingCode90",
960 - chineseName: "TEsT",
961 - englishName: "TEST",
962 - description: null,
963 - status: 1,
964 - dictId: 60349,
965 - dictCode: "handlingCode",
966 - parentId: null,
967 - ext1: null,
968 - ext2: null,
969 - ext3: null,
970 - ordinal: 15,
971 - ext4: null,
972 - ext5: null,
973 - ext6: null,
974 - },
975 - {
976 - id: 108876,
977 - code: "handlingCode150",
978 - chineseName: "ces",
979 - englishName: "ces",
980 - description: null,
981 - status: 1,
982 - dictId: 60349,
983 - dictCode: "handlingCode",
984 - parentId: null,
985 - ext1: null,
986 - ext2: null,
987 - ext3: null,
988 - ordinal: 4,
989 - ext4: null,
990 - ext5: null,
991 - ext6: null,
992 - },
993 - {
994 - id: 108976,
995 - code: "handlingCode160",
996 - chineseName: "ces4444",
997 - englishName: "ces4444",
998 - description: null,
999 - status: 0,
1000 - dictId: 60349,
1001 - dictCode: "handlingCode",
1002 - parentId: null,
1003 - ext1: null,
1004 - ext2: null,
1005 - ext3: null,
1006 - ordinal: 7,
1007 - ext4: null,
1008 - ext5: null,
1009 - ext6: null,
1010 - },
1011 - {
1012 - id: 108977,
1013 - code: "handlingCode170",
1014 - chineseName: "cess",
1015 - englishName: "cess",
1016 - description: "cess",
1017 - status: 0,
1018 - dictId: 60349,
1019 - dictCode: "handlingCode",
1020 - parentId: null,
1021 - ext1: null,
1022 - ext2: null,
1023 - ext3: null,
1024 - ordinal: 8,
1025 - ext4: null,
1026 - ext5: null,
1027 - ext6: null,
1028 - },
1029 - {
1030 - id: 108978,
1031 - code: "handlingCode180",
1032 - chineseName: "cesss",
1033 - englishName: "cesss",
1034 - description: "cesss",
1035 - status: 0,
1036 - dictId: 60349,
1037 - dictCode: "handlingCode",
1038 - parentId: null,
1039 - ext1: null,
1040 - ext2: null,
1041 - ext3: null,
1042 - ordinal: 9,
1043 - ext4: null,
1044 - ext5: null,
1045 - ext6: null,
1046 - },
1047 - {
1048 - id: 108979,
1049 - code: "handlingCode190",
1050 - chineseName: "cessss",
1051 - englishName: "cessss",
1052 - description: "cessss",
1053 - status: 0,
1054 - dictId: 60349,
1055 - dictCode: "handlingCode",
1056 - parentId: null,
1057 - ext1: null,
1058 - ext2: null,
1059 - ext3: null,
1060 - ordinal: 10,
1061 - ext4: null,
1062 - ext5: null,
1063 - ext6: null,
1064 - },
1065 - {
1066 - id: 108806,
1067 - code: "handlingCode140",
1068 - chineseName: "testtesttest",
1069 - englishName: "testtesttest",
1070 - description: null,
1071 - status: 1,
1072 - dictId: 60349,
1073 - dictCode: "handlingCode",
1074 - parentId: null,
1075 - ext1: null,
1076 - ext2: null,
1077 - ext3: null,
1078 - ordinal: 16,
1079 - ext4: null,
1080 - ext5: null,
1081 - ext6: null,
1082 - },
1083 - {
1084 - id: 108805,
1085 - code: "handlingCode130",
1086 - chineseName: "testtesttesttesttesttesttesttesttesttesttesttestte",
1087 - englishName: "testtesttesttesttesttesttesttesttesttesttesttestte",
1088 - description: null,
1089 - status: 1,
1090 - dictId: 60349,
1091 - dictCode: "handlingCode",
1092 - parentId: null,
1093 - ext1: null,
1094 - ext2: null,
1095 - ext3: null,
1096 - ordinal: 17,
1097 - ext4: null,
1098 - ext5: null,
1099 - ext6: null,
1100 - },
1101 - {
1102 - id: 108981,
1103 - code: "handlingCode210",
1104 - chineseName: "~PJ200",
1105 - englishName: null,
1106 - description: null,
1107 - status: 1,
1108 - dictId: 60349,
1109 - dictCode: "handlingCode",
1110 - parentId: null,
1111 - ext1: null,
1112 - ext2: null,
1113 - ext3: null,
1114 - ordinal: 18,
1115 - ext4: null,
1116 - ext5: null,
1117 - ext6: null,
1118 - },
1119 - {
1120 - id: 108982,
1121 - code: "handlingCode220",
1122 - chineseName: "~PJ222",
1123 - englishName: null,
1124 - description: null,
1125 - status: 1,
1126 - dictId: 60349,
1127 - dictCode: "handlingCode",
1128 - parentId: null,
1129 - ext1: null,
1130 - ext2: null,
1131 - ext3: null,
1132 - ordinal: 19,
1133 - ext4: null,
1134 - ext5: null,
1135 - ext6: null,
1136 - },
1137 { 95 {
1138 - id: 108980, 96 + id: 3335,
1139 - code: "handlingCode200", 97 + createTime: "2023-09-21 09:49:40",
1140 - chineseName: "~PJ223", 98 + createUserId: "5749",
1141 - englishName: null, 99 + createUserName: "wjh",
1142 - description: null, 100 + updateTime: "2023-09-21 09:56:12",
1143 - status: 1, 101 + updateUserName: "wjh",
1144 - dictId: 60349, 102 + purposeOfFlightNo: "JC001",
1145 - dictCode: "handlingCode", 103 + location: null,
1146 - parentId: null, 104 + includeUrsa: "P_",
1147 - ext1: null, 105 + notIncludeUrsa: null,
1148 - ext2: null, 106 + minNumOfPieces: null,
1149 - ext3: null, 107 + maxNumOfPieces: null,
1150 - ordinal: 20, 108 + minWeight: null,
1151 - ext4: null, 109 + maxWeight: null,
1152 - ext5: null, 110 + serviceCode: null,
1153 - ext6: null, 111 + declarationCategory: null,
112 + typeOfGoods: null,
113 + subCategory: null,
114 + status: "1",
115 + whetherHistory: "0",
116 + historyId: null,
117 + updateUserId: 5749,
118 + notLocation: null,
119 + handlingCode: null,
120 + portName: "PVG",
121 + puporpuxCode: null,
122 + flightRoute: "USA",
123 + routePriority: "1",
124 + ruleDate: null,
125 + routeSpecifyDateSeq: "USA;SEYB;LKE",
126 + destinationSite: null,
127 + notDestinationSite: null,
1154 }, 128 },
1155 { 129 {
1156 - id: 108695, 130 + id: 3336,
1157 - code: "handlingCode120", 131 + createTime: "2023-09-21 09:49:46",
1158 - chineseName: "测试321", 132 + createUserId: "5749",
1159 - englishName: null, 133 + createUserName: "wjh",
1160 - description: null, 134 + updateTime: "2023-09-21 09:56:12",
1161 - status: 0, 135 + updateUserName: "wjh",
1162 - dictId: 60349, 136 + purposeOfFlightNo: "JC001",
1163 - dictCode: "handlingCode", 137 + location: null,
1164 - parentId: null, 138 + includeUrsa: "P_",
1165 - ext1: null, 139 + notIncludeUrsa: null,
1166 - ext2: null, 140 + minNumOfPieces: null,
1167 - ext3: null, 141 + maxNumOfPieces: null,
1168 - ordinal: 21, 142 + minWeight: null,
1169 - ext4: null, 143 + maxWeight: null,
1170 - ext5: null, 144 + serviceCode: null,
1171 - ext6: null, 145 + declarationCategory: null,
146 + typeOfGoods: null,
147 + subCategory: null,
148 + status: "1",
149 + whetherHistory: "0",
150 + historyId: null,
151 + updateUserId: 5749,
152 + notLocation: null,
153 + handlingCode: null,
154 + portName: "PVG",
155 + puporpuxCode: null,
156 + flightRoute: "SEYB",
157 + routePriority: "2",
158 + ruleDate: null,
159 + routeSpecifyDateSeq: "USA;SEYB;LKE",
160 + destinationSite: null,
161 + notDestinationSite: null,
1172 }, 162 },
1173 ], 163 ],
1174 - puporpux: [ 164 + routeList: [
1175 - {
1176 - id: 108575,
1177 - code: "PUPORPUX11",
1178 - chineseName: "POM01",
1179 - englishName: "POM01",
1180 - description: "POM01",
1181 - status: 1,
1182 - dictId: 60389,
1183 - dictCode: "PUPORPUX",
1184 - parentId: null,
1185 - ext1: null,
1186 - ext2: null,
1187 - ext3: null,
1188 - ordinal: 4,
1189 - ext4: null,
1190 - ext5: null,
1191 - ext6: null,
1192 - },
1193 - {
1194 - id: 108576,
1195 - code: "PUPORPUX12",
1196 - chineseName: "POM03",
1197 - englishName: "POM03",
1198 - description: "POM03",
1199 - status: 1,
1200 - dictId: 60389,
1201 - dictCode: "PUPORPUX",
1202 - parentId: null,
1203 - ext1: null,
1204 - ext2: null,
1205 - ext3: null,
1206 - ordinal: 6,
1207 - ext4: null,
1208 - ext5: null,
1209 - ext6: null,
1210 - },
1211 - {
1212 - id: 108498,
1213 - code: "PUPORPUX10",
1214 - chineseName: "QIA33",
1215 - englishName: "QIA33",
1216 - description: "测试",
1217 - status: 0,
1218 - dictId: 60389,
1219 - dictCode: "PUPORPUX",
1220 - parentId: null,
1221 - ext1: null,
1222 - ext2: null,
1223 - ext3: null,
1224 - ordinal: 14,
1225 - ext4: null,
1226 - ext5: null,
1227 - ext6: null,
1228 - },
1229 - {
1230 - id: 108418,
1231 - code: "PUPORPUX7",
1232 - chineseName: "PUP",
1233 - englishName: "PUP",
1234 - description: "PUP",
1235 - status: 1,
1236 - dictId: 60389,
1237 - dictCode: "PUPORPUX",
1238 - parentId: null,
1239 - ext1: null,
1240 - ext2: null,
1241 - ext3: null,
1242 - ordinal: 7,
1243 - ext4: null,
1244 - ext5: null,
1245 - ext6: null,
1246 - },
1247 - {
1248 - id: 108878,
1249 - code: "PUPORPUX16",
1250 - chineseName: "aAAXXX",
1251 - englishName: "aAAXXX",
1252 - description: null,
1253 - status: 1,
1254 - dictId: 60389,
1255 - dictCode: "PUPORPUX",
1256 - parentId: null,
1257 - ext1: null,
1258 - ext2: null,
1259 - ext3: null,
1260 - ordinal: 2,
1261 - ext4: null,
1262 - ext5: null,
1263 - ext6: null,
1264 - },
1265 - {
1266 - id: 108405,
1267 - code: "PUPORPUX1",
1268 - chineseName: "BLANK",
1269 - englishName: "BLANK",
1270 - description: "BLANK",
1271 - status: 1,
1272 - dictId: 60389,
1273 - dictCode: "PUPORPUX",
1274 - parentId: null,
1275 - ext1: null,
1276 - ext2: null,
1277 - ext3: null,
1278 - ordinal: 1,
1279 - ext4: null,
1280 - ext5: null,
1281 - ext6: null,
1282 - },
1283 - {
1284 - id: 108497,
1285 - code: "PUPORPUX9",
1286 - chineseName: "POM02",
1287 - englishName: "POM02",
1288 - description: "测试用",
1289 - status: 1,
1290 - dictId: 60389,
1291 - dictCode: "PUPORPUX",
1292 - parentId: null,
1293 - ext1: null,
1294 - ext2: null,
1295 - ext3: null,
1296 - ordinal: 5,
1297 - ext4: null,
1298 - ext5: null,
1299 - ext6: null,
1300 - },
1301 - {
1302 - id: 108855,
1303 - code: "PUPORPUX15",
1304 - chineseName: "TEsT",
1305 - englishName: "TEsT",
1306 - description: null,
1307 - status: 1,
1308 - dictId: 60389,
1309 - dictCode: "PUPORPUX",
1310 - parentId: null,
1311 - ext1: null,
1312 - ext2: null,
1313 - ext3: null,
1314 - ordinal: 15,
1315 - ext4: null,
1316 - ext5: null,
1317 - ext6: null,
1318 - },
1319 - {
1320 - id: 108496,
1321 - code: "PUPORPUX8",
1322 - chineseName: "POL21",
1323 - englishName: "POL21",
1324 - description: "测试用",
1325 - status: 0,
1326 - dictId: 60389,
1327 - dictCode: "PUPORPUX",
1328 - parentId: null,
1329 - ext1: null,
1330 - ext2: null,
1331 - ext3: null,
1332 - ordinal: 3,
1333 - ext4: null,
1334 - ext5: null,
1335 - ext6: null,
1336 - },
1337 - {
1338 - id: 108615,
1339 - code: "PUPORPUX13",
1340 - chineseName: "QIA1",
1341 - englishName: "QIA1",
1342 - description: null,
1343 - status: 0,
1344 - dictId: 60389,
1345 - dictCode: "PUPORPUX",
1346 - parentId: null,
1347 - ext1: null,
1348 - ext2: null,
1349 - ext3: null,
1350 - ordinal: 13,
1351 - ext4: null,
1352 - ext5: null,
1353 - ext6: null,
1354 - },
1355 - {
1356 - id: 108815,
1357 - code: "PUPORPUX14",
1358 - chineseName: "测试0731",
1359 - englishName: "测试0731",
1360 - description: null,
1361 - status: 1,
1362 - dictId: 60389,
1363 - dictCode: "PUPORPUX",
1364 - parentId: null,
1365 - ext1: null,
1366 - ext2: null,
1367 - ext3: null,
1368 - ordinal: 16,
1369 - ext4: null,
1370 - ext5: null,
1371 - ext6: null,
1372 - },
1373 - {
1374 - id: 108412,
1375 - code: "PUPORPUX2",
1376 - chineseName: "PUX46",
1377 - englishName: "PUX46",
1378 - description: "PUX46",
1379 - status: 1,
1380 - dictId: 60389,
1381 - dictCode: "PUPORPUX",
1382 - parentId: null,
1383 - ext1: null,
1384 - ext2: null,
1385 - ext3: null,
1386 - ordinal: 10,
1387 - ext4: null,
1388 - ext5: null,
1389 - ext6: null,
1390 - },
1391 - {
1392 - id: 108413,
1393 - code: "PUPORPUX3",
1394 - chineseName: "PUX79",
1395 - englishName: "PUX79",
1396 - description: "PUX79",
1397 - status: 1,
1398 - dictId: 60389,
1399 - dictCode: "PUPORPUX",
1400 - parentId: null,
1401 - ext1: null,
1402 - ext2: null,
1403 - ext3: null,
1404 - ordinal: 11,
1405 - ext4: null,
1406 - ext5: null,
1407 - ext6: null,
1408 - },
1409 { 165 {
1410 - id: 108414, 166 + fltNo: "JC001",
1411 - code: "PUPORPUX4", 167 + route: "USA",
1412 - chineseName: "PUX23", 168 + routePriority: "1",
1413 - englishName: "PUX23",
1414 - description: "PUX23",
1415 - status: 1,
1416 - dictId: 60389,
1417 - dictCode: "PUPORPUX",
1418 - parentId: null,
1419 - ext1: null,
1420 - ext2: null,
1421 - ext3: null,
1422 - ordinal: 9,
1423 - ext4: null,
1424 - ext5: null,
1425 - ext6: null,
1426 }, 169 },
1427 { 170 {
1428 - id: 108415, 171 + fltNo: "JC001",
1429 - code: "PUPORPUX5", 172 + route: "SEYB",
1430 - chineseName: "PUX17", 173 + routePriority: "2",
1431 - englishName: "PUX17",
1432 - description: "PUX17",
1433 - status: 1,
1434 - dictId: 60389,
1435 - dictCode: "PUPORPUX",
1436 - parentId: null,
1437 - ext1: null,
1438 - ext2: null,
1439 - ext3: null,
1440 - ordinal: 8,
1441 - ext4: null,
1442 - ext5: null,
1443 - ext6: null,
1444 }, 174 },
1445 { 175 {
1446 - id: 108416, 176 + fltNo: "JC001",
1447 - code: "PUPORPUX6", 177 + route: "LKE",
1448 - chineseName: "PUX86", 178 + routePriority: "3",
1449 - englishName: "PUX86",
1450 - description: "PUX86",
1451 - status: 1,
1452 - dictId: 60389,
1453 - dictCode: "PUPORPUX",
1454 - parentId: null,
1455 - ext1: null,
1456 - ext2: null,
1457 - ext3: null,
1458 - ordinal: 12,
1459 - ext4: null,
1460 - ext5: null,
1461 - ext6: null,
1462 }, 179 },
1463 ], 180 ],
1464 }, 181 },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-col> 5 <el-col>
6 <yl-form ref="ruleForm" :formConfig="formConfig" :queryForm="queryForm" :inline="false" formWidth="auto" 6 <yl-form ref="ruleForm" :formConfig="formConfig" :queryForm="queryForm" :inline="false" formWidth="auto"
7 @blur="blurEvent"> 7 @blur="blurEvent">
8 - <yl-draggable></yl-draggable> 8 + <yl-draggable :routeList="routeList" :dragOptions="dragOptions"></yl-draggable>
9 </yl-form> 9 </yl-form>
10 </el-col> 10 </el-col>
11 </el-row> 11 </el-row>
...@@ -30,7 +30,7 @@ import YlForm from "@/components/YlForm"; ...@@ -30,7 +30,7 @@ import YlForm from "@/components/YlForm";
30 import RouteInfo from "./components/routeInfo"; 30 import RouteInfo from "./components/routeInfo";
31 import YlDraggable from "@/components/YlDraggable"; 31 import YlDraggable from "@/components/YlDraggable";
32 import { formConfig, routeRuleForm } from "./formConfig"; 32 import { formConfig, routeRuleForm } from "./formConfig";
33 -import { removeDuplicates, filterRepeat } from "@/utils" 33 +import { removeDuplicates, filterRepeat } from "@/utils";
34 import { 34 import {
35 allDictData, // 获取全部字典 35 allDictData, // 获取全部字典
36 findDestinationFltRuleByFlightNo, // 航线维度设置详情 36 findDestinationFltRuleByFlightNo, // 航线维度设置详情
...@@ -50,10 +50,17 @@ export default { ...@@ -50,10 +50,17 @@ export default {
50 }, 50 },
51 data() { 51 data() {
52 return { 52 return {
53 + dragOptions: { // 航线优先级拖拽配置
54 + animation: 200,
55 + group: "description",
56 + disabled: false, // 是否禁止拖拽
57 + ghostClass: "ghost"
58 + },
53 formConfig: formConfig, // 表单配置项 59 formConfig: formConfig, // 表单配置项
54 queryForm: { 60 queryForm: {
55 // 表单参数 61 // 表单参数
56 }, 62 },
63 + routeList: [], // 航线
57 routesInfo: [], // 航线规则信息 64 routesInfo: [], // 航线规则信息
58 cargoType: [], // 申报类别 65 cargoType: [], // 申报类别
59 cargoStatus: [], // 货物类型 66 cargoStatus: [], // 货物类型
...@@ -66,7 +73,9 @@ export default { ...@@ -66,7 +73,9 @@ export default {
66 computed: {}, 73 computed: {},
67 created() { 74 created() {
68 this.getAllDictData(); // 获取全部字典 75 this.getAllDictData(); // 获取全部字典
76 + // 查询 & 修改时
69 if (this.$route.query.name == "view" || this.$route.query.name == "edit") { 77 if (this.$route.query.name == "view" || this.$route.query.name == "edit") {
78 + this.queryForm = this.$route.query;
70 let parmas = { 79 let parmas = {
71 flightDate: this.$route.query.flightDate, // 航班日期 80 flightDate: this.$route.query.flightDate, // 航班日期
72 flightRoute: "", // 航线 81 flightRoute: "", // 航线
...@@ -76,13 +85,12 @@ export default { ...@@ -76,13 +85,12 @@ export default {
76 }; 85 };
77 // 日期级别 86 // 日期级别
78 if (this.$route.query.flightDate) { 87 if (this.$route.query.flightDate) {
79 - delete parmas.flightRouteListStr 88 + // delete parmas.flightRouteListStr;
80 - this.getFlightRouteConfigInfoDetail(parmas) 89 + this.getFlightRouteConfigInfoDetail(parmas);
81 } else { 90 } else {
82 // 普通级别 91 // 普通级别
83 - this.getFlightRouteConfigInfoDetail(parmas) 92 + this.getFlightRouteConfigInfoDetail(parmas);
84 } 93 }
85 - console.log(this.$route.query);
86 } 94 }
87 }, 95 },
88 mounted() { }, 96 mounted() { },
...@@ -116,65 +124,119 @@ export default { ...@@ -116,65 +124,119 @@ export default {
116 return; 124 return;
117 } 125 }
118 let routeList1 = data.routeList; // 航班航线基本信息 126 let routeList1 = data.routeList; // 航班航线基本信息
127 + this.routeList = data.routeList;
119 let { flightDate } = parmas; 128 let { flightDate } = parmas;
120 - // 如果是日期级别的再做一次没有日期的查询 129 + /*
130 + 如果是日期级别的再做一次没有日期的查询
131 + 日期级别规则：航线取自己的，但是航线数据如果有取自己的，没有则去拿普通规则的；
132 + */
121 if (flightDate) { 133 if (flightDate) {
122 parmas.flightDate = ""; 134 parmas.flightDate = "";
123 - parmas.flightRouteListStr = "", 135 + findDestinationFltRuleByFlightNo(parmas)
124 - findDestinationFltRuleByFlightNo(parmas).then(response => { 136 + .then((response) => {
125 - if (response.code != 200) { 137 + if (response.code != 200) {
126 - this.msgError(response.msg); 138 + this.msgError(response.msg);
127 - return; 139 + return;
128 - }
129 - let routeList2 = response.data.routeList; // 航班航线基本信息
130 -
131 - /*
132 - 日期级别；
133 - 日期级别只拿日期级别的航线，但是日期级别的航线没有数据则去查询没有日期的航班信息，
134 - 然后拿没有日期的航班维度信息；
135 -
136 - */
137 - // 日期级别航班航线维度规则详情
138 - const dataList1 = removeDuplicates(data.list, {
139 - duplicate: "flightRoute", // 去重字段
140 - sort: false, // 是否要排序
141 - sortType: "Number", // 排序类型
142 - sortAttr: "routePriority", // 排序字段
143 - });
144 - // 普通级别航班航线维度规则详情
145 - const dataList2 = removeDuplicates(response.data.list, {
146 - duplicate: "flightRoute", // 去重字段
147 - sort: false, // 是否要排序
148 - sortType: "Number", // 排序类型
149 - sortAttr: "routePriority", // 排序字段
150 - });
151 - // 先把日期级别的数据合并，然后再对遍历普通级别的dataList2；
152 - // 看看
153 - // console.log(dataList1)
154 - // console.log(dataList2)
155 - const newRouteList1 = routeList1.filter((item, index, array) => {
156 - if(item.route == dataList1.unique[index].flightRoute){
157 - console.log(array)
158 } 140 }
159 - }); 141 + let routeList2 = response.data.routeList; // 航班航线基本信息
160 - console.log(newRouteList1) 142 + // 日期级别航班航线维度规则详情
161 - 143 + const dataList1 = removeDuplicates(data.list, {
162 - }).catch(() => { }); 144 + duplicate: "flightRoute", // 去重字段
145 + sort: false, // 是否要排序
146 + sortType: "Number", // 排序类型
147 + sortAttr: "routePriority", // 排序字段
148 + });
149 + // 普通级别航班航线维度规则详情
150 + const dataList2 = removeDuplicates(response.data.list, {
151 + duplicate: "flightRoute", // 去重字段
152 + sort: false, // 是否要排序
153 + sortType: "Number", // 排序类型
154 + sortAttr: "routePriority", // 排序字段
155 + });
156 + // 【日期规则】
157 + const dateFlightRoute = routeList1.map((item1) => {
158 + const item2 = dataList1.unique.find((item2) => {
159 + if (item2.flightRoute === item1.route) {
160 + item2.config = true;
161 + return item2;
162 + }
163 + }); // 返回当前相等的一条数据
164 + if (item2) {
165 + // 有数据的合并对象，
166 + return { ...item1, ...item2 };
167 + } else {
168 + // 没有数据的去普通航线里查找
169 + const item = dataList2.unique.find((item) => {
170 + if (item.flightRoute === item1.route) {
171 + item.config = true;
172 + return item;
173 + }
174 + });
175 + if (item) {
176 + return { ...item1, ...item }; // 有数据的合并对象，
177 + } else {
178 + item1.config = false;
179 + return item1; // 没有的返回当前的
180 + }
181 + }
182 + });
183 + // 处理属性
184 + dateFlightRoute.map((item) => {
185 + if (item.config) {
186 + this.hasOwnProperty(item, "typeOfGoods");
187 + this.hasOwnProperty(item, "puporpuxCode");
188 + this.hasOwnProperty(item, "serviceCode");
189 + this.hasOwnProperty(item, "handlingCode");
190 + this.hasOwnProperty(item, "subCategory");
191 + this.setattrVal(item) // 设置属性值
192 + }
193 + });
194 + this.routesInfo = dateFlightRoute;
195 + })
196 + .catch(() => { });
163 } 197 }
164 -
165 - // console.log(routeList2);
166 - // 如果当前航班号的航线下没有数据给这个航线在list里面追加一个data属性，值设置为false
167 - // 当点击新增规则按钮往这个routesInfo push数据并且把data属性值设置为true
168 }) 198 })
169 .catch(() => { }); 199 .catch(() => { });
170 }, 200 },
201 + // 判断对象是否存在某个属性，并且把这个属性值使用分号分隔
202 + hasOwnProperty(item, key) {
203 + if (item.hasOwnProperty(key)) {
204 + item[key] = item[key].split(";");
205 + }
206 + },
207 + // 设置属性值
208 + setattrVal(item) {
209 + if (item.location) {
210 + // 始发站
211 + item.isLocation = "1";
212 + }
213 + if (item.notLocation) {
214 + item.isLocation = "2";
215 + }
216 + if (item.location == null && item.notLocation == null) {
217 + item.isLocation = "1";
218 + }
219 + if (item.destinationSite) {
220 + // 目的站
221 + item.isDestinationSite = "1";
222 + }
223 + if (item.notDestinationSite) {
224 + item.isDestinationSite = "2";
225 + }
226 + if (
227 + item.destinationSite == null &&
228 + item.notDestinationSite == null
229 + ) {
230 + item.isDestinationSite = "1";
231 + }
232 + },
171 // 失焦事件 233 // 失焦事件
172 blurEvent({ originOfFlightNo }) { 234 blurEvent({ originOfFlightNo }) {
173 this.queryForm.originOfFlightNo = this.upCase(originOfFlightNo); 235 this.queryForm.originOfFlightNo = this.upCase(originOfFlightNo);
174 }, 236 },
175 // 当前激活面板改变时触发 237 // 当前激活面板改变时触发
176 collapseChange(name) { 238 collapseChange(name) {
177 - console.log(name); 239 + // console.log(name);
178 }, 240 },
179 // 始发站 241 // 始发站
180 changeLocation(val) { 242 changeLocation(val) {
...@@ -211,8 +273,13 @@ export default { ...@@ -211,8 +273,13 @@ export default {
211 // 新增规则 273 // 新增规则
212 addRlue(index) { 274 addRlue(index) {
213 // 如果当前航班号的航线下没有数据给 275 // 如果当前航班号的航线下没有数据给
214 - this.routesInfo.push(routeRuleForm); // 给新增规则赋上默认数据 276 + this.setattrVal(routeRuleForm)
215 - console.log("新增规则：", index); 277 + const mergeObj = {
278 + ...this.routesInfo[index],
279 + ...routeRuleForm
280 + };
281 + this.$set(this.routesInfo, index, mergeObj) // 给新增规则赋上默认数据
282 + console.log("新增规则：", this.routesInfo);
216 }, 283 },
217 }, 284 },
218 }; 285 };
......