Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
f90f4ddd 2 parents d551b56e 0e6ac379

Merge branch 'test' into uat

Inline Side-by-side
Showing 28 changed files with 414 additions and 395 deletions
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
12 } 12 }
13 } 13 }
14 } 14 }
15 -
16 .blue-btn { 15 .blue-btn {
17 @include colorBtn($blue) 16 @include colorBtn($blue)
18 } 17 }
......
1 -@import './variables.scss'; 1 +@import "./variables.scss";
2 -@import './mixin.scss'; 2 +@import "./mixin.scss";
3 -@import './transition.scss'; 3 +@import "./transition.scss";
4 -@import './element-ui.scss'; 4 +@import "./element-ui.scss";
5 -@import './sidebar.scss'; 5 +@import "./sidebar.scss";
6 -@import './btn.scss'; 6 +@import "./btn.scss";
7 7
8 body { 8 body {
9 height: 100%; 9 height: 100%;
10 -moz-osx-font-smoothing: grayscale; 10 -moz-osx-font-smoothing: grayscale;
11 -webkit-font-smoothing: antialiased; 11 -webkit-font-smoothing: antialiased;
12 text-rendering: optimizeLegibility; 12 text-rendering: optimizeLegibility;
13 - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; 13 + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
14 + Microsoft YaHei, Arial, sans-serif;
14 } 15 }
15 16
16 label { 17 label {
...@@ -108,7 +109,8 @@ aside { ...@@ -108,7 +109,8 @@ aside {
108 display: block; 109 display: block;
109 line-height: 32px; 110 line-height: 32px;
110 font-size: 16px; 111 font-size: 16px;
111 - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; 112 + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
113 + Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
112 color: #2c3e50; 114 color: #2c3e50;
113 -webkit-font-smoothing: antialiased; 115 -webkit-font-smoothing: antialiased;
114 -moz-osx-font-smoothing: grayscale; 116 -moz-osx-font-smoothing: grayscale;
...@@ -138,7 +140,7 @@ aside { ...@@ -138,7 +140,7 @@ aside {
138 } 140 }
139 141
140 .text-center { 142 .text-center {
141 - text-align: center 143 + text-align: center;
142 } 144 }
143 145
144 .sub-navbar { 146 .sub-navbar {
...@@ -149,7 +151,13 @@ aside { ...@@ -149,7 +151,13 @@ aside {
149 text-align: right; 151 text-align: right;
150 padding-right: 20px; 152 padding-right: 20px;
151 transition: 600ms ease position; 153 transition: 600ms ease position;
152 - background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); 154 + background: linear-gradient(
155 + 90deg,
156 + rgba(32, 182, 249, 1) 0%,
157 + rgba(32, 182, 249, 1) 0%,
158 + rgba(33, 120, 241, 1) 100%,
159 + rgba(33, 120, 241, 1) 100%
160 + );
153 161
154 .subtitle { 162 .subtitle {
155 font-size: 20px; 163 font-size: 20px;
...@@ -216,7 +224,7 @@ body { ...@@ -216,7 +224,7 @@ body {
216 } 224 }
217 225
218 &::-webkit-scrollbar-track-piece { 226 &::-webkit-scrollbar-track-piece {
219 - background: #F2F6FC; 227 + background: #f2f6fc;
220 } 228 }
221 } 229 }
222 230
...@@ -239,7 +247,7 @@ body { ...@@ -239,7 +247,7 @@ body {
239 .el-table__fixed, 247 .el-table__fixed,
240 .el-table__fixed-right { 248 .el-table__fixed-right {
241 height: calc(100% - 7px) !important; 249 height: calc(100% - 7px) !important;
242 - box-shadow: -5px -2px 10px rgba(0, 0, 0, .12) !important; 250 + box-shadow: -5px -2px 10px rgba(0, 0, 0, 0.12) !important;
243 251
244 .el-table__fixed-body-wrapper { 252 .el-table__fixed-body-wrapper {
245 height: calc(100% - 36px) !important; 253 height: calc(100% - 36px) !important;
...@@ -247,7 +255,7 @@ body { ...@@ -247,7 +255,7 @@ body {
247 } 255 }
248 256
249 // 当表格没有滚动条时 257 // 当表格没有滚动条时
250 -.el-table__body-wrapper.is-scrolling-none~.el-table__fixed-right { 258 +.el-table__body-wrapper.is-scrolling-none ~ .el-table__fixed-right {
251 height: 100% !important; 259 height: 100% !important;
252 bottom: 0 !important; 260 bottom: 0 !important;
253 box-shadow: none !important; 261 box-shadow: none !important;
...@@ -307,4 +315,7 @@ body { ...@@ -307,4 +315,7 @@ body {
307 315
308 .el-select-dropdown__wrap { 316 .el-select-dropdown__wrap {
309 max-height: 350px !important; 317 max-height: 350px !important;
310 -}
...\ No newline at end of file ...\ No newline at end of file
318 +}
319 +.btn-mb-4 {
320 + margin-bottom: 4px;
321 +}
......
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
111 <el-date-picker 111 <el-date-picker
112 v-if="item.type === 'Date'" 112 v-if="item.type === 'Date'"
113 v-model.trim="tempQueryForm[item.prop]" 113 v-model.trim="tempQueryForm[item.prop]"
114 + :style="{ width: item.width }"
114 :disabled="item.disable" 115 :disabled="item.disable"
115 :placeholder="item.placeholder ? item.placeholder : '请选择日期'" 116 :placeholder="item.placeholder ? item.placeholder : '请选择日期'"
116 clearable 117 clearable
...@@ -121,6 +122,7 @@ ...@@ -121,6 +122,7 @@
121 <el-time-select 122 <el-time-select
122 v-if="item.type === 'Time'" 123 v-if="item.type === 'Time'"
123 v-model.trim="tempQueryForm[item.prop]" 124 v-model.trim="tempQueryForm[item.prop]"
125 + :style="{ width: item.width }"
124 :disabled="item.disable" 126 :disabled="item.disable"
125 :placeholder="item.placeholder ? item.placeholder : '请选择时间'" 127 :placeholder="item.placeholder ? item.placeholder : '请选择时间'"
126 clearable 128 clearable
...@@ -143,6 +145,7 @@ ...@@ -143,6 +145,7 @@
143 v-if="item.type === 'datetimerange'" 145 v-if="item.type === 'datetimerange'"
144 type="datetimerange" 146 type="datetimerange"
145 v-model.trim="tempQueryForm[item.prop]" 147 v-model.trim="tempQueryForm[item.prop]"
148 + :style="{ width: item.width }"
146 :disabled="item.disable" 149 :disabled="item.disable"
147 range-separator="至" 150 range-separator="至"
148 start-placeholder="开始日期" 151 start-placeholder="开始日期"
...@@ -289,7 +292,7 @@ export default { ...@@ -289,7 +292,7 @@ export default {
289 // 用于控制该表单内组件的尺寸 medium / small / mini 292 // 用于控制该表单内组件的尺寸 medium / small / mini
290 size: { 293 size: {
291 type: String, 294 type: String,
292 - default: "medium", 295 + default: "small",
293 }, 296 },
294 }, 297 },
295 data() { 298 data() {
......
...@@ -242,5 +242,12 @@ export default { ...@@ -242,5 +242,12 @@ export default {
242 }; 242 };
243 </script> 243 </script>
244 <style lang="scss"> 244 <style lang="scss">
245 - 245 + .el-table {
246 + th {
247 + padding: 0;
248 + }
249 + td{
250 + padding: 0;
251 + }
252 + }
246 </style> 253 </style>
......
...@@ -54,26 +54,26 @@ const permission = { ...@@ -54,26 +54,26 @@ const permission = {
54 return new Promise((resolve) => { 54 return new Promise((resolve) => {
55 // 向后端请求路由数据 55 // 向后端请求路由数据
56 getRouters().then((res) => { 56 getRouters().then((res) => {
57 - // const newUrl = { 57 + const newUrl = {
58 - // id: 24, 58 + id: 24,
59 - // name: "et86", 59 + name: "et86",
60 - // path: "/et86", 60 + path: "/et86",
61 - // hidden: false, 61 + hidden: false,
62 - // component: "allocationConfig/et86", 62 + component: "allocationConfig/et86",
63 - // meta: { 63 + meta: {
64 - // title: "ET86", 64 + title: "ET86",
65 - // icon: "edit", 65 + icon: "edit",
66 - // permissions: "allocation:rand:list", 66 + permissions: "allocation:rand:list",
67 - // noCache: false, 67 + noCache: false,
68 - // }, 68 + },
69 - // alwaysShow: false, 69 + alwaysShow: false,
70 - // children: null, 70 + children: null,
71 - // }; 71 + };
72 - // res.data.map((item) => { 72 + res.data.map((item) => {
73 - // if (item.name == "AllocationConfig") { 73 + if (item.name == "AllocationConfig") {
74 - // item.children.push(newUrl); 74 + item.children.push(newUrl);
75 - // } 75 + }
76 - // }); 76 + });
77 res.data = hasPermi.routerPer(res.data); 77 res.data = hasPermi.routerPer(res.data);
78 const sdata = JSON.parse(JSON.stringify(res.data)); 78 const sdata = JSON.parse(JSON.stringify(res.data));
79 const rdata = JSON.parse(JSON.stringify(res.data)); 79 const rdata = JSON.parse(JSON.stringify(res.data));
......
...@@ -3,20 +3,20 @@ ...@@ -3,20 +3,20 @@
3 <el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small" 3 <el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small"
4 @submit.native.prevent> 4 @submit.native.prevent>
5 <el-row type="flex" style="flexWrap: wrap !important"> 5 <el-row type="flex" style="flexWrap: wrap !important">
6 - <el-col :span="6"> 6 + <el-col :span="8">
7 <el-form-item label="ACCS原航班日期"> 7 <el-form-item label="ACCS原航班日期">
8 <el-date-picker class="formItem" type="daterange" range-separator="至" start-placeholder="开始日期" 8 <el-date-picker class="formItem" type="daterange" range-separator="至" start-placeholder="开始日期"
9 end-placeholder="结束日期" v-model="fltDate" :value-format="valueFormat" clearable> 9 end-placeholder="结束日期" v-model="fltDate" :value-format="valueFormat" clearable>
10 </el-date-picker> 10 </el-date-picker>
11 </el-form-item> 11 </el-form-item>
12 </el-col> 12 </el-col>
13 - <el-col :span="6"> 13 + <el-col :span="8">
14 <el-form-item label="ACCS原航班号"> 14 <el-form-item label="ACCS原航班号">
15 <el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" clearable @change="fltNoChange"> 15 <el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" clearable @change="fltNoChange">
16 </el-input> 16 </el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 - <el-col :span="6"> 19 + <el-col :span="8">
20 <el-form-item label="海关回执状态"> 20 <el-form-item label="海关回执状态">
21 <el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable> 21 <el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
22 <el-option v-for="item in selectData.findConditionData 22 <el-option v-for="item in selectData.findConditionData
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 </el-select> 26 </el-select>
27 </el-form-item> 27 </el-form-item>
28 </el-col> 28 </el-col>
29 - <el-col :span="6"> 29 + <el-col :span="8">
30 <el-form-item label="货物状态"> 30 <el-form-item label="货物状态">
31 <el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable> 31 <el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable>
32 <el-option v-for="item in selectData.findConditionData.cargoStatus" :label="item.chineseName" 32 <el-option v-for="item in selectData.findConditionData.cargoStatus" :label="item.chineseName"
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 </el-select> 35 </el-select>
36 </el-form-item> 36 </el-form-item>
37 </el-col> 37 </el-col>
38 - <el-col :span="6"> 38 + <el-col :span="8">
39 <el-form-item label="ACCSpool"> 39 <el-form-item label="ACCSpool">
40 <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable> 40 <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
41 <el-option value="Pre-MDE" key="Pre-MDE"> 41 <el-option value="Pre-MDE" key="Pre-MDE">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 </el-select> 47 </el-select>
48 </el-form-item> 48 </el-form-item>
49 </el-col> 49 </el-col>
50 - <el-col :span="6"> 50 + <el-col :span="8">
51 <el-form-item label="申报类别"> 51 <el-form-item label="申报类别">
52 <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable> 52 <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
53 <el-option v-for="item in selectData.findConditionData.cargoType" :label="item.chineseName" 53 <el-option v-for="item in selectData.findConditionData.cargoType" :label="item.chineseName"
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 </el-select> 56 </el-select>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
59 - <el-col :span="6"> 59 + <el-col :span="8">
60 <el-form-item label="服务类型"> 60 <el-form-item label="服务类型">
61 <el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable> 61 <el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable>
62 <el-option v-for="item in selectData.findConditionData.cargoServiceType" :label="item.chineseName" 62 <el-option v-for="item in selectData.findConditionData.cargoServiceType" :label="item.chineseName"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 </el-select> 66 </el-select>
67 </el-form-item> 67 </el-form-item>
68 </el-col> 68 </el-col>
69 - <el-col :span="6"> 69 + <el-col :span="8">
70 <el-form-item label="重量区间"> 70 <el-form-item label="重量区间">
71 <el-row> 71 <el-row>
72 <el-col :span="10"> 72 <el-col :span="10">
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 </el-row> 82 </el-row>
83 </el-form-item> 83 </el-form-item>
84 </el-col> 84 </el-col>
85 - <el-col :span="6"> 85 + <el-col :span="8">
86 <el-form-item label="件数区间"> 86 <el-form-item label="件数区间">
87 <el-row> 87 <el-row>
88 <el-col :span="10"> 88 <el-col :span="10">
...@@ -98,26 +98,26 @@ ...@@ -98,26 +98,26 @@
98 </el-row> 98 </el-row>
99 </el-form-item> 99 </el-form-item>
100 </el-col> 100 </el-col>
101 - <el-col :span="6"> 101 + <el-col :span="8">
102 <el-form-item label="取件日期"> 102 <el-form-item label="取件日期">
103 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期" 103 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
104 :value-format="valueFormat" clearable> 104 :value-format="valueFormat" clearable>
105 </el-date-picker> 105 </el-date-picker>
106 </el-form-item> 106 </el-form-item>
107 </el-col> 107 </el-col>
108 - <el-col :span="6"> 108 + <el-col :span="8">
109 <el-form-item label="URSA"> 109 <el-form-item label="URSA">
110 <el-input class="formItem" type="textarea" placeholder="S_;P_;E2" v-model="ursa" :rows="1" clearable> 110 <el-input class="formItem" type="textarea" placeholder="S_;P_;E2" v-model="ursa" :rows="1" clearable>
111 </el-input> 111 </el-input>
112 </el-form-item> 112 </el-form-item>
113 </el-col> 113 </el-col>
114 - <el-col :span="6"> 114 + <el-col :span="8">
115 <el-form-item label="始发站"> 115 <el-form-item label="始发站">
116 <el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable> 116 <el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable>
117 </el-input> 117 </el-input>
118 </el-form-item> 118 </el-form-item>
119 </el-col> 119 </el-col>
120 - <el-col :span="6"> 120 + <el-col :span="8">
121 <el-form-item> 121 <el-form-item>
122 <template slot="label"> 122 <template slot="label">
123 <div style="display:inline-block">ACCS航线 123 <div style="display:inline-block">ACCS航线
...@@ -134,9 +134,9 @@ ...@@ -134,9 +134,9 @@
134 </el-select> 134 </el-select>
135 </el-form-item> 135 </el-form-item>
136 </el-col> 136 </el-col>
137 - <el-col :span="6"> 137 + <el-col :span="8">
138 <el-form-item label="运单号"> 138 <el-form-item label="运单号">
139 - <el-input class="formItem" type="textarea" :rows="4" placeholder="请输入运单号（回车分割）" :maxlength="12000" 139 + <el-input class="formItem" type="textarea" :rows="1" placeholder="例: xxx;xxx;" :maxlength="12000"
140 v-model="formData.waybillNo" clearable></el-input> 140 v-model="formData.waybillNo" clearable></el-input>
141 </el-form-item> 141 </el-form-item>
142 </el-col> 142 </el-col>
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
205 </template> 205 </template>
206 206
207 <script> 207 <script>
208 -import Dialog from "./info.vue"; 208 +import Dialog from "./info";
209 import { findConditionData, findCargoAllocationData, getAccsRoute } from "@/api/cargoSelect"; 209 import { findConditionData, findCargoAllocationData, getAccsRoute } from "@/api/cargoSelect";
210 import { allDictData } from "@/api/destinationFlight"; 210 import { allDictData } from "@/api/destinationFlight";
211 import { downLoadXlsx } from "@/utils/zipdownload"; 211 import { downLoadXlsx } from "@/utils/zipdownload";
......
1 <template> 1 <template>
2 - <div class="form-header demo-edit"> 2 + <div class="form-header">
3 - <el-row style="padding: 20px 0"> 3 + <el-row style="padding-bottom: 20px">
4 <el-col> 4 <el-col>
5 <el-divider content-position="left">ET86配舱航班顺位</el-divider> 5 <el-divider content-position="left">ET86配舱航班顺位</el-divider>
6 </el-col> 6 </el-col>
7 </el-row> 7 </el-row>
8 + <!-- ET86配舱航班顺位 -->
8 <el-row :gutter="24" justify="center"> 9 <el-row :gutter="24" justify="center">
9 <el-col :span="18"> 10 <el-col :span="18">
10 <yl-table 11 <yl-table
11 - :emptyText="tableEmptyText" 12 + emptyText="请添加配舱航班"
12 :attrs="tableAttr" 13 :attrs="tableAttr"
13 :loadingTable="tableAttr.loadingTable" 14 :loadingTable="tableAttr.loadingTable"
14 :tableData="tableData" 15 :tableData="tableData"
15 - :pageConfig="pageConfig" 16 + :pageConfig="{
17 + isPagination: false,
18 + }"
16 @add="addBtn" 19 @add="addBtn"
17 > 20 >
18 <template #column> 21 <template #column>
...@@ -36,6 +39,7 @@ ...@@ -36,6 +39,7 @@
36 @focus="inputFocus(scope)" 39 @focus="inputFocus(scope)"
37 @input="inputEvent" 40 @input="inputEvent"
38 placeholder="请输入航班号" 41 placeholder="请输入航班号"
42 + size="small"
39 /> 43 />
40 </template> 44 </template>
41 </el-table-column> 45 </el-table-column>
...@@ -56,6 +60,7 @@ ...@@ -56,6 +60,7 @@
56 v-input-filter 60 v-input-filter
57 clearable 61 clearable
58 placeholder="" 62 placeholder=""
63 + size="small"
59 /> 64 />
60 </template> 65 </template>
61 </el-table-column> 66 </el-table-column>
...@@ -66,7 +71,7 @@ ...@@ -66,7 +71,7 @@
66 align="center" 71 align="center"
67 > 72 >
68 <template slot-scope="scope"> 73 <template slot-scope="scope">
69 - <el-select v-model="scope.row.fltRoute" placeholder="请选择"> 74 + <el-select v-model="scope.row.fltRoute" placeholder="请选择" size="small">
70 <el-option 75 <el-option
71 v-for="item in scope.row.routeList" 76 v-for="item in scope.row.routeList"
72 :key="item.id" 77 :key="item.id"
...@@ -106,6 +111,7 @@ ...@@ -106,6 +111,7 @@
106 </yl-table> 111 </yl-table>
107 </el-col> 112 </el-col>
108 </el-row> 113 </el-row>
114 + <!-- 航线维度设置 -->
109 <el-row style="padding: 20px 0"> 115 <el-row style="padding: 20px 0">
110 <el-col> 116 <el-col>
111 <el-divider content-position="left">航线维度设置</el-divider> 117 <el-divider content-position="left">航线维度设置</el-divider>
...@@ -135,7 +141,6 @@ ...@@ -135,7 +141,6 @@
135 </el-col> 141 </el-col>
136 <el-col :span="24"> 142 <el-col :span="24">
137 <el-form-item label="服务种类"> 143 <el-form-item label="服务种类">
138 - <!-- <div class="label-title label-service-type">服务类型</div> -->
139 <el-col :span="4"> 144 <el-col :span="4">
140 <el-radio-group 145 <el-radio-group
141 v-model="queryForm.isServiceCode" 146 v-model="queryForm.isServiceCode"
...@@ -193,8 +198,8 @@ ...@@ -193,8 +198,8 @@
193 <el-form-item label="申报类别"> 198 <el-form-item label="申报类别">
194 <el-card shadow="never"> 199 <el-card shadow="never">
195 <el-checkbox-group 200 <el-checkbox-group
196 - v-model="queryForm.checkboxClsssType" 201 + v-model="checkboxClsssType"
197 - @change="checkboxSingleName" 202 + @change="checkboxCargoType"
198 style="display: flex" 203 style="display: flex"
199 v-if="queryForm.cargoType.length" 204 v-if="queryForm.cargoType.length"
200 > 205 >
...@@ -238,7 +243,6 @@ ...@@ -238,7 +243,6 @@
238 placeholder="最大重量" 243 placeholder="最大重量"
239 @blur="inputBlur('maxWeight')" 244 @blur="inputBlur('maxWeight')"
240 ></el-input> 245 ></el-input>
241 - <span ref="maxWeight" class="el-form-item__error"></span>
242 </el-col> 246 </el-col>
243 </el-form-item> 247 </el-form-item>
244 </el-col> 248 </el-col>
...@@ -262,7 +266,6 @@ ...@@ -262,7 +266,6 @@
262 placeholder="最多件数" 266 placeholder="最多件数"
263 @blur="inputBlur('maxNumOfPieces')" 267 @blur="inputBlur('maxNumOfPieces')"
264 ></el-input> 268 ></el-input>
265 - <span ref="maxNumOfPieces" class="el-form-item__error"></span>
266 </el-col> 269 </el-col>
267 </el-form-item> 270 </el-form-item>
268 </el-col> 271 </el-col>
...@@ -295,10 +298,6 @@ ...@@ -295,10 +298,6 @@
295 placeholder="最大申报价值" 298 placeholder="最大申报价值"
296 @blur="inputBlur('maxCNYCustomVal')" 299 @blur="inputBlur('maxCNYCustomVal')"
297 ></el-input> 300 ></el-input>
298 - <span
299 - ref="maxCNYCustomVal"
300 - class="el-form-item__error"
301 - ></span>
302 </el-col> 301 </el-col>
303 </el-form-item> 302 </el-form-item>
304 </el-col> 303 </el-col>
...@@ -324,10 +323,6 @@ ...@@ -324,10 +323,6 @@
324 placeholder="最大申报价值" 323 placeholder="最大申报价值"
325 @blur="inputBlur('maxSUDCustomVal')" 324 @blur="inputBlur('maxSUDCustomVal')"
326 ></el-input> 325 ></el-input>
327 - <span
328 - ref="maxSUDCustomVal"
329 - class="el-form-item__error"
330 - ></span>
331 </el-col> 326 </el-col>
332 </el-form-item> 327 </el-form-item>
333 </el-col> 328 </el-col>
...@@ -366,37 +361,32 @@ export default { ...@@ -366,37 +361,32 @@ export default {
366 mixins: [indexMixins], 361 mixins: [indexMixins],
367 data() { 362 data() {
368 return { 363 return {
369 - test: "测试",
370 formConfig: formConfig, // 表单配置项 364 formConfig: formConfig, // 表单配置项
371 queryForm: { 365 queryForm: {
372 // 表单参数 366 // 表单参数
373 fltNo: "", // 原航班号 367 fltNo: "", // 原航班号
374 isServiceCode: "1", // 服务种类 368 isServiceCode: "1", // 服务种类
375 serviceCode: "", 369 serviceCode: "",
370 + includeUrsa: "", // URSA包含
371 + notIncludeUrsa: "", // URSA不包含
372 + cargoType: [], // 申报类别调用接口获取所有的申报类别
373 + checkboxCargoType: [], // 已勾选申报类别的数据
376 singleName: false, // 单品名 374 singleName: false, // 单品名
377 minWeight: null, 375 minWeight: null,
378 maxWeight: null, 376 maxWeight: null,
379 minNumOfPieces: null, 377 minNumOfPieces: null,
380 maxNumOfPieces: null, 378 maxNumOfPieces: null,
381 - includeUrsa: "", // URSA包含
382 - notIncludeUrsa: "", // URSA不包含
383 - checkboxClsssType: [], // 申报类别
384 minCNYCustomVal: "", // 379 minCNYCustomVal: "", //
385 maxCNYCustomVal: "", // 380 maxCNYCustomVal: "", //
386 minSUDCustomVal: "", // 381 minSUDCustomVal: "", //
387 maxSUDCustomVal: "", // 382 maxSUDCustomVal: "", //
388 - serviceCodeData: [], // 【服务种类】调用接口获取服务种类所有的serviceCode
389 - cargoType: [], // 申报类别
390 - },
391 - pageConfig: {
392 - // 分页配置项
393 - isPagination: false,
394 }, 383 },
395 tableAttr: tableAttr, // table配置项 384 tableAttr: tableAttr, // table配置项
396 - tableEmptyText: "请添加配舱航班",
397 tableData: [], 385 tableData: [],
398 currentIndex: 0, // 记录当前table 列的索引位置 386 currentIndex: 0, // 记录当前table 列的索引位置
399 id: 0, 387 id: 0,
388 + checkboxClsssType: [], // 申报类别
389 + serviceCodeData: [], // 【服务种类】调用接口获取服务种类所有的serviceCode
400 }; 390 };
401 }, 391 },
402 computed: {}, 392 computed: {},
...@@ -418,13 +408,24 @@ export default { ...@@ -418,13 +408,24 @@ export default {
418 }, 408 },
419 mounted() {}, 409 mounted() {},
420 directives: { 410 directives: {
411 + // 处理加减天数
421 "input-filter": { 412 "input-filter": {
422 bind: function (el, binding) { 413 bind: function (el, binding) {
423 el.handler = function (event) { 414 el.handler = function (event) {
424 - let regExp = /[^0-9a-zA-Z_]/g; 415 + if (event.data == "E" || event.data == "e") {
425 - let newValue = event.target.value.replace(regExp, ""); 416 + // 无理数时
426 - if (newValue !== event.target.value) { 417 + event.target.value = "";
427 - event.target.value = newValue; 418 + }
419 + if (event.target.value) {
420 + if (Number(event.target.value) < -7) {
421 + event.target.value = "";
422 + } else if (Number(event.target.value) > 7) {
423 + event.target.value = "";
424 + } else if (/[\.]/.test(Number(event.target.value))) {
425 + // 浮点数时
426 + event.target.value = "";
427 + } else {
428 + }
428 event.target.dispatchEvent(new Event("input")); 429 event.target.dispatchEvent(new Event("input"));
429 } 430 }
430 }; 431 };
...@@ -433,18 +434,6 @@ export default { ...@@ -433,18 +434,6 @@ export default {
433 unbind: function (el) { 434 unbind: function (el) {
434 el.removeEventListener("input", el.handler); 435 el.removeEventListener("input", el.handler);
435 }, 436 },
436 - /*
437 - -7 +7
438 - 0~7
439 - 或者 空
440 - 不能输入小数点
441 - Math.abs(-7);
442 - 不能输入和选择未来日期，
443 - 不能输入和选择历史日期,
444 - 选择时间范围,
445 - 只能输入四位正整数，不能够有小数点,
446 - 只能输入四位正整数保留3位小数,
447 - */
448 }, 437 },
449 }, 438 },
450 filters: { 439 filters: {
...@@ -518,11 +507,11 @@ export default { ...@@ -518,11 +507,11 @@ export default {
518 console.log(res); 507 console.log(res);
519 }); 508 });
520 }, 509 },
521 - // input 聚焦事件 510 + // 航班号input 聚焦事件
522 - inputFocus(scope) { 511 + inputFocus({ $index }) {
523 - this.currentIndex = scope.$index; 512 + this.currentIndex = $index;
524 }, 513 },
525 - // input事件 514 + // 航班号input搜索事件
526 inputEvent: debounce(function () { 515 inputEvent: debounce(function () {
527 let params = { 516 let params = {
528 fltNo: this.tableData[this.currentIndex].fltNo, 517 fltNo: this.tableData[this.currentIndex].fltNo,
...@@ -535,7 +524,7 @@ export default { ...@@ -535,7 +524,7 @@ export default {
535 this.msgError("请输入航班号"); 524 this.msgError("请输入航班号");
536 } 525 }
537 }, 1000), 526 }, 1000),
538 - // 添加 527 + // 添加ET86配舱航班顺位
539 addBtn(item) { 528 addBtn(item) {
540 this.tableData.unshift({ 529 this.tableData.unshift({
541 id: this.id++, 530 id: this.id++,
...@@ -546,7 +535,6 @@ export default { ...@@ -546,7 +535,6 @@ export default {
546 isOn: "0" ? false : true, 535 isOn: "0" ? false : true,
547 sort: "0", // 排序字段 536 sort: "0", // 排序字段
548 }); 537 });
549 - console.log("add：", this.tableData);
550 }, 538 },
551 // 是否爆仓 539 // 是否爆仓
552 changeCheck({ $index, row }) { 540 changeCheck({ $index, row }) {
...@@ -561,40 +549,48 @@ export default { ...@@ -561,40 +549,48 @@ export default {
561 this.tableData.splice($index, 1); 549 this.tableData.splice($index, 1);
562 }, 550 },
563 // 类别 551 // 类别
564 - checkboxSingleName(val) { 552 + checkboxCargoType(arr) {
565 - console.log(val); 553 + let include = this.queryForm.cargoType.filter((item) =>
554 + arr.some((val) => val == item.chineseName)
555 + );
556 + this.queryForm.checkboxCargoType = include; //已勾选申报类别的数据
557 + // console.log(arr, include);
566 }, 558 },
567 - // input失焦事件 559 + // 重量、件数、申报值input失焦事件
568 inputBlur(name) { 560 inputBlur(name) {
561 + let coin = {
562 + minCNYCustomVal: "CNY",
563 + maxCNYCustomVal: "CNY",
564 + minSUDCustomVal: "USD",
565 + maxSUDCustomVal: "USD",
566 + };
569 if (name == "minWeight") { 567 if (name == "minWeight") {
568 + // 最小重量
570 this.validateMaxWeight("maxWeight"); 569 this.validateMaxWeight("maxWeight");
571 this.validateMinWeight(name); 570 this.validateMinWeight(name);
572 } 571 }
573 if (name == "maxWeight") { 572 if (name == "maxWeight") {
573 + // 最大重量
574 this.validateMinWeight("minWeight"); 574 this.validateMinWeight("minWeight");
575 this.validateMaxWeight(name); 575 this.validateMaxWeight(name);
576 } 576 }
577 if (name == "minNumOfPieces") { 577 if (name == "minNumOfPieces") {
578 + // 最小件数
578 this.validateMaxPieces("maxNumOfPieces"); 579 this.validateMaxPieces("maxNumOfPieces");
579 this.validateMinPieces(name); 580 this.validateMinPieces(name);
580 } 581 }
581 if (name == "maxNumOfPieces") { 582 if (name == "maxNumOfPieces") {
583 + // 最大件数
582 this.validateMinPieces("minNumOfPieces"); 584 this.validateMinPieces("minNumOfPieces");
583 this.validateMaxPieces(name); 585 this.validateMaxPieces(name);
584 } 586 }
585 if (name == "minCNYCustomVal" || name == "minSUDCustomVal") { 587 if (name == "minCNYCustomVal" || name == "minSUDCustomVal") {
586 - let coin = { 588 + // 最小申报值（CNY/USD）
587 - minCNYCustomVal: "CNY",
588 - minSUDCustomVal: "USD",
589 - };
590 this.validateMaxCustomVal(coin[name]); 589 this.validateMaxCustomVal(coin[name]);
591 this.validateMinCustomVal(coin[name]); 590 this.validateMinCustomVal(coin[name]);
592 } 591 }
593 if (name == "maxCNYCustomVal" || name == "maxSUDCustomVal") { 592 if (name == "maxCNYCustomVal" || name == "maxSUDCustomVal") {
594 - let coin = { 593 + // 最大申报值（CNY/USD）
595 - maxCNYCustomVal: "CNY",
596 - maxSUDCustomVal: "USD",
597 - };
598 this.validateMinCustomVal(coin[name]); 594 this.validateMinCustomVal(coin[name]);
599 this.validateMaxCustomVal(coin[name]); 595 this.validateMaxCustomVal(coin[name]);
600 } 596 }
...@@ -603,6 +599,12 @@ export default { ...@@ -603,6 +599,12 @@ export default {
603 submitForm(formName) { 599 submitForm(formName) {
604 this.$refs[formName].validate((valid) => { 600 this.$refs[formName].validate((valid) => {
605 if (valid) { 601 if (valid) {
602 + let parmas = {
603 + fltInfoList: this.tableData,
604 + ...this.queryForm,
605 + }
606 + parmas.singleName = this.queryForm.singleName ? 'Y' : 'N'; // N为单品名，Y为多品名
607 + console.log(parmas);
606 } else { 608 } else {
607 console.log("error submit!!"); 609 console.log("error submit!!");
608 return false; 610 return false;
...@@ -613,49 +615,44 @@ export default { ...@@ -613,49 +615,44 @@ export default {
613 }, 615 },
614 }; 616 };
615 </script> 617 </script>
616 -<style lang='scss' scoped> 618 +<style lang="scss" scoped>
617 .rowPadding { 619 .rowPadding {
618 padding: 10px 0; 620 padding: 10px 0;
619 font-size: 12px; 621 font-size: 12px;
620 } 622 }
621 -.label-title{
622 - font-size: 14px;
623 - color: #606266;
624 - font-weight: 700;
625 -}
626 ::v-deep .custom-label { 623 ::v-deep .custom-label {
627 - .el-form-item__content{ 624 + .el-form-item__content {
628 - display: flex; 625 + display: flex;
629 - margin-left: 0 !important; 626 + margin-left: 0 !important;
630 - span{ 627 + span {
631 - font-size: 14px; 628 + font-size: 14px;
632 - color: #606266; 629 + color: #606266;
633 - font-weight: 700; 630 + font-weight: 700;
634 - float: right; 631 + float: right;
635 - margin-right: 10px; 632 + margin-right: 10px;
636 - text-align: end; 633 + text-align: end;
637 } 634 }
638 - .custom-label-title{ 635 + .custom-label-title {
639 -width: 120px; 636 + width: 120px;
640 } 637 }
641 - .el-input__suffix{ 638 + .el-input__suffix {
642 right: -15px !important; 639 right: -15px !important;
643 } 640 }
644 - .el-form-item__error{ 641 + .el-form-item__error {
645 - color: #ff4949; 642 + color: #ff4949;
646 - font-size: 12px; 643 + font-size: 12px;
647 - line-height: 1; 644 + line-height: 1;
648 - padding-top: 4px; 645 + padding-top: 4px;
649 - position: absolute; 646 + position: absolute;
650 - top: 100%; 647 + top: 100%;
651 - left: 0; 648 + left: 0;
652 - font-weight: 500; 649 + font-weight: 500;
653 - width: 100% !important; 650 + width: 100% !important;
654 } 651 }
655 } 652 }
656 } 653 }
657 ::v-deep .custom-label-pieces { 654 ::v-deep .custom-label-pieces {
658 - .el-form-item__content{ 655 + .el-form-item__content {
659 width: 80%; 656 width: 80%;
660 } 657 }
661 } 658 }
......
...@@ -29,7 +29,6 @@ export default { ...@@ -29,7 +29,6 @@ export default {
29 }, 29 },
30 // radio包含不包含serviceCode 30 // radio包含不包含serviceCode
31 isServiceCode(val) { 31 isServiceCode(val) {
32 - // 包含
33 // 勾选的时候去校验 || 输入的时候去校验 32 // 勾选的时候去校验 || 输入的时候去校验
34 if (val == 1) { 33 if (val == 1) {
35 if (this.serviceCodeCofig().noInclude.length) { 34 if (this.serviceCodeCofig().noInclude.length) {
...@@ -58,30 +57,23 @@ export default { ...@@ -58,30 +57,23 @@ export default {
58 } 57 }
59 }, 58 },
60 59
61 - // 最小重量 60 + // 最小重量 【重量可以为空为0 && 最小/大重量的范围0~34KG】允许保留1~5位小数。
62 validateMinWeight(name) { 61 validateMinWeight(name) {
63 if (/^(0|[1-9]\d*)(.\d{1,5})?$/.test(Number(this.queryForm[name]))) { 62 if (/^(0|[1-9]\d*)(.\d{1,5})?$/.test(Number(this.queryForm[name]))) {
64 - // 最小重量大于0~34，并且最小重量不得大于最大重量
65 if (this.queryForm[name] && this.queryForm.maxWeight) { 63 if (this.queryForm[name] && this.queryForm.maxWeight) {
66 if (Number(this.queryForm[name]) > Number(this.queryForm.maxWeight)) { 64 if (Number(this.queryForm[name]) > Number(this.queryForm.maxWeight)) {
67 this.$refs.minWeight.innerHTML = ""; 65 this.$refs.minWeight.innerHTML = "";
68 - this.$refs.minWeight.innerHTML = 66 + this.$refs.minWeight.innerHTML = "最小重量不得大于最大重量";
69 - "最小重量大于0~34，并且最小重量不得大于最大重量";
70 return false; 67 return false;
71 - } else { 68 + } else if (Number(this.queryForm[name]) > 34) {
72 - this.$refs.minWeight.innerHTML = "";
73 - }
74 - if (Number(this.queryForm[name]) > 34) {
75 this.$refs.minWeight.innerHTML = ""; 69 this.$refs.minWeight.innerHTML = "";
76 this.$refs.minWeight.innerHTML = "最大重量34KG"; 70 this.$refs.minWeight.innerHTML = "最大重量34KG";
77 return false; 71 return false;
72 + } else {
73 + this.$refs.minWeight.innerHTML = "";
78 } 74 }
79 - } else if (Number(this.queryForm[name]) < 0) { 75 + }
80 - this.$refs.minWeight.innerHTML = ""; 76 + else if (Number(this.queryForm[name]) > 34) {
81 - this.$refs.minWeight.innerHTML =
82 - "最小重量大于0~34，并且最小重量不得大于最大重量";
83 - return false;
84 - } else if (Number(this.queryForm[name]) > 34) {
85 this.$refs.minWeight.innerHTML = ""; 77 this.$refs.minWeight.innerHTML = "";
86 this.$refs.minWeight.innerHTML = 78 this.$refs.minWeight.innerHTML =
87 "最小重量大于0~34，并且最小重量不得大于最大重量"; 79 "最小重量大于0~34，并且最小重量不得大于最大重量";
...@@ -95,11 +87,9 @@ export default { ...@@ -95,11 +87,9 @@ export default {
95 return false; 87 return false;
96 } 88 }
97 }, 89 },
98 - // 最大重量 90 + // 最大重量 【重量可以为空为0 && 最小/大重量的范围0~34KG】允许保留1~5位小数。
99 validateMaxWeight(name) { 91 validateMaxWeight(name) {
100 - // 最大重量 92 + if (/^(0|[1-9]\d*)(.\d{1,5})?$/.test(Number(this.queryForm[name]))) {
101 - if (/^(0|[1-9]\d*)(.\d{1,2})?$/.test(Number(this.queryForm[name]))) {
102 - // 最大重量大于0~34，并且最大重量不得小于最小重量
103 if (this.queryForm[name] && this.queryForm.minWeight) { 93 if (this.queryForm[name] && this.queryForm.minWeight) {
104 if (Number(this.queryForm[name]) < Number(this.queryForm.minWeight)) { 94 if (Number(this.queryForm[name]) < Number(this.queryForm.minWeight)) {
105 this.$refs.minWeight.innerHTML = ""; 95 this.$refs.minWeight.innerHTML = "";
...@@ -114,17 +104,14 @@ export default { ...@@ -114,17 +104,14 @@ export default {
114 this.$refs.minWeight.innerHTML = "最大重量34KG"; 104 this.$refs.minWeight.innerHTML = "最大重量34KG";
115 return false; 105 return false;
116 } 106 }
117 - } else if (Number(this.queryForm[name]) < 0) { 107 + }
118 - this.$refs.minWeight.innerHTML = ""; 108 + else if (Number(this.queryForm[name]) > 34) {
119 - this.$refs.minWeight.innerHTML =
120 - "最大重量大于0~34，并且最大重量不得小于最小重量";
121 - return false;
122 - } else if (Number(this.queryForm[name]) > 34) {
123 this.$refs.minWeight.innerHTML = ""; 109 this.$refs.minWeight.innerHTML = "";
124 this.$refs.minWeight.innerHTML = 110 this.$refs.minWeight.innerHTML =
125 "最大重量大于0~34，并且最大重量不得小于最小重量"; 111 "最大重量大于0~34，并且最大重量不得小于最小重量";
126 return false; 112 return false;
127 - } else { 113 + }
114 + else {
128 this.$refs.minWeight.innerHTML = ""; 115 this.$refs.minWeight.innerHTML = "";
129 } 116 }
130 } else { 117 } else {
...@@ -133,36 +120,40 @@ export default { ...@@ -133,36 +120,40 @@ export default {
133 return false; 120 return false;
134 } 121 }
135 }, 122 },
136 - // 最少件数 123 + // 最小件数 【件数可以为空但件数不得为0】只能输入正整数
137 validateMinPieces(name) { 124 validateMinPieces(name) {
138 if (/^\d+$/.test(Number(this.queryForm[name]))) { 125 if (/^\d+$/.test(Number(this.queryForm[name]))) {
139 if (this.queryForm[name] && this.queryForm.maxNumOfPieces) { 126 if (this.queryForm[name] && this.queryForm.maxNumOfPieces) {
140 if ( 127 if (
141 Number(this.queryForm[name]) > Number(this.queryForm.maxNumOfPieces) 128 Number(this.queryForm[name]) > Number(this.queryForm.maxNumOfPieces)
142 ) { 129 ) {
143 - // 最少件数1~100，并且最少件数不得大于最多件数
144 this.$refs.minNumOfPieces.innerHTML = ""; 130 this.$refs.minNumOfPieces.innerHTML = "";
145 - this.$refs.minNumOfPieces.innerHTML = 131 + this.$refs.minNumOfPieces.innerHTML = "最小件数不得大于最大件数";
146 - "最少件数1~100，并且最少件数不得大于最多件数"; 132 + } else if (
147 - return false; 133 + Number(this.queryForm[name]) < 1 ||
134 + Number(this.queryForm.maxNumOfPieces) < 1
135 + ) {
136 + this.$refs.minNumOfPieces.innerHTML = "";
137 + this.$refs.minNumOfPieces.innerHTML = "最小件数和最大件数不能小于1";
148 } else { 138 } else {
149 this.$refs.minNumOfPieces.innerHTML = ""; 139 this.$refs.minNumOfPieces.innerHTML = "";
140 + return true;
150 } 141 }
151 - if (Number(this.queryForm[name]) > 100) { 142 + } else if (
143 + this.queryForm[name] !== null &&
144 + this.queryForm[name] !== ""
145 + ) {
146 + if (Number(this.queryForm[name]) < 1) {
152 this.$refs.minNumOfPieces.innerHTML = ""; 147 this.$refs.minNumOfPieces.innerHTML = "";
153 - this.$refs.minNumOfPieces.innerHTML = "件数范围1~100"; 148 + this.$refs.minNumOfPieces.innerHTML = "最小件数和最大件数不能小于1";
154 - return false; 149 + } else if (Number(this.queryForm[name]) > 100) {
150 + this.$refs.minNumOfPieces.innerHTML = "";
151 + this.$refs.minNumOfPieces.innerHTML =
152 + "最小件数和最大件数不能大于100";
153 + } else {
154 + this.$refs.minNumOfPieces.innerHTML = "";
155 + return true;
155 } 156 }
156 - } else if (this.queryForm[name] !== "" && Number(this.queryForm[name]) < 1) {
157 - this.$refs.minNumOfPieces.innerHTML = "";
158 - this.$refs.minNumOfPieces.innerHTML =
159 - "最少件数1~100，并且最少件数不得大于最多件数";
160 - return false;
161 - } else if (Number(this.queryForm[name]) > 100) {
162 - this.$refs.minNumOfPieces.innerHTML = "";
163 - this.$refs.minNumOfPieces.innerHTML =
164 - "最少件数1~100，并且最少件数不得大于最多件数";
165 - return false;
166 } else { 157 } else {
167 this.$refs.minNumOfPieces.innerHTML = ""; 158 this.$refs.minNumOfPieces.innerHTML = "";
168 } 159 }
...@@ -172,56 +163,58 @@ export default { ...@@ -172,56 +163,58 @@ export default {
172 return false; 163 return false;
173 } 164 }
174 }, 165 },
175 - // 最多件数 166 + // 最大件数【件数可以为空但件数不得为0】只能输入正整数
176 validateMaxPieces(name) { 167 validateMaxPieces(name) {
177 if (/^\d+$/.test(Number(this.queryForm[name]))) { 168 if (/^\d+$/.test(Number(this.queryForm[name]))) {
178 - if (this.queryForm[name] && this.queryForm.maxNumOfPieces) { 169 + if (this.queryForm[name] && this.queryForm.minNumOfPieces) {
179 if ( 170 if (
180 Number(this.queryForm[name]) < Number(this.queryForm.minNumOfPieces) 171 Number(this.queryForm[name]) < Number(this.queryForm.minNumOfPieces)
181 ) { 172 ) {
182 - // 最多件数1~100，并且最多件数不得小于最小件数
183 this.$refs.minNumOfPieces.innerHTML = ""; 173 this.$refs.minNumOfPieces.innerHTML = "";
184 - this.$refs.minNumOfPieces.innerHTML = 174 + this.$refs.minNumOfPieces.innerHTML = "最大件数不得小于最小件数";
185 - "最多件数1~100，并且最多件数不得小于最小件数"; 175 + } else if (
176 + Number(this.queryForm[name]) < 1 ||
177 + Number(this.queryForm.minNumOfPieces) < 1
178 + ) {
179 + this.$refs.minNumOfPieces.innerHTML = "";
180 + this.$refs.minNumOfPieces.innerHTML = "最小件数和最大件数不能小于1";
186 return false; 181 return false;
187 } else { 182 } else {
188 this.$refs.minNumOfPieces.innerHTML = ""; 183 this.$refs.minNumOfPieces.innerHTML = "";
184 + return true;
189 } 185 }
190 - if (Number(this.queryForm[name]) > 100) { 186 + } else if (
187 + this.queryForm[name] !== null &&
188 + this.queryForm[name] !== ""
189 + ) {
190 + if (Number(this.queryForm[name]) < 1) {
191 this.$refs.minNumOfPieces.innerHTML = ""; 191 this.$refs.minNumOfPieces.innerHTML = "";
192 - this.$refs.minNumOfPieces.innerHTML = "件数范围1~100"; 192 + this.$refs.minNumOfPieces.innerHTML = "最小件数和最大件数不能小于1";
193 - return false; 193 + } else if (Number(this.queryForm[name]) > 100) {
194 + this.$refs.minNumOfPieces.innerHTML = "";
195 + this.$refs.minNumOfPieces.innerHTML =
196 + "最小件数和最大件数不能大于100";
197 + } else {
198 + this.$refs.minNumOfPieces.innerHTML = "";
199 + return true;
194 } 200 }
195 - } else if (this.queryForm[name] !== "" && Number(this.queryForm[name]) < 1) {
196 - this.$refs.minNumOfPieces.innerHTML = "";
197 - this.$refs.minNumOfPieces.innerHTML =
198 - "最多件数1~100，并且最多件数不得小于最小件数";
199 - return false;
200 - } else if (Number(this.queryForm[name]) > 100) {
201 - this.$refs.minNumOfPieces.innerHTML = "";
202 - this.$refs.minNumOfPieces.innerHTML =
203 - "最多件数1~100，并且最多件数不得小于最小件数";
204 - return false;
205 } else { 201 } else {
206 this.$refs.minNumOfPieces.innerHTML = ""; 202 this.$refs.minNumOfPieces.innerHTML = "";
207 } 203 }
208 } else { 204 } else {
209 this.$refs.minNumOfPieces.innerHTML = ""; 205 this.$refs.minNumOfPieces.innerHTML = "";
210 - this.$refs.maxNumOfPieces.innerHTML = "请输入有效件数"; 206 + this.$refs.minNumOfPieces.innerHTML = "请输入有效件数";
211 return false; 207 return false;
212 } 208 }
213 }, 209 },
214 210
215 - // 最小申报价值 211 + // 最小申报价值【申报价值可以为空为0】
216 validateMinCustomVal(name) { 212 validateMinCustomVal(name) {
217 // 申报价值 213 // 申报价值
218 - if ( 214 + let value =
219 - /^(0|[1-9]\d*)(.\d{1,2})?$/.test( 215 + this.queryForm.minCNYCustomVal || this.queryForm.minSUDCustomVal;
220 - Number( 216 + let regexp = /^(0|[1-9]\d*)(.\d{1,2})?$/.test(Number(value));
221 - this.queryForm.minCNYCustomVal || this.queryForm.minSUDCustomVal 217 + if (regexp) {
222 - )
223 - )
224 - ) {
225 if (name == "USD" || name == "美元") { 218 if (name == "USD" || name == "美元") {
226 // 申报价值（美元）0~600 219 // 申报价值（美元）0~600
227 if ( 220 if (
...@@ -243,11 +236,8 @@ export default { ...@@ -243,11 +236,8 @@ export default {
243 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600"; 236 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
244 return false; 237 return false;
245 } 238 }
246 - } else if (Number(this.queryForm.minSUDCustomVal) < 0) { 239 + }
247 - this.$refs.minSUDCustomVal.innerHTML = ""; 240 + else if (Number(this.queryForm.minSUDCustomVal) > 600) {
248 - this.$refs.minSUDCustomVal.innerHTML = "申报价值（美元）0~600";
249 - return false;
250 - } else if (Number(this.queryForm.minSUDCustomVal) > 600) {
251 this.$refs.minSUDCustomVal.innerHTML = ""; 241 this.$refs.minSUDCustomVal.innerHTML = "";
252 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600"; 242 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
253 return false; 243 return false;
...@@ -276,11 +266,8 @@ export default { ...@@ -276,11 +266,8 @@ export default {
276 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000"; 266 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
277 return false; 267 return false;
278 } 268 }
279 - } else if (Number(this.queryForm.minCNYCustomVal) < 0) { 269 + }
280 - this.$refs.minCNYCustomVal.innerHTML = ""; 270 + else if (Number(this.queryForm.minCNYCustomVal) > 2000) {
281 - this.$refs.minCNYCustomVal.innerHTML = "申报价值（人民币）0~2000";
282 - return false;
283 - } else if (Number(this.queryForm.minCNYCustomVal) > 2000) {
284 this.$refs.minCNYCustomVal.innerHTML = ""; 271 this.$refs.minCNYCustomVal.innerHTML = "";
285 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000"; 272 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
286 return false; 273 return false;
...@@ -295,18 +282,13 @@ export default { ...@@ -295,18 +282,13 @@ export default {
295 return false; 282 return false;
296 } 283 }
297 }, 284 },
298 - // 最大申报价值 285 + // 最大申报价值【申报价值可以为空为0】
299 validateMaxCustomVal(name) { 286 validateMaxCustomVal(name) {
300 - // 申报价值 287 + let value =
301 - if ( 288 + this.queryForm.maxCNYCustomVal || this.queryForm.maxSUDCustomVal;
302 - /^(0|[1-9]\d*)(.\d{1,2})?$/.test( 289 + let regexp = /^(0|[1-9]\d*)(.\d{1,2})?$/.test(Number(value));
303 - Number( 290 + if (regexp) {
304 - this.queryForm.maxCNYCustomVal || this.queryForm.maxSUDCustomVal 291 + if (name == "USD" || name == "美元") { // 申报价值（美元）0~600
305 - )
306 - )
307 - ) {
308 - if (name == "USD" || name == "美元") {
309 - // 申报价值（美元）0~600
310 if ( 292 if (
311 this.queryForm.minSUDCustomVal && 293 this.queryForm.minSUDCustomVal &&
312 this.queryForm.maxSUDCustomVal 294 this.queryForm.maxSUDCustomVal
...@@ -321,16 +303,13 @@ export default { ...@@ -321,16 +303,13 @@ export default {
321 } else { 303 } else {
322 this.$refs.minSUDCustomVal.innerHTML = ""; 304 this.$refs.minSUDCustomVal.innerHTML = "";
323 } 305 }
324 - if (Number(this.queryForm.maxCNYCustomVal) > 600) { 306 + if (Number(this.queryForm.maxSUDCustomVal) > 600) {
325 this.$refs.minSUDCustomVal.innerHTML = ""; 307 this.$refs.minSUDCustomVal.innerHTML = "";
326 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600"; 308 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
327 return false; 309 return false;
328 } 310 }
329 - } else if (Number(this.queryForm.maxCNYCustomVal) < 0) { 311 + }
330 - this.$refs.minSUDCustomVal.innerHTML = ""; 312 + else if (Number(this.queryForm.maxSUDCustomVal) > 600) {
331 - this.$refs.minSUDCustomVal.innerHTML = "申报价值（美元）0~600";
332 - return false;
333 - } else if (Number(this.queryForm.maxCNYCustomVal) > 600) {
334 this.$refs.minSUDCustomVal.innerHTML = ""; 313 this.$refs.minSUDCustomVal.innerHTML = "";
335 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600"; 314 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
336 return false; 315 return false;
...@@ -359,11 +338,8 @@ export default { ...@@ -359,11 +338,8 @@ export default {
359 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000"; 338 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
360 return false; 339 return false;
361 } 340 }
362 - } else if (Number(this.queryForm.maxCNYCustomVal) < 0) { 341 + }
363 - this.$refs.minCNYCustomVal.innerHTML = ""; 342 + else if (Number(this.queryForm.maxCNYCustomVal) > 2000) {
364 - this.$refs.minCNYCustomVal.innerHTML = "申报价值（人民币）0~2000";
365 - return false;
366 - } else if (Number(this.queryForm.maxCNYCustomVal) > 2000) {
367 this.$refs.minCNYCustomVal.innerHTML = ""; 343 this.$refs.minCNYCustomVal.innerHTML = "";
368 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000"; 344 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
369 return false; 345 return false;
......
...@@ -4,6 +4,7 @@ export const formConfig = [ ...@@ -4,6 +4,7 @@ export const formConfig = [
4 type: "Date", 4 type: "Date",
5 name: "startTime", 5 name: "startTime",
6 prop: "startTime", 6 prop: "startTime",
7 + width: "140px",
7 placeholder: "请选择开始时间", 8 placeholder: "请选择开始时间",
8 rules: { required: true, message: "请选择开始时间", trigger: "blur" }, 9 rules: { required: true, message: "请选择开始时间", trigger: "blur" },
9 }, 10 },
...@@ -12,6 +13,7 @@ export const formConfig = [ ...@@ -12,6 +13,7 @@ export const formConfig = [
12 type: "Date", 13 type: "Date",
13 name: "endTime", 14 name: "endTime",
14 prop: "endTime", 15 prop: "endTime",
16 + width: "140px",
15 placeholder: "请选择结束时间", 17 placeholder: "请选择结束时间",
16 rules: { required: true, message: "请选择结束时间", trigger: "blur" }, 18 rules: { required: true, message: "请选择结束时间", trigger: "blur" },
17 }, 19 },
......
...@@ -44,8 +44,9 @@ export default { ...@@ -44,8 +44,9 @@ export default {
44 data() { 44 data() {
45 return { 45 return {
46 formConfig: formConfig, // 表单配置项 46 formConfig: formConfig, // 表单配置项
47 - queryForm: { // 表单参数 47 + queryForm: {
48 - status: "有效" 48 + // 表单参数
49 + status: "有效",
49 }, 50 },
50 pageConfig: { 51 pageConfig: {
51 // 分页配置项 52 // 分页配置项
...@@ -115,10 +116,15 @@ export default { ...@@ -115,10 +116,15 @@ export default {
115 }, 116 },
116 // 搜索 117 // 搜索
117 searchBtn(row) { 118 searchBtn(row) {
119 + let params = {
120 + ...this.queryForm,
121 + };
122 + if (this.queryForm.status == "有效") {
123 + params.status = '1';
124 + }
118 this.$refs.ruleForm.handleSearch("ruleForm", (val) => { 125 this.$refs.ruleForm.handleSearch("ruleForm", (val) => {
119 - console.log(val); 126 + console.log(params);
120 }); 127 });
121 - console.log(this.queryForm);
122 }, 128 },
123 // 重置表单 129 // 重置表单
124 restForm() { 130 restForm() {
...@@ -154,7 +160,7 @@ export default { ...@@ -154,7 +160,7 @@ export default {
154 }) 160 })
155 .then(() => { 161 .then(() => {
156 console.log("删除：", item); 162 console.log("删除：", item);
157 - this.msgSuccess("删除成功!") 163 + this.msgSuccess("删除成功!");
158 }) 164 })
159 .catch(() => {}); 165 .catch(() => {});
160 }, 166 },
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form ref="flightAllocForm" :model="queryParams" class="form-header" size="medium" label-position="right" 3 + <el-form ref="flightAllocForm" :model="queryParams" class="form-header" size="small" label-position="right"
4 label-width="auto" @submit.native.prevent> 4 label-width="auto" @submit.native.prevent>
5 <el-row> 5 <el-row>
6 <el-col :span="6"> 6 <el-col :span="6">
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </el-date-picker> 16 </el-date-picker>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 - <el-col :span="3"> 19 + <el-col :span="4">
20 <el-form-item label="状态"> 20 <el-form-item label="状态">
21 <el-select class="formItem" v-model="queryParams.status" placeholder="状态"> 21 <el-select class="formItem" v-model="queryParams.status" placeholder="状态">
22 <el-option label="有效" value="1"></el-option> 22 <el-option label="有效" value="1"></el-option>
...@@ -26,11 +26,6 @@ ...@@ -26,11 +26,6 @@
26 </el-col> 26 </el-col>
27 </el-row> 27 </el-row>
28 <div> 28 <div>
29 - <el-form-item label="日期查询">
30 - <el-switch v-model="queryParams.querySpecifyData" active-value="1" inactive-value="2" active-color="#13ce66"
31 - inactive-color="#909399" @change="switchChange">
32 - </el-switch>
33 - </el-form-item>
34 <el-button type="primary" icon="el-icon-search" :loading="loading" @click="getList" size="mini">查询</el-button> 29 <el-button type="primary" icon="el-icon-search" :loading="loading" @click="getList" size="mini">查询</el-button>
35 <el-button class="mb20" type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['allocation:alloc:add']" 30 <el-button class="mb20" type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['allocation:alloc:add']"
36 @click=" 31 @click="
...@@ -39,6 +34,8 @@ ...@@ -39,6 +34,8 @@
39 params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null, routeStatus: '' }, 34 params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null, routeStatus: '' },
40 }) 35 })
41 ">添加</el-button> 36 ">添加</el-button>
37 + <el-switch style="margin-left: 10px;" v-model="queryParams.querySpecifyData" inactive-text="日期查询" active-value="1" inactive-value="2" active-color="#13ce66"
38 + inactive-color="#909399" @change="switchChange"></el-switch>
42 </div> 39 </div>
43 </el-form> 40 </el-form>
44 <Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" :order="true" 41 <Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" :order="true"
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <el-form-item> 22 <el-form-item>
23 <el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际配载航班 23 <el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际配载航班
24 </el-button>&#12288; 24 </el-button>&#12288;
25 - <span style="color:#ff4949">注：原航班+日期查询该日期的航班实际情况</span> 25 + <span style="color:#ff4949; font-size: 12px;">注：原航班+日期查询该日期的航班实际情况</span>
26 </el-form-item> 26 </el-form-item>
27 <br /> 27 <br />
28 <el-form-item> 28 <el-form-item>
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
111 </el-form-item> 111 </el-form-item>
112 </el-col> 112 </el-col>
113 <el-col :span="24" style="margin-bottom: 5%"> 113 <el-col :span="24" style="margin-bottom: 5%">
114 - <span style="color: #ff4949; margin-left: 10%">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br /> 114 + <span style="color: #ff4949; margin-left: 10%; font-size: 12px;">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
115 - <span style="color: #ff4949; margin-left: 10%">提示:如果需要设置配载航班延迟或提前可以直接在目的航班后加减【+-】天数。如:CA1053+1;CZ433-1</span> 115 + <span style="color: #ff4949; margin-left: 10%; font-size: 12px;">提示:如果需要设置配载航班延迟或提前可以直接在目的航班后加减【+-】天数。如:CA1053+1;CZ433-1</span>
116 </el-col> 116 </el-col>
117 <el-col :span="24"> 117 <el-col :span="24">
118 <el-form-item label="配载航班" prop="flightRank"> 118 <el-form-item label="配载航班" prop="flightRank">
......
1 <template> 1 <template>
2 - <div style="margin:30px 20px 20px"> 2 + <div style="margin: 0 20px 0 20px">
3 <el-form class="form-header" :model="pageOption" ref="queryForm" label-position="right" label-width="auto" 3 <el-form class="form-header" :model="pageOption" ref="queryForm" label-position="right" label-width="auto"
4 size="small"> 4 size="small">
5 <el-row> 5 <el-row>
...@@ -21,17 +21,17 @@ ...@@ -21,17 +21,17 @@
21 </el-row> 21 </el-row>
22 </el-form> 22 </el-form>
23 <div class="mb20" ref="preReviewOptions" style="font-size: 12px; font-weight: 700"> 23 <div class="mb20" ref="preReviewOptions" style="font-size: 12px; font-weight: 700">
24 - <el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="preQuery(1)">搜 索 24 + <el-button type="primary" icon="el-icon-search" size="mini" :loading="tableLoading" @click="preQuery(1)">搜 索
25 </el-button> 25 </el-button>
26 - <el-button type="primary" icon="el-icon-plus" size="small" @click="dialogVisible = true" 26 + <el-button type="primary" icon="el-icon-plus" size="mini" @click="dialogVisible = true"
27 v-hasPermi="['allocation:preReview:add']">新增预审航班</el-button> 27 v-hasPermi="['allocation:preReview:add']">新增预审航班</el-button>
28 - <el-button type="primary" size="small" icon="el-icon-check" :disabled="selectData.length == 0" 28 + <el-button type="primary" size="mini" icon="el-icon-check" :disabled="selectData.length == 0"
29 @click="preOption(1)" v-hasPermi="['allocation:preReview:open']"> 29 @click="preOption(1)" v-hasPermi="['allocation:preReview:open']">
30 预审开启</el-button> 30 预审开启</el-button>
31 - <el-button type="primary" size="small" icon="el-icon-close" :disabled="selectData.length == 0" 31 + <el-button type="primary" size="mini" icon="el-icon-close" :disabled="selectData.length == 0"
32 @click="preOption(0)" v-hasPermi="['allocation:preReview:close']"> 32 @click="preOption(0)" v-hasPermi="['allocation:preReview:close']">
33 预审关闭</el-button> 33 预审关闭</el-button>
34 - <el-button type="danger" icon="el-icon-delete" size="small" :disabled="selectData.length == 0" 34 + <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="selectData.length == 0"
35 @click="preOption(2)" v-hasPermi="['allocation:preReview:delete']">删 除 35 @click="preOption(2)" v-hasPermi="['allocation:preReview:delete']">删 除
36 </el-button> 36 </el-button>
37 </div> 37 </div>
......
...@@ -39,21 +39,21 @@ ...@@ -39,21 +39,21 @@
39 <el-col :span="6"> 39 <el-col :span="6">
40 <el-form-item label="运单号"> 40 <el-form-item label="运单号">
41 <el-input clearable type="textarea" v-model="queryParams.waybillNo" class="formItem" 41 <el-input clearable type="textarea" v-model="queryParams.waybillNo" class="formItem"
42 - placeholder="请输入运单号（回车间隔）" :rows="4"></el-input> 42 + placeholder="例: xxx;xxx;" :rows="1"></el-input>
43 </el-form-item> 43 </el-form-item>
44 </el-col> 44 </el-col>
45 </el-row> 45 </el-row>
46 - <el-switch v-model="queryParams.reExport" active-color="#13ce66" active-text="重新导出" style="padding-left: 35px">
47 - </el-switch>
48 <div style="margin-top:25px"> 46 <div style="margin-top:25px">
49 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> 47 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
50 <el-button type="warning" :disabled="tableData.length == 0" v-hasPermi="['base:caExport:export']" 48 <el-button type="warning" :disabled="tableData.length == 0" v-hasPermi="['base:caExport:export']"
51 @click="xlse()" :loading="downLoadingTip.downloading" icon="el-icon-download" size="mini">{{ 49 @click="xlse()" :loading="downLoadingTip.downloading" icon="el-icon-download" size="mini">{{
52 downLoadingTip.downloading ? downLoadingTip.tip : "导出" 50 downLoadingTip.downloading ? downLoadingTip.tip : "导出"
53 }}</el-button> 51 }}</el-button>
52 + <el-switch v-model="queryParams.reExport" active-color="#13ce66" inactive-text="重新导出" style="margin-left: 15px">
53 + </el-switch>
54 </div> 54 </div>
55 </el-form> 55 </el-form>
56 - <el-table max-height="300" highlight-current-row border stripe v-loading="loading" :data="tableData"> 56 + <el-table height="300" highlight-current-row border stripe v-loading="loading" :data="tableData">
57 <el-table-column label="运单号" align="center" prop="waybillNo" /> 57 <el-table-column label="运单号" align="center" prop="waybillNo" />
58 <el-table-column label="申报类别" align="center" prop="typeName" /> 58 <el-table-column label="申报类别" align="center" prop="typeName" />
59 <el-table-column label="件数" align="center" prop="qty" width="70" /> 59 <el-table-column label="件数" align="center" prop="qty" width="70" />
......
...@@ -35,8 +35,11 @@ ...@@ -35,8 +35,11 @@
35 </template> 35 </template>
36 </el-table-column> 36 </el-table-column>
37 <el-table-column v-if="tableData.length == 0"></el-table-column> 37 <el-table-column v-if="tableData.length == 0"></el-table-column>
38 - <el-table-column v-for="(value, key) in this.tableData[0]" :key="key" 38 + <template v-for="(value, key) in this.tableData[0]">
39 + <el-table-column
40 + :key="key"
39 v-if="key != 'errorMessage' && key != 'line'" :label="key" :prop="key"></el-table-column> 41 v-if="key != 'errorMessage' && key != 'line'" :label="key" :prop="key"></el-table-column>
42 + </template>
40 </el-table> 43 </el-table>
41 </div> 44 </div>
42 </template> 45 </template>
...@@ -160,4 +163,4 @@ export default { ...@@ -160,4 +163,4 @@ export default {
160 margin-left: 10px; 163 margin-left: 10px;
161 vertical-align: top; 164 vertical-align: top;
162 } 165 }
163 -</style>
...\ No newline at end of file ...\ No newline at end of file
166 +</style>
......
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
18 </el-row> 18 </el-row>
19 </el-form> 19 </el-form>
20 <div style="display:flex;padding:10px 20px"> 20 <div style="display:flex;padding:10px 20px">
21 - <el-button icon="el-icon-search" :loading="loading" type="primary" size="small" @click="selection(1)">查 询 21 + <el-button icon="el-icon-search" :loading="loading" type="primary" size="mini" @click="selection(1)">查 询
22 </el-button> 22 </el-button>
23 - <el-button icon="el-icon-plus" type="primary" size="small" v-hasPermi="['base:goodsStationFlight:add']" 23 + <el-button icon="el-icon-plus" type="primary" size="mini" v-hasPermi="['base:goodsStationFlight:add']"
24 @click="add">新 增 24 @click="add">新 增
25 </el-button> 25 </el-button>
26 - <el-button icon="el-icon-delete" type="danger" size="small" style="margin:0 10px" 26 + <el-button icon="el-icon-delete" type="danger" size="mini" style="margin:0 10px"
27 :disabled="checkData.length == 0" v-hasPermi="['base:goodsStationFlight:delete']" @click="batchDel"> 27 :disabled="checkData.length == 0" v-hasPermi="['base:goodsStationFlight:delete']" @click="batchDel">
28 删 除 28 删 除
29 </el-button> 29 </el-button>
......
...@@ -2,14 +2,38 @@ ...@@ -2,14 +2,38 @@
2 <div class="cargoPage"> 2 <div class="cargoPage">
3 <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" :model="formData"> 3 <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" :model="formData">
4 <el-row type="flex" style="flexWrap: wrap !important"> 4 <el-row type="flex" style="flexWrap: wrap !important">
5 - <el-col :span="6"> 5 + <el-col :span="8">
6 <el-form-item label="配舱航班日期"> 6 <el-form-item label="配舱航班日期">
7 <el-date-picker class="formItem" v-model="cargoPlaneTime" type="daterange" range-separator="至" 7 <el-date-picker class="formItem" v-model="cargoPlaneTime" type="daterange" range-separator="至"
8 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable> 8 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
9 </el-date-picker> 9 </el-date-picker>
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 - <el-col :span="6"> 12 + <el-col :span="8">
13 + <el-form-item label="运单号">
14 + <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
15 + placeholder="例: xxx;xxx;" :rows="1" :maxlength="12000" clearable></el-input>
16 + </el-form-item>
17 + </el-col>
18 + <el-col :span="8">
19 + <el-form-item label="配载航班号">
20 + <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="1"
21 + clearable @change="planeNoChange"></el-input>
22 + </el-form-item>
23 + </el-col>
24 + <el-col :span="8">
25 + <el-form-item label="URSA">
26 + <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1" clearable>
27 + </el-input>
28 + </el-form-item>
29 + </el-col>
30 + <el-col :span="8">
31 + <el-form-item label="始发站">
32 + <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="1" clearable>
33 + </el-input>
34 + </el-form-item>
35 + </el-col>
36 + <el-col :span="8">
13 <el-form-item label="海关回执状态"> 37 <el-form-item label="海关回执状态">
14 <el-select v-model="formData.customsReceiptStatusId" class="formItem" filterable multiple clearable 38 <el-select v-model="formData.customsReceiptStatusId" class="formItem" filterable multiple clearable
15 placeholder="不限"> 39 placeholder="不限">
...@@ -20,7 +44,7 @@ ...@@ -20,7 +44,7 @@
20 </el-select> 44 </el-select>
21 </el-form-item> 45 </el-form-item>
22 </el-col> 46 </el-col>
23 - <el-col :span="6"> 47 + <el-col :span="8">
24 <el-form-item label="申报类别"> 48 <el-form-item label="申报类别">
25 <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable> 49 <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
26 <el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id" 50 <el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id"
...@@ -29,7 +53,7 @@ ...@@ -29,7 +53,7 @@
29 </el-select> 53 </el-select>
30 </el-form-item> 54 </el-form-item>
31 </el-col> 55 </el-col>
32 - <el-col :span="6"> 56 + <el-col :span="8">
33 <el-form-item label="服务类型"> 57 <el-form-item label="服务类型">
34 <el-select v-model="formData.serviceTypeId" class="formItem" filterable multiple clearable placeholder="不限"> 58 <el-select v-model="formData.serviceTypeId" class="formItem" filterable multiple clearable placeholder="不限">
35 <el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id" 59 <el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id"
...@@ -39,59 +63,35 @@ ...@@ -39,59 +63,35 @@
39 </el-select> 63 </el-select>
40 </el-form-item> 64 </el-form-item>
41 </el-col> 65 </el-col>
42 - <el-col :span="6">
43 - <el-form-item label="运单号">
44 - <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
45 - placeholder="请输入运单号（回车间隔）" :rows="4" :maxlength="12000" clearable></el-input>
46 - </el-form-item>
47 - </el-col>
48 - <el-col :span="6">
49 - <el-form-item label="配载航班号">
50 - <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="4"
51 - clearable @change="planeNoChange"></el-input>
52 - </el-form-item>
53 - </el-col>
54 - <el-col :span="6">
55 - <el-form-item label="URSA">
56 - <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="4" clearable>
57 - </el-input>
58 - </el-form-item>
59 - </el-col>
60 - <el-col :span="6">
61 - <el-form-item label="始发站">
62 - <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="4" clearable>
63 - </el-input>
64 - </el-form-item>
65 - </el-col>
66 <el-col v-show="formShow"> 66 <el-col v-show="formShow">
67 <el-row type="flex" style="flexWrap: wrap !important"> 67 <el-row type="flex" style="flexWrap: wrap !important">
68 - <el-col :span="6"> 68 + <el-col :span="8">
69 <el-form-item label="ACCS原航班日期"> 69 <el-form-item label="ACCS原航班日期">
70 <el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至" 70 <el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至"
71 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable> 71 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
72 </el-date-picker> 72 </el-date-picker>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 - <el-col :span="6"> 75 + <el-col :span="8">
76 <el-form-item label="ACCS原航班号"> 76 <el-form-item label="ACCS原航班号">
77 <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input> 77 <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
78 </el-form-item> 78 </el-form-item>
79 </el-col> 79 </el-col>
80 - <el-col :span="6"> 80 + <el-col :span="8">
81 <el-form-item label="取件日期"> 81 <el-form-item label="取件日期">
82 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期" 82 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
83 :value-format="valueFormat" clearable> 83 :value-format="valueFormat" clearable>
84 </el-date-picker> 84 </el-date-picker>
85 </el-form-item> 85 </el-form-item>
86 </el-col> 86 </el-col>
87 - <el-col :span="6"> 87 + <el-col :span="8">
88 <el-form-item label="创建日期"> 88 <el-form-item label="创建日期">
89 <el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至" 89 <el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至"
90 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable> 90 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
91 </el-date-picker> 91 </el-date-picker>
92 </el-form-item> 92 </el-form-item>
93 </el-col> 93 </el-col>
94 - <el-col :span="6"> 94 + <el-col :span="8">
95 <el-form-item label="ACCSpool"> 95 <el-form-item label="ACCSpool">
96 <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable> 96 <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
97 <el-option value="Pre-MDE" key="Pre-MDE"> 97 <el-option value="Pre-MDE" key="Pre-MDE">
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 </el-select> 103 </el-select>
104 </el-form-item> 104 </el-form-item>
105 </el-col> 105 </el-col>
106 - <el-col :span="6"> 106 + <el-col :span="8">
107 <el-form-item label="货物状态"> 107 <el-form-item label="货物状态">
108 <el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable> 108 <el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable>
109 <el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id" 109 <el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id"
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 </el-select> 112 </el-select>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 - <el-col :span="6"> 115 + <el-col :span="8">
116 <el-form-item label="是否自动"> 116 <el-form-item label="是否自动">
117 <el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable> 117 <el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable>
118 <el-option label="手动" value="1"> </el-option> 118 <el-option label="手动" value="1"> </el-option>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 </el-select> 120 </el-select>
121 </el-form-item> 121 </el-form-item>
122 </el-col> 122 </el-col>
123 - <el-col :span="6"> 123 + <el-col :span="8">
124 <el-form-item label="配舱状态"> 124 <el-form-item label="配舱状态">
125 <el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable> 125 <el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable>
126 <el-option label="已配" value="1"> </el-option> 126 <el-option label="已配" value="1"> </el-option>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
128 </el-select> 128 </el-select>
129 </el-form-item> 129 </el-form-item>
130 </el-col> 130 </el-col>
131 - <el-col :span="6"> 131 + <el-col :span="8">
132 <el-form-item> 132 <el-form-item>
133 <template slot="label"> 133 <template slot="label">
134 <div style="display:inline-block">配载航线 134 <div style="display:inline-block">配载航线
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 </el-select> 145 </el-select>
146 </el-form-item> 146 </el-form-item>
147 </el-col> 147 </el-col>
148 - <el-col :span="6"> 148 + <el-col :span="8">
149 <el-form-item label="预审状态"> 149 <el-form-item label="预审状态">
150 <el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple> 150 <el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple>
151 <el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item" 151 <el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item"
...@@ -153,10 +153,10 @@ ...@@ -153,10 +153,10 @@
153 </el-select> 153 </el-select>
154 </el-form-item> 154 </el-form-item>
155 </el-col> 155 </el-col>
156 - <el-col :span="6"> 156 + <el-col :span="8">
157 <el-form-item label="发件人账号"> 157 <el-form-item label="发件人账号">
158 <el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem" 158 <el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem"
159 - placeholder="请输入发件人账号（;间隔）" :rows="4" :maxlength="12000" clearable></el-input> 159 + placeholder="请输入发件人账号（;间隔）" :rows="1" :maxlength="12000" clearable></el-input>
160 </el-form-item> 160 </el-form-item>
161 </el-col> 161 </el-col>
162 </el-row> 162 </el-row>
......
...@@ -45,33 +45,24 @@ ...@@ -45,33 +45,24 @@
45 <el-col :span="6"> 45 <el-col :span="6">
46 <el-form-item label="运单号"> 46 <el-form-item label="运单号">
47 <el-input type="textarea" v-model="formData.waybillNo" class="formItem" 47 <el-input type="textarea" v-model="formData.waybillNo" class="formItem"
48 - placeholder="请输入运单号（回车间隔）" :rows="4" :maxlength="12000" clearable></el-input> 48 + placeholder="例: xxx;xxx;" :rows="1" :maxlength="12000" clearable></el-input>
49 </el-form-item> 49 </el-form-item>
50 </el-col> 50 </el-col>
51 <el-col :span="6"> 51 <el-col :span="6">
52 <el-form-item label="URSA"> 52 <el-form-item label="URSA">
53 <el-input type="textarea" v-model="formData.ursa" class="formItem" placeholder="S_;P_;E2" 53 <el-input type="textarea" v-model="formData.ursa" class="formItem" placeholder="S_;P_;E2"
54 - :rows="4" clearable> 54 + :rows="1" clearable>
55 </el-input> 55 </el-input>
56 </el-form-item> 56 </el-form-item>
57 </el-col> 57 </el-col>
58 <el-col :span="6"> 58 <el-col :span="6">
59 <el-form-item label="始发站"> 59 <el-form-item label="始发站">
60 <el-input type="textarea" v-model="formData.siteName" class="formItem" placeholder="PVG;PEK" 60 <el-input type="textarea" v-model="formData.siteName" class="formItem" placeholder="PVG;PEK"
61 - :rows="4" clearable> 61 + :rows="1" clearable>
62 </el-input> 62 </el-input>
63 </el-form-item> 63 </el-form-item>
64 </el-col> 64 </el-col>
65 <el-col :span="6"> 65 <el-col :span="6">
66 - <el-form-item label="ACCS原航班日期">
67 - <el-date-picker class="formItem" type="daterange" v-model="accsDate" range-separator="至"
68 - start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
69 - </el-date-picker>
70 - </el-form-item>
71 - </el-col>
72 - </el-row>
73 - <el-row>
74 - <el-col :span="6">
75 <el-form-item label="ACCS原航班号"> 66 <el-form-item label="ACCS原航班号">
76 <el-input type="text" class="formItem" v-model="formData.flightNo" placeholder="请输入航班号" 67 <el-input type="text" class="formItem" v-model="formData.flightNo" placeholder="请输入航班号"
77 clearable> 68 clearable>
...@@ -85,6 +76,13 @@ ...@@ -85,6 +76,13 @@
85 </el-input> 76 </el-input>
86 </el-form-item> 77 </el-form-item>
87 </el-col> 78 </el-col>
79 + <el-col :span="8">
80 + <el-form-item label="ACCS原航班日期">
81 + <el-date-picker class="formItem" type="daterange" v-model="accsDate" range-separator="至"
82 + start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
83 + </el-date-picker>
84 + </el-form-item>
85 + </el-col>
88 </el-row> 86 </el-row>
89 </el-form> 87 </el-form>
90 <div class="ml20 mb20"> 88 <div class="ml20 mb20">
...@@ -147,7 +145,7 @@ export default { ...@@ -147,7 +145,7 @@ export default {
147 watch: { 145 watch: {
148 $route(to, from) { 146 $route(to, from) {
149 if (to.name == 'PreMdeSelect') { 147 if (to.name == 'PreMdeSelect') {
150 - this.selection() 148 + // this.selection()
151 } 149 }
152 } 150 }
153 }, 151 },
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <el-form ref="reportForm" class="form-header" :model="formData" label-position="right" label-width="auto" 3 <el-form ref="reportForm" class="form-header" :model="formData" label-position="right" label-width="auto"
4 size="small"> 4 size="small">
5 <el-row> 5 <el-row>
6 - <el-col :span="4"> 6 + <el-col :span="6">
7 <el-form-item label="取件日期"> 7 <el-form-item label="取件日期">
8 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期" 8 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
9 value-format="yyyy-MM-dd" clearable> 9 value-format="yyyy-MM-dd" clearable>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 </el-row> 49 </el-row>
50 </el-form> 50 </el-form>
51 <div class="ml20 mt20 mb20"> 51 <div class="ml20 mt20 mb20">
52 - <el-button type="primary" icon="el-icon-search" size="small" :loading="loading" @click="select(0)">查 询 52 + <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查 询
53 </el-button> 53 </el-button>
54 </div> 54 </div>
55 <div style="padding:10px"> 55 <div style="padding:10px">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-row :gutter="10"> 5 <el-row :gutter="10">
6 <el-col :span="6"> 6 <el-col :span="6">
7 <el-form-item label="URSA"> 7 <el-form-item label="URSA">
8 - <el-input type="textarea" v-model="formData.ursa" placeholder="URSA之间用分号分隔，例：F2;F3;P_" rows="2"> 8 + <el-input type="textarea" v-model="formData.ursa" placeholder="例：F2;F3;P_" rows="1">
9 </el-input> 9 </el-input>
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
......
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
33 <el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40"> 33 <el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40">
34 </el-input> 34 </el-input>
35 </el-form-item> 35 </el-form-item>
36 + <el-form-item label="是否为ET86航线">
37 + <el-checkbox v-model="newDictionary.isEtesRoute"></el-checkbox>
38 + </el-form-item>
36 <el-form-item> 39 <el-form-item>
37 <div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div> 40 <div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div>
38 </el-form-item> 41 </el-form-item>
...@@ -108,7 +111,7 @@ export default { ...@@ -108,7 +111,7 @@ export default {
108 }, 111 },
109 data() { 112 data() {
110 return { 113 return {
111 - newDictionary: { flightNo: undefined, chineseName: undefined, route: undefined }, 114 + newDictionary: { flightNo: undefined, chineseName: undefined, route: undefined, isEtesRoute: false },
112 rules: { 115 rules: {
113 chineseName: [ 116 chineseName: [
114 { 117 {
...@@ -198,9 +201,11 @@ export default { ...@@ -198,9 +201,11 @@ export default {
198 if (this.dictName === '虚拟航班') { 201 if (this.dictName === '虚拟航班') {
199 this.flightAdd() 202 this.flightAdd()
200 } else if (this.dictName === '航线') { 203 } else if (this.dictName === '航线') {
204 +
201 let obj = { 205 let obj = {
202 fltNo: this.upCase(this.newDictionary.fltNo), 206 fltNo: this.upCase(this.newDictionary.fltNo),
203 - route: this.upCase(this.newDictionary.route) 207 + route: this.upCase(this.newDictionary.route),
208 + isEtesRoute: this.newDictionary.isEtesRoute == true ? "Y" : "N"
204 } 209 }
205 addRoute(obj).then(res => { 210 addRoute(obj).then(res => {
206 this.loading = false 211 this.loading = false
...@@ -229,7 +234,7 @@ export default { ...@@ -229,7 +234,7 @@ export default {
229 }) 234 })
230 } 235 }
231 } 236 }
232 - //批量新增 237 + //批量新增
233 else if (this.status == 'allAdd') { 238 else if (this.status == 'allAdd') {
234 if (this.dictName === '虚拟航班') { 239 if (this.dictName === '虚拟航班') {
235 this.flightAdd() 240 this.flightAdd()
...@@ -382,4 +387,4 @@ export default { ...@@ -382,4 +387,4 @@ export default {
382 387
383 <style> 388 <style>
384 389
385 -</style>
...\ No newline at end of file ...\ No newline at end of file
390 +</style>
......
...@@ -34,17 +34,17 @@ ...@@ -34,17 +34,17 @@
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
36 <div style="margin-bottom:10px"> 36 <div style="margin-bottom:10px">
37 - <el-button type="primary" icon="el-icon-search" size="small" :loading="loading" 37 + <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading"
38 v-if="tableName != 'serviceCode'" @click="tableSelect(1)">查询</el-button> 38 v-if="tableName != 'serviceCode'" @click="tableSelect(1)">查询</el-button>
39 - <el-button type="primary" icon="el-icon-plus" size="small" @click="addDic({ status: 'add' })" 39 + <el-button type="primary" icon="el-icon-plus" size="mini" @click="addDic({ status: 'add' })"
40 v-hasPermi="['system:dictionary:add']"> 40 v-hasPermi="['system:dictionary:add']">
41 {{ tableName === 'serviceCode' ? '新增父级' : '新增' }} 41 {{ tableName === 'serviceCode' ? '新增父级' : '新增' }}
42 </el-button> 42 </el-button>
43 - <el-button v-if="tableName != '航线'" type="primary" icon="el-icon-plus" size="small" 43 + <el-button v-if="tableName != '航线'" type="primary" icon="el-icon-plus" size="mini"
44 @click="addDic({ status: 'allAdd' })" v-hasPermi="['system:dictionary:add']"> 44 @click="addDic({ status: 'allAdd' })" v-hasPermi="['system:dictionary:add']">
45 {{ tableName === 'serviceCode' ? '批量新增父级' : '批量新增' }} 45 {{ tableName === 'serviceCode' ? '批量新增父级' : '批量新增' }}
46 </el-button> 46 </el-button>
47 - <el-button type="danger" icon="el-icon-delete" size="small" :disabled="nowSelect.length == 0" 47 + <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="nowSelect.length == 0"
48 @click="handleDelete" v-hasPermi="['system:dictionary:delete']">删除 48 @click="handleDelete" v-hasPermi="['system:dictionary:delete']">删除
49 </el-button> 49 </el-button>
50 </div> 50 </div>
...@@ -100,6 +100,11 @@ ...@@ -100,6 +100,11 @@
100 }}<i class="el-icon-link"></i> </el-link> 100 }}<i class="el-icon-link"></i> </el-link>
101 </template> 101 </template>
102 <template slot="optionColumn"> 102 <template slot="optionColumn">
103 + <!-- <el-table-column label="是否为ET86航线" align="center">
104 + <template slot-scope="scope">
105 + <el-checkbox v-model="scope.row.isEtesRoute" @change="checkboxIsEtesRoute(scope)"></el-checkbox>
106 + </template>
107 + </el-table-column> -->
103 <el-table-column label="操作" align="center"> 108 <el-table-column label="操作" align="center">
104 <template slot-scope="scope"> 109 <template slot-scope="scope">
105 <el-button size="mini" type="text" style="color:#ff4949" icon="el-icon-delete" 110 <el-button size="mini" type="text" style="color:#ff4949" icon="el-icon-delete"
...@@ -335,7 +340,33 @@ export default { ...@@ -335,7 +340,33 @@ export default {
335 } else if (this.tableName === '虚拟航班') { 340 } else if (this.tableName === '虚拟航班') {
336 this.flightDel([val.id]) 341 this.flightDel([val.id])
337 } else if (this.tableName === '航线') { 342 } else if (this.tableName === '航线') {
338 - this.routeDel({ data: [val], id: [val.id] }) 343 + this.routeDel({ data: [val], id: [val.id] })
344 + /*
345 + 如果该航线是普通航线直接删，如果是ET86航线，那么要查询该航线有没有设置维度，
346 + 如果没有直接删，如果已经设置了维度是否考虑将该航线下的维度删掉再进行操作;
347 + */
348 + // if(!val.isEtesRoute){ // 普通航线
349 + // this.routeDel({ data: [val], id: [val.id] })
350 + // }else{ // ET86航线
351 + // this.$confirm("该航线是ET86航线。是否要删除", "注意!", {
352 + // closeOnClickModal: false,
353 + // confirmButtonText: "确定删除",
354 + // cancelButtonText: "取消",
355 + // type: "warning",
356 + // }).then(() => {
357 + // this.msgWarning('待联调！')
358 + // // delDict(val).then(res => {
359 + // // if (res.code === 200) {
360 + // // this.msgSuccess(res.msg)
361 + // // } else {
362 + // // this.msgWarning(res.msg)
363 + // // }
364 + // // this.tableSelect() // 回调查询
365 + // // }).catch(err => {
366 + // // console.log(err)
367 + // // })
368 + // }).catch(() => { })
369 + // }
339 } else { 370 } else {
340 this.dicDel([val.id]) 371 this.dicDel([val.id])
341 } 372 }
......
1 <template> 1 <template>
2 <div class="roleConfig"> 2 <div class="roleConfig">
3 - <el-form ref="selectionRoleForm" label-width="auto" style="margin: 20px" @submit.native.prevent> 3 + <el-form ref="selectionRoleForm" :inline="true" label-width="auto" size="small" style="margin: 20px" @submit.native.prevent>
4 - <el-row :gutter="50"> 4 + <el-form-item label="角色名称">
5 - <el-col :span="6"> 5 + <el-input v-model="formData.name" placeholder="请输入角色名称" clearable style="width: 80%;"></el-input>
6 - <el-form-item label="角色名称">
7 - <el-input v-model="formData.name" placeholder="请输入角色名称" clearable></el-input>
8 </el-form-item> 6 </el-form-item>
9 - </el-col> 7 + <el-form-item label="创建时间">
10 - <el-col :span="6">
11 - <el-form-item label="创建时间">
12 <el-date-picker v-model="createTime" type="daterange" range-separator="至" start-placeholder="开始日期" 8 <el-date-picker v-model="createTime" type="daterange" range-separator="至" start-placeholder="开始日期"
13 end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable> 9 end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
14 </el-date-picker> 10 </el-date-picker>
15 </el-form-item> 11 </el-form-item>
16 - </el-col> 12 + <el-form-item label="状态">
17 - <el-col :span="6"> 13 + <el-select v-model="formData.valid" placeholder="角色状态" clearable style="width: 50%;">
18 - <el-form-item label="状态">
19 - <el-select v-model="formData.valid" placeholder="角色状态" clearable>
20 <el-option label="启用" value="1"> </el-option> 14 <el-option label="启用" value="1"> </el-option>
21 <el-option label="停用" value="2"> </el-option> 15 <el-option label="停用" value="2"> </el-option>
22 </el-select> 16 </el-select>
23 </el-form-item> 17 </el-form-item>
24 - </el-col>
25 - </el-row>
26 </el-form> 18 </el-form>
27 <div style="margin:20px"> 19 <div style="margin:20px">
28 <el-button type="primary" icon="el-icon-search" size="mini" :loading="tableLoading" @click="selectRoleList(0)">搜索 20 <el-button type="primary" icon="el-icon-search" size="mini" :loading="tableLoading" @click="selectRoleList(0)">搜索
...@@ -34,15 +26,15 @@ ...@@ -34,15 +26,15 @@
34 :limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading" 26 :limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading"
35 :height="tableHeight" @sizeChange="sizeChange" @currentChange="currentChange"> 27 :height="tableHeight" @sizeChange="sizeChange" @currentChange="currentChange">
36 <template slot="optionColumn"> 28 <template slot="optionColumn">
37 - <el-table-column header-align="center" align="left" label="操作" min-width="210px"> 29 + <el-table-column header-align="center" align="center" label="操作" min-width="210px">
38 <template slot-scope="scope"> 30 <template slot-scope="scope">
39 - <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button> 31 + <el-button type="primary" size="mini" @click="buttonClick(scope, 0)" class="btn-mb-4">查看</el-button>
40 - <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']">修改 32 + <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']" class="btn-mb-4">修改
41 </el-button> 33 </el-button>
42 <el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini" 34 <el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini"
43 - v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)">{{ scope.row.valid == 1 ? "停用" : "启用" }} 35 + v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)" class="btn-mb-4">{{ scope.row.valid == 1 ? "停用" : "启用" }}
44 </el-button> 36 </el-button>
45 - <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']" style="margin-top: 5px;margin-left: 0;">删除角色 37 + <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']" class="btn-mb-4">删除角色
46 </el-button> 38 </el-button>
47 </template> 39 </template>
48 </el-table-column> 40 </el-table-column>
......
1 <template> 1 <template>
2 - <div style="padding:20px 0"> 2 + <div>
3 <el-form class="form-header" ref="dictForm" label-width="auto" label-position="left" style="margin-bottom:10px" 3 <el-form class="form-header" ref="dictForm" label-width="auto" label-position="left" style="margin-bottom:10px"
4 @submit.native.prevent size="small"> 4 @submit.native.prevent size="small">
5 <el-row> 5 <el-row>
6 - <el-col :span="6"> 6 + <el-col :span="8">
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="3000" rows="4" /> 9 + maxlength="3000" rows="1" />
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 </el-row> 12 </el-row>
13 </el-form> 13 </el-form>
14 <div style="margin-left:20px;margin-bottom:10px"> 14 <div style="margin-left:20px;margin-bottom:10px">
15 - <el-button icon="el-icon-search" type="primary" size="small" @click="selection(1)">查 询 15 + <el-button icon="el-icon-search" type="primary" size="mini" @click="selection(1)">查 询
16 </el-button> 16 </el-button>
17 - <el-button v-hasPermi="['log:superAllocation:add']" icon="el-icon-plus" type="primary" size="small" 17 + <el-button v-hasPermi="['log:superAllocation:add']" icon="el-icon-plus" type="primary" size="mini"
18 @click="add">添 加 18 @click="add">添 加
19 </el-button> 19 </el-button>
20 </div> 20 </div>
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
71 serviceCodeList: [] 71 serviceCodeList: []
72 }, 72 },
73 dialogStatus: 'add', 73 dialogStatus: 'add',
74 - tableHeight: null, 74 + tableHeight: 300,
75 totalCount: 0, 75 totalCount: 0,
76 dialogVisible: false, 76 dialogVisible: false,
77 loading: false, 77 loading: false,
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
80 created() { 80 created() {
81 }, 81 },
82 mounted() { 82 mounted() {
83 - this.tableHeight = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250 83 + // this.tableHeight = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250
84 this.selection(1) 84 this.selection(1)
85 }, 85 },
86 methods: { 86 methods: {
...@@ -238,4 +238,4 @@ export default { ...@@ -238,4 +238,4 @@ export default {
238 238
239 <style lang="scss" scoped> 239 <style lang="scss" scoped>
240 240
241 -</style>
...\ No newline at end of file ...\ No newline at end of file
241 +</style>
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form ref="selectionUserForm" label-width="auto" style="margin: 20px" @submit.native.prevent> 3 + <el-form ref="selectionUserForm" :inline="true" size="small" label-width="auto" style="margin: 20px" @submit.native.prevent>
4 - <el-row :gutter="50"> 4 + <el-form-item label="用户姓名">
5 - <el-col :span="6">
6 - <el-form-item label="用户姓名">
7 <el-input placeholder="请输入用户名称" v-model="formData.username" clearable></el-input> 5 <el-input placeholder="请输入用户名称" v-model="formData.username" clearable></el-input>
8 </el-form-item> 6 </el-form-item>
9 - </el-col> 7 + <el-form-item label="手机号码">
10 - <el-col :span="6">
11 - <el-form-item label="手机号码">
12 <el-input placeholder="请输入手机号码" v-model="formData.phone" clearable></el-input> 8 <el-input placeholder="请输入手机号码" v-model="formData.phone" clearable></el-input>
13 </el-form-item> 9 </el-form-item>
14 - </el-col>
15 - <el-col :span="6">
16 <el-form-item label="状态"> 10 <el-form-item label="状态">
17 - <el-select placeholder="用户状态" v-model="formData.isValid" clearable> 11 + <el-select style="width: 60%;" placeholder="用户状态" v-model="formData.isValid" clearable>
18 <el-option label="启用" value="1"> </el-option> 12 <el-option label="启用" value="1"> </el-option>
19 <el-option label="停用" value="2"> </el-option> 13 <el-option label="停用" value="2"> </el-option>
20 </el-select> 14 </el-select>
21 </el-form-item> 15 </el-form-item>
22 - </el-col>
23 - </el-row>
24 </el-form> 16 </el-form>
25 <div style="margin:20px"> 17 <div style="margin:20px">
26 <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="selectUser(0)">搜索 18 <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="selectUser(0)">搜索
...@@ -32,19 +24,19 @@ ...@@ -32,19 +24,19 @@
32 :loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :height="tableHeight" 24 :loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :height="tableHeight"
33 @sizeChange="sizeChange" @currentChange="currentChange"> 25 @sizeChange="sizeChange" @currentChange="currentChange">
34 <template slot="optionColumn"> 26 <template slot="optionColumn">
35 - <el-table-column header-align="center" align="left" min-width="210px" label="操作"> 27 + <el-table-column header-align="center" align="center" min-width="210px" label="操作">
36 <template slot-scope="scope"> 28 <template slot-scope="scope">
37 - <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button> 29 + <el-button type="primary" size="mini" @click="buttonClick(scope, 0)" class="btn-mb-4">查看</el-button>
38 - <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']">修改 30 + <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']" class="btn-mb-4">修改
39 </el-button> 31 </el-button>
40 <!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow" 32 <!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow"
41 >修改密码</el-button 33 >修改密码</el-button
42 > --> 34 > -->
43 <el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini" 35 <el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini"
44 - v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{ 36 + v-hasPermi="['system:user:openClose']" @click="userStatus(scope)" class="btn-mb-4">{{
45 scope.row.isValid == 1 ? "停用" : "启用" 37 scope.row.isValid == 1 ? "停用" : "启用"
46 }}</el-button> 38 }}</el-button>
47 - <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户 39 + <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']" class="btn-mb-4">删除用户
48 </el-button> 40 </el-button>
49 </template> 41 </template>
50 </el-table-column> 42 </el-table-column>
...@@ -253,6 +245,6 @@ export default { ...@@ -253,6 +245,6 @@ export default {
253 }; 245 };
254 </script> 246 </script>
255 247
256 -<style> 248 +<style lang="scss" scoped>
257 249
258 </style> 250 </style>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <el-form ref="archiveDataForm" class="form-header" :model="selectForm" label-width="auto" size="small" 3 <el-form ref="archiveDataForm" class="form-header" :model="selectForm" label-width="auto" size="small"
4 @submit.native.prevent> 4 @submit.native.prevent>
5 <el-row> 5 <el-row>
6 - <el-col :span="6"> 6 + <el-col :span="7">
7 <el-form-item label="操作时间"> 7 <el-form-item label="操作时间">
8 <el-date-picker class="formItem" v-model="selectForm.dateList" type="daterange" 8 <el-date-picker class="formItem" v-model="selectForm.dateList" type="daterange"
9 range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" 9 range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 </el-row> 14 </el-row>
15 </el-form> 15 </el-form>
16 <div class="ml20 mb20"> 16 <div class="ml20 mb20">
17 - <el-button type="primary" size="small" icon="el-icon-search" :loading="loading" @click="selectLog(1)">查 询 17 + <el-button type="primary" size="mini" icon="el-icon-search" :loading="loading" @click="selectLog(1)">查 询
18 </el-button> 18 </el-button>
19 </div> 19 </div>
20 <Tables ref="archiveDataTables" ductName="archiveDataTables" :order="true" :border='true' :data="data" 20 <Tables ref="archiveDataTables" ductName="archiveDataTables" :order="true" :border='true' :data="data"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 </el-col> 17 </el-col>
18 <el-col :span="6"> 18 <el-col :span="6">
19 <el-form-item label="运单号"> 19 <el-form-item label="运单号">
20 - <el-input v-model="selectForm.awbNbr" class="formItem" placeholder="请输入运单号" clearable></el-input> 20 + <el-input v-model="selectForm.awbNbr" class="formItem" placeholder="例: xxx;xxx;" clearable></el-input>
21 </el-form-item> 21 </el-form-item>
22 </el-col> 22 </el-col>
23 <el-col :span="6"> 23 <el-col :span="6">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 </el-col> 53 </el-col>
54 </el-row> 54 </el-row>
55 <div class="ml20" style="display: flex"> 55 <div class="ml20" style="display: flex">
56 - <el-button type="primary" size="small" icon="el-icon-search" :loading="loading" @click="selectDMData(0)">查询 56 + <el-button type="primary" size="mini" icon="el-icon-search" :loading="loading" @click="selectDMData(0)">查询
57 </el-button> 57 </el-button>
58 </div> 58 </div>
59 </el-form> 59 </el-form>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <el-form ref="operationLogForm" class="form-header" :model="selectForm" label-width="auto" size="small" 3 <el-form ref="operationLogForm" class="form-header" :model="selectForm" label-width="auto" size="small"
4 @submit.native.prevent> 4 @submit.native.prevent>
5 <el-row> 5 <el-row>
6 - <el-col :span="6"> 6 + <el-col :span="4">
7 <el-form-item label="功能模块"> 7 <el-form-item label="功能模块">
8 <el-select v-model="selectForm.module" class="formItem" placeholder="不限" clearable> 8 <el-select v-model="selectForm.module" class="formItem" placeholder="不限" clearable>
9 <el-option v-for="item in moduleList" :label="item" :value="item" :key="item"></el-option> 9 <el-option v-for="item in moduleList" :label="item" :value="item" :key="item"></el-option>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 </el-input> 22 </el-input>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 - <el-col :span="6"> 25 + <el-col :span="7">
26 <el-form-item label="操作时间"> 26 <el-form-item label="操作时间">
27 <el-date-picker class="formItem" v-model="dateList" type="daterange" range-separator="至" 27 <el-date-picker class="formItem" v-model="dateList" type="daterange" range-separator="至"
28 start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable> 28 start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 </el-row> 32 </el-row>
33 </el-form> 33 </el-form>
34 <div class="ml20 mb20"> 34 <div class="ml20 mb20">
35 - <el-button type="primary" size="small" icon="el-icon-search" :loading="loading" @click="selectLog(1)">查 询 35 + <el-button type="primary" size="mini" icon="el-icon-search" :loading="loading" @click="selectLog(1)">查 询
36 </el-button> 36 </el-button>
37 </div> 37 </div>
38 <Tables ref="operationLogTables" ductName="operationLogTables" :order="true" :border='false' :data="data" 38 <Tables ref="operationLogTables" ductName="operationLogTables" :order="true" :border='false' :data="data"
......