Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
66b49a07 1 parent 47aea80b

UI调整

Inline Side-by-side
Showing 22 changed files with 114 additions and 152 deletions
...@@ -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() {
......
...@@ -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";
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
39 @focus="inputFocus(scope)" 39 @focus="inputFocus(scope)"
40 @input="inputEvent" 40 @input="inputEvent"
41 placeholder="请输入航班号" 41 placeholder="请输入航班号"
42 + size="small"
42 /> 43 />
43 </template> 44 </template>
44 </el-table-column> 45 </el-table-column>
...@@ -59,6 +60,7 @@ ...@@ -59,6 +60,7 @@
59 v-input-filter 60 v-input-filter
60 clearable 61 clearable
61 placeholder="" 62 placeholder=""
63 + size="small"
62 /> 64 />
63 </template> 65 </template>
64 </el-table-column> 66 </el-table-column>
...@@ -69,7 +71,7 @@ ...@@ -69,7 +71,7 @@
69 align="center" 71 align="center"
70 > 72 >
71 <template slot-scope="scope"> 73 <template slot-scope="scope">
72 - <el-select v-model="scope.row.fltRoute" placeholder="请选择"> 74 + <el-select v-model="scope.row.fltRoute" placeholder="请选择" size="small">
73 <el-option 75 <el-option
74 v-for="item in scope.row.routeList" 76 v-for="item in scope.row.routeList"
75 :key="item.id" 77 :key="item.id"
......
...@@ -57,30 +57,23 @@ export default { ...@@ -57,30 +57,23 @@ export default {
57 } 57 }
58 }, 58 },
59 59
60 - // 最小重量 【重量可以为空为0】 60 + // 最小重量 【重量可以为空为0 && 最小/大重量的范围0~34KG】允许保留1~5位小数。
61 validateMinWeight(name) { 61 validateMinWeight(name) {
62 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]))) {
63 - // 最小重量大于0~34，并且最小重量不得大于最大重量
64 if (this.queryForm[name] && this.queryForm.maxWeight) { 63 if (this.queryForm[name] && this.queryForm.maxWeight) {
65 if (Number(this.queryForm[name]) > Number(this.queryForm.maxWeight)) { 64 if (Number(this.queryForm[name]) > Number(this.queryForm.maxWeight)) {
66 this.$refs.minWeight.innerHTML = ""; 65 this.$refs.minWeight.innerHTML = "";
67 - this.$refs.minWeight.innerHTML = 66 + this.$refs.minWeight.innerHTML = "最小重量不得大于最大重量";
68 - "最小重量大于0~34，并且最小重量不得大于最大重量";
69 return false; 67 return false;
70 - } else { 68 + } else if (Number(this.queryForm[name]) > 34) {
71 - this.$refs.minWeight.innerHTML = "";
72 - }
73 - if (Number(this.queryForm[name]) > 34) {
74 this.$refs.minWeight.innerHTML = ""; 69 this.$refs.minWeight.innerHTML = "";
75 this.$refs.minWeight.innerHTML = "最大重量34KG"; 70 this.$refs.minWeight.innerHTML = "最大重量34KG";
76 return false; 71 return false;
77 - } 72 + } else {
78 - } else if (Number(this.queryForm[name]) < 0) {
79 this.$refs.minWeight.innerHTML = ""; 73 this.$refs.minWeight.innerHTML = "";
80 - this.$refs.minWeight.innerHTML = 74 + }
81 - "最小重量大于0~34，并且最小重量不得大于最大重量"; 75 + }
82 - return false; 76 + else if (Number(this.queryForm[name]) > 34) {
83 - } else if (Number(this.queryForm[name]) > 34) {
84 this.$refs.minWeight.innerHTML = ""; 77 this.$refs.minWeight.innerHTML = "";
85 this.$refs.minWeight.innerHTML = 78 this.$refs.minWeight.innerHTML =
86 "最小重量大于0~34，并且最小重量不得大于最大重量"; 79 "最小重量大于0~34，并且最小重量不得大于最大重量";
...@@ -94,10 +87,9 @@ export default { ...@@ -94,10 +87,9 @@ export default {
94 return false; 87 return false;
95 } 88 }
96 }, 89 },
97 - // 最大重量 90 + // 最大重量 【重量可以为空为0 && 最小/大重量的范围0~34KG】允许保留1~5位小数。
98 validateMaxWeight(name) { 91 validateMaxWeight(name) {
99 - // 校验输入的规则（保留两位小数） 92 + if (/^(0|[1-9]\d*)(.\d{1,5})?$/.test(Number(this.queryForm[name]))) {
100 - if (/^(0|[1-9]\d*)(.\d{1,2})?$/.test(Number(this.queryForm[name]))) {
101 if (this.queryForm[name] && this.queryForm.minWeight) { 93 if (this.queryForm[name] && this.queryForm.minWeight) {
102 if (Number(this.queryForm[name]) < Number(this.queryForm.minWeight)) { 94 if (Number(this.queryForm[name]) < Number(this.queryForm.minWeight)) {
103 this.$refs.minWeight.innerHTML = ""; 95 this.$refs.minWeight.innerHTML = "";
...@@ -112,17 +104,14 @@ export default { ...@@ -112,17 +104,14 @@ export default {
112 this.$refs.minWeight.innerHTML = "最大重量34KG"; 104 this.$refs.minWeight.innerHTML = "最大重量34KG";
113 return false; 105 return false;
114 } 106 }
115 - } else if (Number(this.queryForm[name]) < 0) { 107 + }
116 - this.$refs.minWeight.innerHTML = ""; 108 + else if (Number(this.queryForm[name]) > 34) {
117 - this.$refs.minWeight.innerHTML =
118 - "最大重量大于0~34，并且最大重量不得小于最小重量";
119 - return false;
120 - } else if (Number(this.queryForm[name]) > 34) {
121 this.$refs.minWeight.innerHTML = ""; 109 this.$refs.minWeight.innerHTML = "";
122 this.$refs.minWeight.innerHTML = 110 this.$refs.minWeight.innerHTML =
123 "最大重量大于0~34，并且最大重量不得小于最小重量"; 111 "最大重量大于0~34，并且最大重量不得小于最小重量";
124 return false; 112 return false;
125 - } else { 113 + }
114 + else {
126 this.$refs.minWeight.innerHTML = ""; 115 this.$refs.minWeight.innerHTML = "";
127 } 116 }
128 } else { 117 } else {
...@@ -131,9 +120,8 @@ export default { ...@@ -131,9 +120,8 @@ export default {
131 return false; 120 return false;
132 } 121 }
133 }, 122 },
134 - // 最小件数 【件数可以为空但件数不得为0】 123 + // 最小件数 【件数可以为空但件数不得为0】只能输入正整数
135 validateMinPieces(name) { 124 validateMinPieces(name) {
136 - // 校验输入的规则（只能输入正整数）
137 if (/^\d+$/.test(Number(this.queryForm[name]))) { 125 if (/^\d+$/.test(Number(this.queryForm[name]))) {
138 if (this.queryForm[name] && this.queryForm.maxNumOfPieces) { 126 if (this.queryForm[name] && this.queryForm.maxNumOfPieces) {
139 if ( 127 if (
...@@ -175,9 +163,8 @@ export default { ...@@ -175,9 +163,8 @@ export default {
175 return false; 163 return false;
176 } 164 }
177 }, 165 },
178 - // 最大件数 166 + // 最大件数【件数可以为空但件数不得为0】只能输入正整数
179 validateMaxPieces(name) { 167 validateMaxPieces(name) {
180 - // 校验输入的规则（只能输入正整数）
181 if (/^\d+$/.test(Number(this.queryForm[name]))) { 168 if (/^\d+$/.test(Number(this.queryForm[name]))) {
182 if (this.queryForm[name] && this.queryForm.minNumOfPieces) { 169 if (this.queryForm[name] && this.queryForm.minNumOfPieces) {
183 if ( 170 if (
...@@ -221,7 +208,7 @@ export default { ...@@ -221,7 +208,7 @@ export default {
221 } 208 }
222 }, 209 },
223 210
224 - // 最小申报价值 【申报价值可以为空为0】 211 + // 最小申报价值【申报价值可以为空为0】
225 validateMinCustomVal(name) { 212 validateMinCustomVal(name) {
226 // 申报价值 213 // 申报价值
227 let value = 214 let value =
...@@ -249,11 +236,8 @@ export default { ...@@ -249,11 +236,8 @@ export default {
249 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600"; 236 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
250 return false; 237 return false;
251 } 238 }
252 - } else if (Number(this.queryForm.minSUDCustomVal) < 0) { 239 + }
253 - this.$refs.minSUDCustomVal.innerHTML = ""; 240 + else if (Number(this.queryForm.minSUDCustomVal) > 600) {
254 - this.$refs.minSUDCustomVal.innerHTML = "申报价值（美元）0~600";
255 - return false;
256 - } else if (Number(this.queryForm.minSUDCustomVal) > 600) {
257 this.$refs.minSUDCustomVal.innerHTML = ""; 241 this.$refs.minSUDCustomVal.innerHTML = "";
258 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600"; 242 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
259 return false; 243 return false;
...@@ -282,11 +266,8 @@ export default { ...@@ -282,11 +266,8 @@ export default {
282 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000"; 266 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
283 return false; 267 return false;
284 } 268 }
285 - } else if (Number(this.queryForm.minCNYCustomVal) < 0) { 269 + }
286 - this.$refs.minCNYCustomVal.innerHTML = ""; 270 + else if (Number(this.queryForm.minCNYCustomVal) > 2000) {
287 - this.$refs.minCNYCustomVal.innerHTML = "申报价值（人民币）0~2000";
288 - return false;
289 - } else if (Number(this.queryForm.minCNYCustomVal) > 2000) {
290 this.$refs.minCNYCustomVal.innerHTML = ""; 271 this.$refs.minCNYCustomVal.innerHTML = "";
291 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000"; 272 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
292 return false; 273 return false;
...@@ -301,15 +282,13 @@ export default { ...@@ -301,15 +282,13 @@ export default {
301 return false; 282 return false;
302 } 283 }
303 }, 284 },
304 - // 最大申报价值 285 + // 最大申报价值【申报价值可以为空为0】
305 validateMaxCustomVal(name) { 286 validateMaxCustomVal(name) {
306 - // 申报价值
307 let value = 287 let value =
308 this.queryForm.maxCNYCustomVal || this.queryForm.maxSUDCustomVal; 288 this.queryForm.maxCNYCustomVal || this.queryForm.maxSUDCustomVal;
309 let regexp = /^(0|[1-9]\d*)(.\d{1,2})?$/.test(Number(value)); 289 let regexp = /^(0|[1-9]\d*)(.\d{1,2})?$/.test(Number(value));
310 if (regexp) { 290 if (regexp) {
311 - if (name == "USD" || name == "美元") { 291 + if (name == "USD" || name == "美元") { // 申报价值（美元）0~600
312 - // 申报价值（美元）0~600
313 if ( 292 if (
314 this.queryForm.minSUDCustomVal && 293 this.queryForm.minSUDCustomVal &&
315 this.queryForm.maxSUDCustomVal 294 this.queryForm.maxSUDCustomVal
...@@ -329,11 +308,8 @@ export default { ...@@ -329,11 +308,8 @@ export default {
329 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600"; 308 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
330 return false; 309 return false;
331 } 310 }
332 - } else if (Number(this.queryForm.maxSUDCustomVal) < 0) { 311 + }
333 - this.$refs.minSUDCustomVal.innerHTML = ""; 312 + else if (Number(this.queryForm.maxSUDCustomVal) > 600) {
334 - this.$refs.minSUDCustomVal.innerHTML = "申报价值（美元）0~600";
335 - return false;
336 - } else if (Number(this.queryForm.maxSUDCustomVal) > 600) {
337 this.$refs.minSUDCustomVal.innerHTML = ""; 313 this.$refs.minSUDCustomVal.innerHTML = "";
338 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600"; 314 this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
339 return false; 315 return false;
...@@ -362,11 +338,8 @@ export default { ...@@ -362,11 +338,8 @@ export default {
362 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000"; 338 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
363 return false; 339 return false;
364 } 340 }
365 - } else if (Number(this.queryForm.maxCNYCustomVal) < 0) { 341 + }
366 - this.$refs.minCNYCustomVal.innerHTML = ""; 342 + else if (Number(this.queryForm.maxCNYCustomVal) > 2000) {
367 - this.$refs.minCNYCustomVal.innerHTML = "申报价值（人民币）0~2000";
368 - return false;
369 - } else if (Number(this.queryForm.maxCNYCustomVal) > 2000) {
370 this.$refs.minCNYCustomVal.innerHTML = ""; 343 this.$refs.minCNYCustomVal.innerHTML = "";
371 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000"; 344 this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
372 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 },
......
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>
......
...@@ -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>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 <el-col :span="8"> 12 <el-col :span="8">
13 <el-form-item label="运单号"> 13 <el-form-item label="运单号">
14 <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem" 14 <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
15 - placeholder="请输入运单号（回车间隔）" :rows="1" :maxlength="12000" clearable></el-input> 15 + placeholder="例: xxx;xxx;" :rows="1" :maxlength="12000" clearable></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 <el-col :span="8"> 18 <el-col :span="8">
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
156 <el-col :span="8"> 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>
......
...@@ -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>
......
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">
5 - <el-col :span="6">
6 <el-form-item label="角色名称"> 4 <el-form-item label="角色名称">
7 - <el-input v-model="formData.name" placeholder="请输入角色名称" clearable></el-input> 5 + <el-input v-model="formData.name" placeholder="请输入角色名称" clearable style="width: 80%;"></el-input>
8 </el-form-item> 6 </el-form-item>
9 - </el-col>
10 - <el-col :span="6">
11 <el-form-item label="创建时间"> 7 <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>
17 - <el-col :span="6">
18 <el-form-item label="状态"> 12 <el-form-item label="状态">
19 - <el-select v-model="formData.valid" placeholder="角色状态" clearable> 13 + <el-select v-model="formData.valid" placeholder="角色状态" clearable style="width: 50%;">
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)">搜索
......
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: {
......
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">
5 - <el-col :span="6">
6 <el-form-item label="用户姓名"> 4 <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>
10 - <el-col :span="6">
11 <el-form-item label="手机号码"> 7 <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)">搜索
......
...@@ -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"
......