Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
785bf810 1 parent d15213d1

version0.5.2货物查询需求增加bug修正航班维度Handling Code增加航班维护更新

Inline Side-by-side
Showing 9 changed files with 503 additions and 347 deletions
...@@ -42,6 +42,8 @@ export function updateOrAddFlight(form){ ...@@ -42,6 +42,8 @@ export function updateOrAddFlight(form){
42 form.declarationCategory = form.declarationCategory.join(';'); 42 form.declarationCategory = form.declarationCategory.join(';');
43 form.serviceCode = form.serviceCode.join(';'); 43 form.serviceCode = form.serviceCode.join(';');
44 form.subCategory = form.subCategory.join(';'); 44 form.subCategory = form.subCategory.join(';');
45 + form.handlingCode = form.handlingCode.join(';');
46 +
45 47
46 return request({ 48 return request({
47 url:'/destinationFlight/updateOrAddFlight', 49 url:'/destinationFlight/updateOrAddFlight',
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 :base-path="route.path" 35 :base-path="route.path"
36 /> 36 />
37 </el-menu> 37 </el-menu>
38 - <div class="version">version:0.5.1</div> 38 + <div class="version">{{ version }}</div>
39 <!-- </el-scrollbar> --> 39 <!-- </el-scrollbar> -->
40 </div> 40 </div>
41 </template> 41 </template>
...@@ -45,8 +45,14 @@ import { mapGetters, mapState } from "vuex"; ...@@ -45,8 +45,14 @@ import { mapGetters, mapState } from "vuex";
45 import Logo from "./Logo"; 45 import Logo from "./Logo";
46 import SidebarItem from "./SidebarItem"; 46 import SidebarItem from "./SidebarItem";
47 import variables from "@/assets/styles/variables.scss"; 47 import variables from "@/assets/styles/variables.scss";
48 +import settings from "@/settings";
48 49
49 export default { 50 export default {
51 + data() {
52 + return {
53 + version: "",
54 + };
55 + },
50 components: { SidebarItem, Logo }, 56 components: { SidebarItem, Logo },
51 computed: { 57 computed: {
52 ...mapState(["settings"]), 58 ...mapState(["settings"]),
...@@ -70,6 +76,9 @@ export default { ...@@ -70,6 +76,9 @@ export default {
70 return !this.sidebar.opened; 76 return !this.sidebar.opened;
71 }, 77 },
72 }, 78 },
79 + created() {
80 + this.version = settings.version;
81 + },
73 }; 82 };
74 </script> 83 </script>
75 84
......
...@@ -37,5 +37,10 @@ module.exports = { ...@@ -37,5 +37,10 @@ module.exports = {
37 * The default is only used in the production env 37 * The default is only used in the production env
38 * If you want to also use it in dev, you can pass ['production', 'development'] 38 * If you want to also use it in dev, you can pass ['production', 'development']
39 */ 39 */
40 - errorLog: 'production' 40 + errorLog: 'production',
41 +
42 + /**
43 + * 版本号
44 + */
45 + version:'version：0.5.2'
41 } 46 }
......
...@@ -9,7 +9,6 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' ...@@ -9,7 +9,6 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
9 const service = axios.create({ 9 const service = axios.create({
10 // axios中请求配置有baseURL选项，表示请求URL公共部分 10 // axios中请求配置有baseURL选项，表示请求URL公共部分
11 //baseURL: process.env.VUE_APP_BASE_API, 11 //baseURL: process.env.VUE_APP_BASE_API,
12 - //baseURL: 'http://192.168.1.45:8080',
13 // baseURL: `http://47.103.140.98:9002`, 12 // baseURL: `http://47.103.140.98:9002`,
14 baseURL: 'https://imacuat.zmd.apac.fedex.com/IMAC2', 13 baseURL: 'https://imacuat.zmd.apac.fedex.com/IMAC2',
15 // baseURL: 'http://192.168.1.134:18080', 14 // baseURL: 'http://192.168.1.134:18080',
......
...@@ -2,87 +2,55 @@ ...@@ -2,87 +2,55 @@
2 <div style="margin: 40px" v-loading="loading"> 2 <div style="margin: 40px" v-loading="loading">
3 <el-empty description="找不到这条数据！" v-if="isEmpty"></el-empty> 3 <el-empty description="找不到这条数据！" v-if="isEmpty"></el-empty>
4 <template v-else> 4 <template v-else>
5 - <el-form 5 + <el-form ref="form" :model="form" label-width="200px" size="small" :disabled="disable" :rules="rules">
6 - ref="form" 6 + <el-row :gutter="20">
7 - :model="form" 7 + <el-col :span="8">
8 - label-width="200px"
9 - size="small"
10 - :disabled="disable"
11 - :rules="rules"
12 - >
13 <el-form-item label="航班号" prop="purposeOfFlightNo"> 8 <el-form-item label="航班号" prop="purposeOfFlightNo">
14 - <el-input 9 + <el-input v-model.trim="form.purposeOfFlightNo" style="width: 30%" :disabled="nameDisabled"></el-input>
15 - v-model.trim="form.purposeOfFlightNo"
16 - style="width: 30%"
17 - :disabled="nameDisabled"
18 - ></el-input>
19 </el-form-item> 10 </el-form-item>
20 - 11 + </el-col>
21 - <el-form-item> 12 + <el-col :span="12">
22 - <el-alert 13 + <el-form-item label="航班预审" prop="isNeedRequired">
23 - title="提示：站点之间用回车符分隔" 14 + <el-switch v-model="isNeedRequired" :active-value="1" :inactive-value="0">
24 - type="warning" 15 + </el-switch>
25 - show-icon
26 - size="small"
27 - :closable="false"
28 - style="height: 30px; width: fit-content"
29 - >
30 - </el-alert>
31 </el-form-item> 16 </el-form-item>
17 + </el-col>
18 + </el-row>
19 + <el-form-item>
32 <el-row :gutter="20"> 20 <el-row :gutter="20">
33 - <el-col :span="10"> 21 + <el-col :span="6">
34 - <el-form-item label="站点包含"> 22 + <el-radio v-model="isLocation" label="1" size="mini">站点包含</el-radio>
35 - <!-- <el-alert title="提示：站点之间用回车符分隔" type="info" show-icon size="small" :closable="false" style="height:30px; margin-buttom"> </el-alert> --> 23 + <el-radio v-model="isLocation" label="2" size="mini">站点不包含</el-radio>
36 - <el-input
37 - type="textarea"
38 - v-model="form.location"
39 - :rows="6"
40 - resize="none"
41 - ></el-input>
42 - </el-form-item>
43 </el-col> 24 </el-col>
44 - <el-col :span="10"> 25 + <el-col :span="6">
45 - <el-form-item label="站点不包含"> 26 + <el-alert title="提示：站点之间用回车符分隔" type="warning" show-icon size="mini" :closable="false"
46 - <el-input 27 + style="height: 30px; width: fit-content">
47 - type="textarea" 28 + </el-alert>
48 - v-model="form.notLocation"
49 - :rows="6"
50 - resize="none"
51 - ></el-input>
52 - </el-form-item>
53 </el-col> 29 </el-col>
54 </el-row> 30 </el-row>
31 + </el-form-item>
32 +
33 + <el-form-item label="站点包含" v-show="isLocation == 1">
34 + <el-input type="textarea" v-model="form.location" :rows="6" resize="none" style="width: 600px"></el-input>
35 + </el-form-item>
36 + <el-form-item label="站点不包含" v-show="isLocation == 2">
37 + <el-input type="textarea" v-model="form.notLocation" :rows="6" resize="none" style="width: 600px"></el-input>
38 + </el-form-item>
55 39
56 <el-form-item> 40 <el-form-item>
57 - <el-alert 41 + <el-alert title="提示：URSA之间用分号分隔，例：F2;F3;P_" type="warning" show-icon size="mini" :closable="false"
58 - title="提示：URSA之间用分号分隔，例：F2;F3;P_" 42 + style="height: 30px; width: fit-content">
59 - type="warning"
60 - show-icon
61 - size="small"
62 - :closable="false"
63 - style="height: 30px; width: fit-content"
64 - >
65 </el-alert> 43 </el-alert>
66 </el-form-item> 44 </el-form-item>
67 <el-row :gutter="20"> 45 <el-row :gutter="20">
68 <el-col :span="10"> 46 <el-col :span="10">
69 <el-form-item label="URSA包含"> 47 <el-form-item label="URSA包含">
70 - <el-input 48 + <el-input type="textarea" v-model.trim="form.includeUrsa" :rows="6" resize="none"></el-input>
71 - type="textarea"
72 - v-model.trim="form.includeUrsa"
73 - :rows="6"
74 - resize="none"
75 - ></el-input>
76 </el-form-item> 49 </el-form-item>
77 </el-col> 50 </el-col>
78 <el-col :span="10"> 51 <el-col :span="10">
79 <el-form-item label="URSA不包含"> 52 <el-form-item label="URSA不包含">
80 - <el-input 53 + <el-input type="textarea" v-model.trim="form.notIncludeUrsa" :rows="6" resize="none"></el-input>
81 - type="textarea"
82 - v-model.trim="form.notIncludeUrsa"
83 - :rows="6"
84 - resize="none"
85 - ></el-input>
86 </el-form-item> 54 </el-form-item>
87 </el-col> 55 </el-col>
88 </el-row> 56 </el-row>
...@@ -90,63 +58,41 @@ ...@@ -90,63 +58,41 @@
90 <el-form-item label="件数"> 58 <el-form-item label="件数">
91 <el-col :span="3"> 59 <el-col :span="3">
92 <!-- <el-input v-model="form.minNumOfPieces"></el-input> --> 60 <!-- <el-input v-model="form.minNumOfPieces"></el-input> -->
93 - <el-input-number 61 + <el-input-number v-model="
94 - v-model="
95 form.minNumOfPieces == 0 62 form.minNumOfPieces == 0
96 ? (form.minNumOfPieces = undefined) 63 ? (form.minNumOfPieces = undefined)
97 : form.minNumOfPieces 64 : form.minNumOfPieces
98 - " 65 + " :precision="0" :controls="false" style="width: 100%"></el-input-number>
99 - :precision="0"
100 - :controls="false"
101 - style="width: 100%"
102 - ></el-input-number>
103 </el-col> 66 </el-col>
104 <el-col style="text-align: center" :span="1">-</el-col> 67 <el-col style="text-align: center" :span="1">-</el-col>
105 <el-col :span="3"> 68 <el-col :span="3">
106 <!-- <el-input v-model="form.maxNumOfPieces"></el-input> --> 69 <!-- <el-input v-model="form.maxNumOfPieces"></el-input> -->
107 - <el-input-number 70 + <el-input-number v-model="
108 - v-model="
109 form.maxNumOfPieces == 0 71 form.maxNumOfPieces == 0
110 ? (form.maxNumOfPieces = undefined) 72 ? (form.maxNumOfPieces = undefined)
111 : form.maxNumOfPieces 73 : form.maxNumOfPieces
112 - " 74 + " :precision="0" :controls="false" style="width: 100%" :min="form.minNumOfPieces + 1"></el-input-number>
113 - :precision="0"
114 - :controls="false"
115 - style="width: 100%"
116 - :min="form.minNumOfPieces + 1"
117 - ></el-input-number>
118 </el-col> 75 </el-col>
119 </el-form-item> 76 </el-form-item>
120 77
121 <el-form-item label="重量"> 78 <el-form-item label="重量">
122 <el-col :span="3"> 79 <el-col :span="3">
123 <!-- <el-input v-model="form.minWeight"></el-input> --> 80 <!-- <el-input v-model="form.minWeight"></el-input> -->
124 - <el-input-number 81 + <el-input-number v-model="
125 - v-model="
126 form.minWeight == 0 82 form.minWeight == 0
127 ? (form.minWeight = undefined) 83 ? (form.minWeight = undefined)
128 : form.minWeight 84 : form.minWeight
129 - " 85 + " :precision="2" :controls="false" style="width: 100%"></el-input-number>
130 - :precision="2"
131 - :controls="false"
132 - style="width: 100%"
133 - ></el-input-number>
134 </el-col> 86 </el-col>
135 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col> 87 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
136 <el-col style="text-align: center" :span="1">-</el-col> 88 <el-col style="text-align: center" :span="1">-</el-col>
137 <el-col :span="3"> 89 <el-col :span="3">
138 <!-- <el-input v-model="form.maxWeight"></el-input> --> 90 <!-- <el-input v-model="form.maxWeight"></el-input> -->
139 - <el-input-number 91 + <el-input-number v-model="
140 - v-model="
141 form.maxWeight == 0 92 form.maxWeight == 0
142 ? (form.maxWeight = undefined) 93 ? (form.maxWeight = undefined)
143 : form.maxWeight 94 : form.maxWeight
144 - " 95 + " :precision="2" :controls="false" style="width: 100%" :min="form.minWeight + 0.01"></el-input-number>
145 - :precision="2"
146 - :controls="false"
147 - style="width: 100%"
148 - :min="form.minWeight + 0.01"
149 - ></el-input-number>
150 </el-col> 96 </el-col>
151 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col> 97 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
152 </el-form-item> 98 </el-form-item>
...@@ -154,12 +100,8 @@ ...@@ -154,12 +100,8 @@
154 <el-form-item label="申报类别"> 100 <el-form-item label="申报类别">
155 <el-card shadow="never" style="width: 70%"> 101 <el-card shadow="never" style="width: 70%">
156 <el-checkbox-group v-model="form.typeOfGoods"> 102 <el-checkbox-group v-model="form.typeOfGoods">
157 - <el-checkbox 103 + <el-checkbox v-for="item in cargoType" :key="item.id" :label="item.chineseName" :name="item.chineseName">
158 - v-for="item in cargoType" 104 + </el-checkbox>
159 - :key="item.id"
160 - :label="item.chineseName"
161 - :name="item.chineseName"
162 - ></el-checkbox>
163 </el-checkbox-group> 105 </el-checkbox-group>
164 </el-card> 106 </el-card>
165 </el-form-item> 107 </el-form-item>
...@@ -167,12 +109,8 @@ ...@@ -167,12 +109,8 @@
167 <el-form-item label="货物类型"> 109 <el-form-item label="货物类型">
168 <el-card shadow="never" style="width: 70%"> 110 <el-card shadow="never" style="width: 70%">
169 <el-checkbox-group v-model="form.declarationCategory"> 111 <el-checkbox-group v-model="form.declarationCategory">
170 - <el-checkbox 112 + <el-checkbox v-for="item in cargoStatus" :key="item.id" :label="item.chineseName" :name="item.chineseName"
171 - v-for="item in cargoStatus" 113 + disabled></el-checkbox>
172 - :key="item.id"
173 - :label="item.chineseName"
174 - :name="item.chineseName"
175 - ></el-checkbox>
176 </el-checkbox-group> 114 </el-checkbox-group>
177 </el-card> 115 </el-card>
178 </el-form-item> 116 </el-form-item>
...@@ -180,12 +118,17 @@ ...@@ -180,12 +118,17 @@
180 <el-form-item label="Service Code"> 118 <el-form-item label="Service Code">
181 <el-card shadow="never" style="width: 70%"> 119 <el-card shadow="never" style="width: 70%">
182 <el-checkbox-group v-model="form.serviceCode"> 120 <el-checkbox-group v-model="form.serviceCode">
183 - <el-checkbox 121 + <el-checkbox v-for="item in serviceCode" :key="item.id" :label="item.englishName"
184 - v-for="item in serviceCode" 122 + :name="item.englishName"></el-checkbox>
185 - :key="item.id" 123 + </el-checkbox-group>
186 - :label="item.englishName" 124 + </el-card>
187 - :name="item.englishName" 125 + </el-form-item>
188 - ></el-checkbox> 126 +
127 + <el-form-item label="Handling Code">
128 + <el-card shadow="never" style="width: 70%">
129 + <el-checkbox-group v-model="form.handlingCode">
130 + <el-checkbox v-for="item in handlingCode" :key="item.id" :label="item.englishName"
131 + :name="item.englishName"></el-checkbox>
189 </el-checkbox-group> 132 </el-checkbox-group>
190 </el-card> 133 </el-card>
191 </el-form-item> 134 </el-form-item>
...@@ -193,24 +136,17 @@ ...@@ -193,24 +136,17 @@
193 <el-form-item label="Sub Category"> 136 <el-form-item label="Sub Category">
194 <el-card shadow="never" style="width: 70%"> 137 <el-card shadow="never" style="width: 70%">
195 <el-checkbox-group v-model="form.subCategory"> 138 <el-checkbox-group v-model="form.subCategory">
196 - <el-checkbox 139 + <el-checkbox v-for="item in subCategory" :key="item.id" :label="item.englishName"
197 - v-for="item in subCategory" 140 + :name="item.englishName"></el-checkbox>
198 - :key="item.id"
199 - :label="item.englishName"
200 - :name="item.englishName"
201 - ></el-checkbox>
202 </el-checkbox-group> 141 </el-checkbox-group>
203 </el-card> 142 </el-card>
204 </el-form-item> 143 </el-form-item>
144 +
145 +
205 </el-form> 146 </el-form>
206 <el-row style="margin-left: 200px"> 147 <el-row style="margin-left: 200px">
207 - <el-button 148 + <el-button type="primary" size="small" v-if="$route.params.handle != 'detail'" @click="submit('form')"
208 - type="primary" 149 + :loading="btnLoading">
209 - size="small"
210 - v-if="$route.params.handle != 'detail'"
211 - @click="submit('form')"
212 - :loading="btnLoading"
213 - >
214 <span v-if="$route.params.handle === 'add'">添加</span> 150 <span v-if="$route.params.handle === 'add'">添加</span>
215 <span v-else>保存</span> 151 <span v-else>保存</span>
216 </el-button> 152 </el-button>
...@@ -221,14 +157,14 @@ ...@@ -221,14 +157,14 @@
221 </template> 157 </template>
222 158
223 <script> 159 <script>
224 -import { 160 + import {
225 findByFlightId, 161 findByFlightId,
226 updateOrAddFlight, 162 updateOrAddFlight,
227 allDictData, 163 allDictData,
228 findDestinationFltRuleByActualFlight, 164 findDestinationFltRuleByActualFlight,
229 -} from "@/api/destinationFlight"; 165 + } from "@/api/destinationFlight";
230 166
231 -export default { 167 + export default {
232 data() { 168 data() {
233 return { 169 return {
234 form: { 170 form: {
...@@ -236,20 +172,27 @@ export default { ...@@ -236,20 +172,27 @@ export default {
236 declarationCategory: [], 172 declarationCategory: [],
237 serviceCode: [], 173 serviceCode: [],
238 subCategory: [], 174 subCategory: [],
175 + handlingCode:[],
239 }, 176 },
240 rules: { 177 rules: {
241 - purposeOfFlightNo: [ 178 + purposeOfFlightNo: [{
242 - { required: true, message: "请输入航班号", trigger: "blur" }, 179 + required: true,
243 - ], 180 + message: "请输入航班号",
181 + trigger: "blur"
182 + }, ],
244 }, 183 },
245 typeOfGoods: [], 184 typeOfGoods: [],
246 declarationCategory: [], 185 declarationCategory: [],
247 formServiceCode: [], 186 formServiceCode: [],
187 + formHandlingCode:[],
248 formSubCategory: [], 188 formSubCategory: [],
249 cargoType: [], 189 cargoType: [],
250 cargoStatus: [], 190 cargoStatus: [],
251 serviceCode: [], 191 serviceCode: [],
192 + handlingCode:[],
252 subCategory: [], 193 subCategory: [],
194 + isLocation: "1",
195 + isNeedRequired: 0,
253 disable: false, 196 disable: false,
254 nameDisabled: false, 197 nameDisabled: false,
255 btnLoading: false, 198 btnLoading: false,
...@@ -258,6 +201,20 @@ export default { ...@@ -258,6 +201,20 @@ export default {
258 }; 201 };
259 }, 202 },
260 methods: { 203 methods: {
204 + //排序
205 + sorttodo(arr, englishName){
206 + var index = 1, newArr = [], length = arr.length;
207 + for ( var i=0; i<length; i++){
208 + if ( arr[i].englishName === englishName ){
209 + newArr[0] = arr[i];
210 + }
211 + else{
212 + newArr[index++] = arr[i];
213 + }
214 + }
215 + return newArr;
216 + },
217 +
261 submit(form) { 218 submit(form) {
262 this.$refs[form].validate((valid) => { 219 this.$refs[form].validate((valid) => {
263 if (!valid) { 220 if (!valid) {
...@@ -276,7 +233,56 @@ export default { ...@@ -276,7 +233,56 @@ export default {
276 this.typeOfGoods = this.form.typeOfGoods; 233 this.typeOfGoods = this.form.typeOfGoods;
277 this.declarationCategory = this.form.declarationCategory; 234 this.declarationCategory = this.form.declarationCategory;
278 this.formServiceCode = this.form.serviceCode; 235 this.formServiceCode = this.form.serviceCode;
236 + this.formHandlingCode = this.form.handlingCode;
279 this.formSubCategory = this.form.subCategory; 237 this.formSubCategory = this.form.subCategory;
238 + this.form.isNeedRequired = this.isNeedRequired;
239 + if (this.isLocation == 1) {
240 + this.form.notLocation = "";
241 + } else {
242 + this.form.location = "";
243 + }
244 + if (
245 + this.form.includeUrsa &&
246 + this.form.includeUrsa.length != 0 &&
247 + this.form.notIncludeUrsa &&
248 + this.form.notIncludeUrsa.length != 0
249 + ) {
250 + let include = this.form.includeUrsa.split(";");
251 + let notInclude = this.form.notIncludeUrsa.split(";");
252 + let errorList = [];
253 + notInclude.forEach((element) => {
254 + if (element.indexOf("_") > 0) {
255 + errorList.push(element);
256 + } else {
257 + let flag = 0;
258 + for (let i = 0; i < include.length; i++) {
259 + if (
260 + element == "" ||
261 + (include[i].indexOf("_") > 0 &&
262 + include[i].substring(0, 1) == element.substring(0, 1))
263 + ) {
264 + flag = 1;
265 + break;
266 + }
267 + }
268 + if (flag == 0) {
269 + errorList.push(element);
270 + }
271 + }
272 + });
273 + console.log(errorList);
274 + if (errorList.length != 0) {
275 + this.$message({
276 + showClose: true,
277 + message: "URSA不包含中[" +
278 + errorList +
279 + "]错误，URSA不包含必须属于URSA包含中的类型",
280 + type: "error",
281 + });
282 + this.btnLoading = false;
283 + return;
284 + }
285 + }
280 updateOrAddFlight(this.form).then((response) => { 286 updateOrAddFlight(this.form).then((response) => {
281 if (response.code === 200) { 287 if (response.code === 200) {
282 this.$message({ 288 this.$message({
...@@ -297,6 +303,7 @@ export default { ...@@ -297,6 +303,7 @@ export default {
297 this.form.typeOfGoods = this.typeOfGoods; 303 this.form.typeOfGoods = this.typeOfGoods;
298 this.form.declarationCategory = this.declarationCategory; 304 this.form.declarationCategory = this.declarationCategory;
299 this.form.serviceCode = this.formServiceCode; 305 this.form.serviceCode = this.formServiceCode;
306 + this.form.handlingCode = this.formHandlingCode;
300 this.form.subCategory = this.formSubCategory; 307 this.form.subCategory = this.formSubCategory;
301 }, 308 },
302 close() { 309 close() {
...@@ -331,6 +338,9 @@ export default { ...@@ -331,6 +338,9 @@ export default {
331 this.serviceCode = dict.serviceCode.sort((a, b) => 338 this.serviceCode = dict.serviceCode.sort((a, b) =>
332 a.englishName.localeCompare(b.englishName) 339 a.englishName.localeCompare(b.englishName)
333 ); 340 );
341 +
342 +
343 + this.handlingCode =this.sorttodo(dict.handlingCode,"BLANK");
334 this.subCategory = dict.subCategory; 344 this.subCategory = dict.subCategory;
335 }); 345 });
336 if (handle === "detail") { 346 if (handle === "detail") {
...@@ -354,19 +364,28 @@ export default { ...@@ -354,19 +364,28 @@ export default {
354 this.isEmpty = true; 364 this.isEmpty = true;
355 } else { 365 } else {
356 let info = response.data; 366 let info = response.data;
357 - info.typeOfGoods = info.typeOfGoods 367 + info.typeOfGoods = info.typeOfGoods ?
358 - ? info.typeOfGoods.split(";") 368 + info.typeOfGoods.split(";") :
359 - : []; 369 + [];
360 - info.declarationCategory = info.declarationCategory 370 + info.declarationCategory = info.declarationCategory ?
361 - ? info.declarationCategory.split(";") 371 + info.declarationCategory.split(";") :
362 - : []; 372 + [];
363 - info.serviceCode = info.serviceCode 373 + info.serviceCode = info.serviceCode ?
364 - ? info.serviceCode.split(";") 374 + info.serviceCode.split(";") :
365 - : []; 375 + [];
366 - info.subCategory = info.subCategory 376 + info.handlingCode = info.handlingCode ?
367 - ? info.subCategory.split(";") 377 + info.handlingCode.split(";") :
368 - : []; 378 + [];
379 + info.subCategory = info.subCategory ?
380 + info.subCategory.split(";") :
381 + [];
369 this.form = info; 382 this.form = info;
383 + if (info.location != null || info.location == "") {
384 + this.isLocation = "1";
385 + } else {
386 + this.isLocation = "2";
387 + }
388 + this.isNeedRequired = info.isNeedRequired;
370 } 389 }
371 this.loading = false; 390 this.loading = false;
372 }); 391 });
...@@ -382,19 +401,30 @@ export default { ...@@ -382,19 +401,30 @@ export default {
382 this.isEmpty = true; 401 this.isEmpty = true;
383 } else { 402 } else {
384 let info = response.data.list; 403 let info = response.data.list;
385 - info.typeOfGoods = info.typeOfGoods 404 + info.typeOfGoods = info.typeOfGoods ?
386 - ? info.typeOfGoods.split(";") 405 + info.typeOfGoods.split(";") :
387 - : []; 406 + [];
388 - info.declarationCategory = info.declarationCategory 407 + info.declarationCategory = info.declarationCategory ?
389 - ? info.declarationCategory.split(";") 408 + info.declarationCategory.split(";") :
390 - : []; 409 + [];
391 - info.serviceCode = info.serviceCode 410 + info.serviceCode = info.serviceCode ?
392 - ? info.serviceCode.split(";") 411 + info.serviceCode.split(";") :
393 - : []; 412 + [];
394 - info.subCategory = info.subCategory 413 + info.handlingCode = info.handlingCode ?
395 - ? info.subCategory.split(";") 414 + info.handlingCode.split(";") :
396 - : []; 415 + [];
416 + info.subCategory = info.subCategory ?
417 + info.subCategory.split(";") :
418 + [];
397 this.form = info; 419 this.form = info;
420 + if (info.location != null || info.location == "") {
421 + this.isLocation = "1";
422 + } else {
423 + this.isLocation = "2";
424 + }
425 + let isNeedRequired = response.data.isNeedRequired;
426 + this.form.isNeedRequired = isNeedRequired;
427 + this.isNeedRequired = isNeedRequired;
398 } 428 }
399 this.loading = false; 429 this.loading = false;
400 }); 430 });
...@@ -403,28 +433,32 @@ export default { ...@@ -403,28 +433,32 @@ export default {
403 this.loading = false; 433 this.loading = false;
404 } 434 }
405 }, 435 },
406 -}; 436 + };
407 </script> 437 </script>
408 <style rel="stylesheet/scss" lang="scss"> 438 <style rel="stylesheet/scss" lang="scss">
409 -.el-textarea.is-disabled .el-textarea__inner { 439 + .el-textarea.is-disabled .el-textarea__inner {
410 background-color: rgba(255, 255, 255, 0.5); 440 background-color: rgba(255, 255, 255, 0.5);
411 color: #303133; 441 color: #303133;
412 -} 442 + }
413 -.el-input.is-disabled .el-input__inner { 443 +
444 + .el-input.is-disabled .el-input__inner {
414 background-color: rgba(255, 255, 255, 0.5); 445 background-color: rgba(255, 255, 255, 0.5);
415 color: #303133; 446 color: #303133;
416 -} 447 + }
417 -.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner { 448 +
449 + .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
418 background-color: rgba(255, 255, 255, 0.5); 450 background-color: rgba(255, 255, 255, 0.5);
419 -} 451 + }
420 -.el-checkbox__input.is-disabled + span.el-checkbox__label { 452 +
453 + .el-checkbox__input.is-disabled+span.el-checkbox__label {
421 color: #303133; 454 color: #303133;
422 -} 455 + }
423 -.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after { 456 +
457 + .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
424 border-color: #303133; 458 border-color: #303133;
425 -} 459 + }
426 -.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner { 460 +
461 + .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
427 border-color: #606266; 462 border-color: #606266;
428 -} 463 + }
429 </style> 464 </style>
430 -
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
65 65
66 66
67 <!-- 查看目的航班对话框 --> 67 <!-- 查看目的航班对话框 -->
68 - <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false"> 68 + <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false" :append-to-body="true">
69 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate"> 69 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
70 70
71 <el-table-column label="原航班" align="center" prop="sourceFlightNo" /> 71 <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 84
85 85
86 <!-- 添加或修改对话框 --> 86 <!-- 添加或修改对话框 -->
87 - <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false"> 87 + <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
88 <el-form ref="form" :model="form" :rules="rules" label-width="100px"> 88 <el-form ref="form" :model="form" :rules="rules" label-width="100px">
89 <el-row> 89 <el-row>
90 <el-col :span="10"> 90 <el-col :span="10">
......
...@@ -55,9 +55,7 @@ ...@@ -55,9 +55,7 @@
55 <el-form-item> 55 <el-form-item>
56 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> 56 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
57 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> 57 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
58 -
59 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> 58 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
60 -
61 </el-form-item> 59 </el-form-item>
62 </el-form> 60 </el-form>
63 <!-- <el-row :gutter="10" class="mb8"> 61 <!-- <el-row :gutter="10" class="mb8">
...@@ -114,7 +112,8 @@ ...@@ -114,7 +112,8 @@
114 </el-table-column> --> 112 </el-table-column> -->
115 <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="120" /> 113 <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="120" />
116 114
117 - <el-table-column v-if="findAllFltDatList.length>0" label="操作" align="center" class-name="small-padding fixed-width" width="130" fixed="right"> 115 + <el-table-column v-if="findAllFltDatList.length>0" label="操作" align="center"
116 + class-name="small-padding fixed-width" width="130" fixed="right">
118 <template slot-scope="scope"> 117 <template slot-scope="scope">
119 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button> 118 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
120 <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteorPlayorpause(scope.row,0,'删除')"> 119 <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteorPlayorpause(scope.row,0,'删除')">
...@@ -130,12 +129,13 @@ ...@@ -130,12 +129,13 @@
130 129
131 130
132 <!-- 添加或修改对话框 --> 131 <!-- 添加或修改对话框 -->
133 - <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false"> 132 + <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
134 <el-form ref="form" :model="form" :rules="rules" label-width="130px"> 133 <el-form ref="form" :model="form" :rules="rules" label-width="130px">
135 <el-row> 134 <el-row>
136 <el-col :span="12"> 135 <el-col :span="12">
137 <el-form-item label="航班号" prop="fltNo"> 136 <el-form-item label="航班号" prop="fltNo">
138 - <el-input @blur="blurfltNo" :disabled="formdisabled.fltNo" style="width:93%;" v-model="form.fltNo" placeholder="请输入航班号" /> 137 + <el-input @blur="blurfltNo" :disabled="formdisabled.fltNo" style="width:93%;" v-model="form.fltNo"
138 + placeholder="请输入航班号" />
139 </el-form-item> 139 </el-form-item>
140 </el-col> 140 </el-col>
141 <!-- <el-col :span="1"> &#12288;</el-col> --> 141 <!-- <el-col :span="1"> &#12288;</el-col> -->
...@@ -181,23 +181,21 @@ ...@@ -181,23 +181,21 @@
181 </el-col> 181 </el-col>
182 <el-col :span="12"> 182 <el-col :span="12">
183 <el-form-item label="原始重量（KG）" prop="originalWeight"> 183 <el-form-item label="原始重量（KG）" prop="originalWeight">
184 - <el-input placeholder="请输入原始重量（KG）" style="width:93%" min="0" 184 + <el-input-number @change="LowHighAvailable" placeholder="请输入原始重量（KG）" style="width:93%"
185 - oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 185 + v-model="form.originalWeight" :precision="2"></el-input-number>
186 - v-model="form.originalWeight"></el-input>
187 </el-form-item> 186 </el-form-item>
188 </el-col> 187 </el-col>
189 188
190 <el-col :span="12"> 189 <el-col :span="12">
191 <el-form-item label="额外增重百分比" prop="extraWeightPercent"> 190 <el-form-item label="额外增重百分比" prop="extraWeightPercent">
192 - <el-input placeholder="请输入额外增重百分比" style="width:93%" min="0" 191 + <el-input-number @change="LowHighAvailable" placeholder="请输入额外增重百分比" style="width:93%"
193 - oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 192 + v-model="form.extraWeightPercent" :precision="2"></el-input-number>
194 - v-model="form.extraWeightPercent"></el-input>
195 </el-form-item> 193 </el-form-item>
196 </el-col> 194 </el-col>
197 195
198 <el-col :span="12"> 196 <el-col :span="12">
199 <el-form-item label="是否开启高低价" prop="highLowPriceFlg"> 197 <el-form-item label="是否开启高低价" prop="highLowPriceFlg">
200 - <el-switch v-model="form.highLowPriceFlg" active-color="#13ce66"> 198 + <el-switch @change='LowHighAvailable' v-model="form.highLowPriceFlg" active-color="#13ce66">
201 </el-switch> 199 </el-switch>
202 </el-form-item> 200 </el-form-item>
203 </el-col> 201 </el-col>
...@@ -212,34 +210,61 @@ ...@@ -212,34 +210,61 @@
212 210
213 <el-col :span="12"> 211 <el-col :span="12">
214 <el-form-item label="高价百分比" prop="highPriceWeightPercent"> 212 <el-form-item label="高价百分比" prop="highPriceWeightPercent">
215 - <el-input placeholder="请输入高价百分比" style="width:93%" min="0" 213 + <el-input-number @change="LowHighAvailable" placeholder="请输入高价百分比" style="width:93%"
216 - oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 214 + v-model="form.highPriceWeightPercent" :precision="2"></el-input-number>
217 - v-model="form.highPriceWeightPercent"></el-input>
218 </el-form-item> 215 </el-form-item>
219 </el-col> 216 </el-col>
220 217
221 <el-col :span="12"> 218 <el-col :span="12">
222 <el-form-item label="低价百分比" prop="lowPriceWeightPercent"> 219 <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
223 - <el-input placeholder="请输入低价百分比" style="width:93%" min="0" 220 + <el-input-number @change="LowHighAvailable" placeholder="请输入低价百分比" style="width:93%"
224 - oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 221 + v-model="form.lowPriceWeightPercent" :precision="2"></el-input-number>
225 - v-model="form.lowPriceWeightPercent"></el-input>
226 </el-form-item> 222 </el-form-item>
227 </el-col> 223 </el-col>
228 224
229 <el-col :span="12"> 225 <el-col :span="12">
230 - <el-form-item label="已配重量" prop="alloctedWeight"> 226 + <el-form-item label="高价可配重量" prop="HighAvailableWeight">
231 - <el-input :disabled="true" placeholder="请输入已配重量" style="width:93%" min="0" 227 +
232 - oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 228 + <el-input-number :disabled="true" placeholder="请输入高价可配重量" style="width:93%"
233 - v-model="form.alloctedWeight"></el-input> 229 + v-model="form.HighAvailableWeight" :precision="2"></el-input-number>
230 + </el-form-item>
231 + </el-col>
232 + <el-col :span="12">
233 + <el-form-item label="低价可配重量" prop="LowAvailableWeight">
234 + <el-input-number :disabled="true" placeholder="请输入低价可配重量" style="width:93%"
235 + v-model="form.LowAvailableWeight" :precision="2"></el-input-number>
234 </el-form-item> 236 </el-form-item>
235 </el-col> 237 </el-col>
236 238
239 +
240 + <el-col :span="12">
241 + <el-form-item label="高价已配重量" prop="HighAllocatedWeight">
242 + <el-input-number :disabled="true" placeholder="请输入高价已配重量" style="width:93%"
243 + v-model="form.HighAllocatedWeight" :precision="2"></el-input-number>
244 + </el-form-item>
245 + </el-col>
246 + <el-col :span="12">
247 + <el-form-item label="低价已配重量" prop="LowAllocatedWeight">
248 + <el-input-number :disabled="true" placeholder="请输入低价已配重量" style="width:93%"
249 + v-model="form.LowAllocatedWeight" :precision="2"></el-input-number>
250 + </el-form-item>
251 + </el-col>
252 + <el-col :span="12">
253 + <el-form-item label="已配总重量" prop="alloctedWeight">
254 +
255 + <el-input-number :disabled="true" placeholder="请输入已配总重量" style="width:93%" v-model="form.alloctedWeight"
256 + :precision="2"></el-input-number>
257 +
258 + </el-form-item>
259 + </el-col>
260 +
261 +
237 </el-row> 262 </el-row>
238 263
239 264
240 </el-form> 265 </el-form>
241 <div slot="footer" class="dialog-footer"> 266 <div slot="footer" class="dialog-footer">
242 - <el-button type="primary" :disabled="form.alloctedWeight>0 ? true:false" @click="submitForm">确 定</el-button> 267 + <el-button type="primary" @click="submitForm">确 定</el-button>
243 <el-button @click="cancel">取 消</el-button> 268 <el-button @click="cancel">取 消</el-button>
244 </div> 269 </div>
245 </el-dialog> 270 </el-dialog>
...@@ -251,7 +276,8 @@ ...@@ -251,7 +276,8 @@
251 findAllFltDataApi, 276 findAllFltDataApi,
252 findFltById, 277 findFltById,
253 saveOrUpdate, 278 saveOrUpdate,
254 - findFltCommonConf 279 + findFltCommonConf,
280 + updateStatusBatch
255 281
256 } from "@/api/findAllFltData"; 282 } from "@/api/findAllFltData";
257 export default { 283 export default {
...@@ -360,42 +386,44 @@ ...@@ -360,42 +386,44 @@
360 }, 386 },
361 methods: { 387 methods: {
362 //输入航班号后 388 //输入航班号后
363 - blurfltNo(){ 389 + blurfltNo() {
364 - if(this.form.fltNo!=null&&this.form.fltNo!=undefined &&this.form.fltNo!=""){ 390 + if (this.form.fltNo != null && this.form.fltNo != undefined && this.form.fltNo != "") {
365 - this.form.fltNo=this.form.fltNo.toUpperCase(); 391 + this.form.fltNo = this.form.fltNo.toUpperCase();
366 findFltCommonConf(this.form).then(response => { 392 findFltCommonConf(this.form).then(response => {
367 if (response.code == 200) { 393 if (response.code == 200) {
368 //额外增重百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置为0，不可编辑 394 //额外增重百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置为0，不可编辑
369 - if(response.data.extraWeightPercent!=null&&response.data.extraWeightPercent!=undefined){ 395 + if (response.data.extraWeightPercent != null && response.data.extraWeightPercent != undefined) {
370 this.$set(this.form, "extraWeightPercent", response.data.extraWeightPercent); 396 this.$set(this.form, "extraWeightPercent", response.data.extraWeightPercent);
371 // this.form.extraWeightPercent=response.data.extraWeightPercent; 397 // this.form.extraWeightPercent=response.data.extraWeightPercent;
372 - }else{ 398 + } else {
373 this.$set(this.form, "extraWeightPercent", 0); 399 this.$set(this.form, "extraWeightPercent", 0);
374 //this.form.extraWeightPercent=response.data.extraWeightPercent=0; 400 //this.form.extraWeightPercent=response.data.extraWeightPercent=0;
375 } 401 }
376 //是否开启高低价：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否开启高低价’ 为是，不可编辑 402 //是否开启高低价：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否开启高低价’ 为是，不可编辑
377 - if(response.data.highLowPriceFlg!=null&&response.data.highLowPriceFlg!=undefined){ 403 + if (response.data.highLowPriceFlg != null && response.data.highLowPriceFlg != undefined) {
378 - this.form.highLowPriceFlg=response.data.highLowPriceFlg=== 1 ? true : false; 404 + this.form.highLowPriceFlg = response.data.highLowPriceFlg === 1 ? true : false;
379 - }else{ 405 + } else {
380 - this.form.highLowPriceFlg=response.data.highLowPriceFlg=1; 406 + this.form.highLowPriceFlg = true;
381 } 407 }
382 //是否预审：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否预审’ 为否，不可编辑； 408 //是否预审：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否预审’ 为否，不可编辑；
383 - if(response.data.isNeedRequired!=null&&response.data.isNeedRequired!=undefined){ 409 + if (response.data.isNeedRequired != null && response.data.isNeedRequired != undefined) {
384 - this.form.isNeedRequired=response.data.isNeedRequired=== 1 ? true : false; 410 + this.form.isNeedRequired = response.data.isNeedRequired === 1 ? true : false;
385 - }else{ 411 + } else {
386 - this.form.isNeedRequired=response.data.isNeedRequired=1; 412 + this.form.isNeedRequired = false;
387 } 413 }
388 //高/低价百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘高价百分比’60%，‘低价百分比’40%，不可编辑 414 //高/低价百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘高价百分比’60%，‘低价百分比’40%，不可编辑
389 - if(response.data.highPriceWeightPercent!=null&&response.data.highPriceWeightPercent!=undefined){ 415 + if (response.data.highPriceWeightPercent != null && response.data.highPriceWeightPercent !=
390 - this.form.highPriceWeightPercent=response.data.highPriceWeightPercent; 416 + undefined) {
391 - }else{ 417 + this.form.highPriceWeightPercent = response.data.highPriceWeightPercent;
392 - this.form.highPriceWeightPercent=response.data.highPriceWeightPercent=60; 418 + } else {
419 + this.form.highPriceWeightPercent = response.data.highPriceWeightPercent = 60;
393 } 420 }
394 - if(response.data.lowPriceWeightPercent!=null&&response.data.lowPriceWeightPercent!=undefined){ 421 + if (response.data.lowPriceWeightPercent != null && response.data.lowPriceWeightPercent != undefined) {
395 - this.form.lowPriceWeightPercent=response.data.lowPriceWeightPercent; 422 + this.form.lowPriceWeightPercent = response.data.lowPriceWeightPercent;
396 - }else{ 423 + } else {
397 - this.form.lowPriceWeightPercent=response.data.lowPriceWeightPercent=40; 424 + this.form.lowPriceWeightPercent = response.data.lowPriceWeightPercent = 40;
398 } 425 }
426 + this.LowHighAvailable();
399 } else { 427 } else {
400 this.msgError(response.msg); 428 this.msgError(response.msg);
401 } 429 }
...@@ -418,9 +446,9 @@ ...@@ -418,9 +446,9 @@
418 // 是否需要预审 1 预审 0 取消预审 446 // 是否需要预审 1 预审 0 取消预审
419 needRequiredFormat(row) { 447 needRequiredFormat(row) {
420 if (row.needRequired === 1) { 448 if (row.needRequired === 1) {
421 - return '预审' 449 + return '是'
422 } else { 450 } else {
423 - return '取消预审' 451 + return '否'
424 } 452 }
425 return row.ticketToPiece; 453 return row.ticketToPiece;
426 }, 454 },
...@@ -448,7 +476,7 @@ ...@@ -448,7 +476,7 @@
448 //航班类型 476 //航班类型
449 this.flightTypelist = response.data.flightType; 477 this.flightTypelist = response.data.flightType;
450 //航班状态 478 //航班状态
451 - 479 + // debugger
452 this.flightStatuslist = response.data.flightStatus; 480 this.flightStatuslist = response.data.flightStatus;
453 481
454 } else { 482 } else {
...@@ -460,7 +488,7 @@ ...@@ -460,7 +488,7 @@
460 488
461 // 多选框选中数据 489 // 多选框选中数据
462 handleSelectionChange(selection) { 490 handleSelectionChange(selection) {
463 - this.ids = selection.map(item => item.postId) 491 + this.ids = selection.map(item => item.id)
464 this.single = selection.length != 1 492 this.single = selection.length != 1
465 this.multiple = !selection.length 493 this.multiple = !selection.length
466 }, 494 },
...@@ -497,7 +525,10 @@ ...@@ -497,7 +525,10 @@
497 this.title = "添加航班信息"; 525 this.title = "添加航班信息";
498 this.form.id = null; 526 this.form.id = null;
499 this.form.statusId = this.flightStatuslist[0].id; 527 this.form.statusId = this.flightStatuslist[0].id;
500 - this.form.alloctedWeight = 0; 528 + this.form.alloctedWeight = 0; //已配重量
529 + this.form.LowAllocatedWeight = 0; //低价已配重量
530 + this.form.HighAllocatedWeight = 0; //高价已配重量
531 +
501 //航班号 532 //航班号
502 this.formdisabled.fltNo = false; 533 this.formdisabled.fltNo = false;
503 //航班日期 534 //航班日期
...@@ -511,6 +542,50 @@ ...@@ -511,6 +542,50 @@
511 //原始重量 542 //原始重量
512 this.formdisabled.originalWeight = false; 543 this.formdisabled.originalWeight = false;
513 }, 544 },
545 + //计算高地价可配
546 + LowHighAvailable() {
547 +
548 + //判断是否开启高地价
549 + if (this.form.highLowPriceFlg) {
550 + let Weight = 0;
551 + //计算实际重量
552 + if (this.form.highPriceWeightPercent > 0 || this.form.lowPriceWeightPercent > 0) {
553 + Weight = this.Weightall();
554 + }
555 + //高价可配
556 + if (this.form.highPriceWeightPercent > 0) {
557 + this.$set(this.form, "HighAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
558 + .highPriceWeightPercent / 100));
559 + // this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100)
560 + } else {
561 + this.$set(this.form, "HighAvailableWeight", 0);
562 + // this.form.HighAvailableWeight = 0;
563 + }
564 + //低价可配
565 + if (this.form.lowPriceWeightPercent > 0) {
566 +
567 + this.$set(this.form, "LowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
568 + .HighAvailableWeight);
569 + //this.form.LowAvailableWeight = Weightall - this.form.HighAvailableWeight;
570 + } else {
571 + this.$set(this.form, "LowAvailableWeight", 0);
572 + // this.form.LowAvailableWeight = 0;
573 + }
574 +
575 + }
576 +
577 + },
578 + //计算实际重量
579 + Weightall() {
580 + let Weight = 0;
581 + if (this.form.extraWeightPercent > 0) {
582 + Weight = this.form.originalWeight + this.form.originalWeight * (this.form.extraWeightPercent / 100)
583 + } else {
584 + Weight = this.form.originalWeight;
585 + }
586 + return Weight;
587 + },
588 +
514 /** 修改按钮操作 */ 589 /** 修改按钮操作 */
515 handleUpdate(row) { 590 handleUpdate(row) {
516 this.reset(); 591 this.reset();
...@@ -528,25 +603,9 @@ ...@@ -528,25 +603,9 @@
528 this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false; 603 this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false;
529 //是否预审 604 //是否预审
530 this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false; 605 this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false;
531 - // if (this.form.alloctedWeight > 0) { 606 + // 计算高地价可配
532 - // //航班路线 607 + this.LowHighAvailable();
533 - // this.formdisabled.route = true; 608 +
534 - // //航班种类
535 - // this.formdisabled.kindId = true;
536 - // //航班类型
537 - // this.formdisabled.typeId = true;
538 - // //原始重量
539 - // this.formdisabled.originalWeight = true;
540 - // }else{
541 - // //航班路线
542 - // this.formdisabled.route = false;
543 - // //航班种类
544 - // this.formdisabled.kindId = false;
545 - // //航班类型
546 - // this.formdisabled.typeId = false;
547 - // //原始重量
548 - // this.formdisabled.originalWeight = false;
549 - // }
550 } else { 609 } else {
551 this.msgError(response.msg); 610 this.msgError(response.msg);
552 } 611 }
...@@ -593,15 +652,27 @@ ...@@ -593,15 +652,27 @@
593 if (valid) { 652 if (valid) {
594 //debugger 653 //debugger
595 let formdata = JSON.parse(JSON.stringify(this.form)); 654 let formdata = JSON.parse(JSON.stringify(this.form));
655 +
596 //高价百分比和低价百分比和不可以大于100 656 //高价百分比和低价百分比和不可以大于100
597 - if(formdata.highPriceWeightPercent+formdata.lowPriceWeightPercent>100){ 657 + if (this.form.highLowPriceFlg && formdata.highPriceWeightPercent + formdata.lowPriceWeightPercent !=
598 - this.$message.warning("高低价百分比总和不可以大于100"); 658 + 100) {
659 + this.$message.warning("请正确填写高低价百分比");
660 + return;
661 + }
662 + //已删除的无法修改
663 + //拿到已删除的id
664 + let statusId=0;
665 + this.flightStatuslist.map((item) => {
666 + // this.unitList 是你 select option遍历的集合 e 是选中的id
667 + if (item.chineseName === "已删除") {
668 + statusId=item.id;
669 + return;
670 + }
671 + })
672 + if (statusId === formdata.statusId) {
673 + this.$message.warning("已删除的航班无法修改");
599 return; 674 return;
600 } 675 }
601 -
602 -
603 -
604 -
605 //是否开启高地价 676 //是否开启高地价
606 formdata.highLowPriceFlg = formdata.highLowPriceFlg ? 1 : 0; 677 formdata.highLowPriceFlg = formdata.highLowPriceFlg ? 1 : 0;
607 //是否预审 678 //是否预审
...@@ -641,8 +712,7 @@ ...@@ -641,8 +712,7 @@
641 this.queryParams.pageNum = 1; 712 this.queryParams.pageNum = 1;
642 this.queryParams.start = 0; 713 this.queryParams.start = 0;
643 this.findAllFltData(); 714 this.findAllFltData();
644 - } 715 + },
645 -
646 } 716 }
647 }; 717 };
648 </script> 718 </script>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="cargoPage" v-loading="downloading"> 2 <div class="cargoPage" v-loading="downloading">
3 <el-form 3 <el-form
4 ref="cargoForm" 4 ref="cargoForm"
5 - size="mini" 5 + size="small"
6 :model="formData" 6 :model="formData"
7 label-position="top" 7 label-position="top"
8 label-width="auto" 8 label-width="auto"
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
10 > 10 >
11 <el-row type="flex" style="flexWrap: wrap!important"> 11 <el-row type="flex" style="flexWrap: wrap!important">
12 <el-col :span="6"> 12 <el-col :span="6">
13 - <el-form-item label="ACCS航班日期:"> 13 + <el-form-item label="配舱航班日期:">
14 <el-date-picker 14 <el-date-picker
15 class="formItem" 15 class="formItem"
16 - v-model="flightTime" 16 + v-model="cargoPlaneTime"
17 type="daterange" 17 type="daterange"
18 range-separator="至" 18 range-separator="至"
19 start-placeholder="开始日期" 19 start-placeholder="开始日期"
...@@ -24,34 +24,21 @@ ...@@ -24,34 +24,21 @@
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 <el-col :span="6"> 26 <el-col :span="6">
27 - <el-form-item label="创建日期:"> 27 + <el-form-item label="配载航班号:">
28 - <el-date-picker 28 + <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002"></el-input>
29 - class="formItem"
30 - v-model="createDate"
31 - type="daterange"
32 - range-separator="至"
33 - start-placeholder="开始日期"
34 - end-placeholder="结束日期"
35 - :value-format="valueFormat"
36 - >
37 - </el-date-picker>
38 - </el-form-item>
39 - </el-col>
40 - <el-col :span="6">
41 - <el-form-item label="ACCS航班号:">
42 - <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input>
43 </el-form-item> 29 </el-form-item>
44 </el-col> 30 </el-col>
45 <el-col :span="6"> 31 <el-col :span="6">
46 - <el-form-item label="申报类别:"> 32 + <el-form-item label="海关回执状态:">
47 <el-select 33 <el-select
48 placeholder="不限" 34 placeholder="不限"
49 - v-model="formData.typeId" 35 + v-model="formData.customsReceiptStatusId"
50 class="formItem" 36 class="formItem"
37 + multiple
51 clearable 38 clearable
52 > 39 >
53 <el-option 40 <el-option
54 - v-for="item in findConditionData.cargoType" 41 + v-for="item in findConditionData.cargoCustomsReturnStatus"
55 :label="item.chineseName" 42 :label="item.chineseName"
56 :value="item.id" 43 :value="item.id"
57 :key="item.id" 44 :key="item.id"
...@@ -60,42 +47,26 @@ ...@@ -60,42 +47,26 @@
60 </el-select> 47 </el-select>
61 </el-form-item> 48 </el-form-item>
62 </el-col> 49 </el-col>
63 - <el-col :span="24">
64 - <el-collapse>
65 - <el-collapse-item>
66 - <template slot="title">
67 - <span style="fontWeight:900;color:#409EFF;fontSize:14px"><i class="el-icon-s-tools"></i>更多查询条件</span>
68 - </template>
69 - <el-row type="flex" style="flexWrap: wrap!important">
70 <el-col :span="6"> 50 <el-col :span="6">
71 - <el-form-item label="货物状态:"> 51 + <el-form-item label="运单号:">
72 - <el-select 52 + <el-input
73 - placeholder="不限" 53 + type="textarea"
74 - v-model="formData.statusId" 54 + v-model="formData.waybillNo"
75 class="formItem" 55 class="formItem"
76 - filterable 56 + placeholder="xxxx;xxxx"
77 - clearable 57 + ></el-input>
78 - >
79 - <el-option
80 - v-for="item in findConditionData.cargoStatus"
81 - :label="item.chineseName"
82 - :value="item.id"
83 - :key="item.id"
84 - >
85 - </el-option>
86 - </el-select>
87 </el-form-item> 58 </el-form-item>
88 </el-col> 59 </el-col>
89 <el-col :span="6"> 60 <el-col :span="6">
90 - <el-form-item label="海关回执状态:"> 61 + <el-form-item label="申报类别:">
91 <el-select 62 <el-select
92 placeholder="不限" 63 placeholder="不限"
93 - v-model="formData.customsReceiptStatusId" 64 + v-model="formData.typeId"
94 class="formItem" 65 class="formItem"
95 clearable 66 clearable
96 > 67 >
97 <el-option 68 <el-option
98 - v-for="item in findConditionData.cargoCustomsReturnStatus" 69 + v-for="item in findConditionData.cargoType"
99 :label="item.chineseName" 70 :label="item.chineseName"
100 :value="item.id" 71 :value="item.id"
101 :key="item.id" 72 :key="item.id"
...@@ -124,50 +95,49 @@ ...@@ -124,50 +95,49 @@
124 </el-form-item> 95 </el-form-item>
125 </el-col> 96 </el-col>
126 <el-col :span="6"> 97 <el-col :span="6">
127 - <el-form-item label="是否自动:"> 98 + <el-form-item label="URSA:">
128 - <el-select
129 - placeholder="不限"
130 - v-model="formData.allocationTypeId"
131 - class="formItem"
132 - clearable
133 - >
134 - <el-option
135 - label="手动"
136 - value="1"
137 - >
138 - </el-option>
139 - <el-option
140 - label="自动"
141 - value="2"
142 - >
143 - </el-option>
144 - </el-select>
145 - </el-form-item>
146 - </el-col>
147 - <el-col :span="6">
148 - <el-form-item label="运单号:">
149 <el-input 99 <el-input
150 type="textarea" 100 type="textarea"
151 - v-model="formData.waybillNo" 101 + v-model="ursa"
152 class="formItem" 102 class="formItem"
153 - placeholder="xxxx;xxxx" 103 + placeholder="S_;P_;E2"
154 ></el-input> 104 ></el-input>
155 </el-form-item> 105 </el-form-item>
156 </el-col> 106 </el-col>
157 <el-col :span="6"> 107 <el-col :span="6">
158 <el-form-item label="站点:"> 108 <el-form-item label="站点:">
159 <el-input 109 <el-input
110 + type="textarea"
160 v-model="siteName" 111 v-model="siteName"
161 class="formItem" 112 class="formItem"
113 + placeholder="PVG;PEK"
162 ></el-input> 114 ></el-input>
163 </el-form-item> 115 </el-form-item>
164 </el-col> 116 </el-col>
117 + <el-col :span="24">
118 + <el-collapse>
119 + <el-collapse-item>
120 + <template slot="title">
121 + <span style="fontWeight:900;color:#409EFF;fontSize:14px"><i class="el-icon-s-tools"></i>更多查询条件</span>
122 + </template>
123 + <el-row type="flex" style="flexWrap: wrap!important">
165 <el-col :span="6"> 124 <el-col :span="6">
166 - <el-form-item label="URSA:"> 125 + <el-form-item label="ACCS原航班日期:">
167 - <el-input 126 + <el-date-picker
168 - v-model="ursa"
169 class="formItem" 127 class="formItem"
170 - ></el-input> 128 + v-model="flightTime"
129 + type="daterange"
130 + range-separator="至"
131 + start-placeholder="开始日期"
132 + end-placeholder="结束日期"
133 + :value-format="valueFormat"
134 + >
135 + </el-date-picker>
136 + </el-form-item>
137 + </el-col>
138 + <el-col :span="6">
139 + <el-form-item label="ACCS航班号:">
140 + <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input>
171 </el-form-item> 141 </el-form-item>
172 </el-col> 142 </el-col>
173 <el-col :span="6"> 143 <el-col :span="6">
...@@ -181,6 +151,60 @@ ...@@ -181,6 +151,60 @@
181 </el-date-picker> 151 </el-date-picker>
182 </el-form-item> 152 </el-form-item>
183 </el-col> 153 </el-col>
154 + <el-col :span="6">
155 + <el-form-item label="创建日期:">
156 + <el-date-picker
157 + class="formItem"
158 + v-model="createDate"
159 + type="daterange"
160 + range-separator="至"
161 + start-placeholder="开始日期"
162 + end-placeholder="结束日期"
163 + :value-format="valueFormat"
164 + >
165 + </el-date-picker>
166 + </el-form-item>
167 + </el-col>
168 + <el-col :span="6">
169 + <el-form-item label="货物状态:">
170 + <el-select
171 + placeholder="不限"
172 + v-model="formData.statusId"
173 + class="formItem"
174 + filterable
175 + clearable
176 + >
177 + <el-option
178 + v-for="item in findConditionData.cargoStatus"
179 + :label="item.chineseName"
180 + :value="item.id"
181 + :key="item.id"
182 + >
183 + </el-option>
184 + </el-select>
185 + </el-form-item>
186 + </el-col>
187 + <el-col :span="6">
188 + <el-form-item label="是否自动:">
189 + <el-select
190 + placeholder="不限"
191 + v-model="formData.allocationTypeId"
192 + class="formItem"
193 + clearable
194 + >
195 + <el-option
196 + label="手动"
197 + value="1"
198 + >
199 + </el-option>
200 + <el-option
201 + label="自动"
202 + value="2"
203 + >
204 + </el-option>
205 + </el-select>
206 + </el-form-item>
207 + </el-col>
184 </el-row> 208 </el-row>
185 </el-collapse-item> 209 </el-collapse-item>
186 </el-collapse> 210 </el-collapse>
...@@ -226,15 +250,6 @@ ...@@ -226,15 +250,6 @@
226 </el-form-item> 250 </el-form-item>
227 </el-col> --> 251 </el-col> -->
228 <!-- <el-col :span="6"> 252 <!-- <el-col :span="6">
229 - <el-form-item label="航班序列单号:">
230 - <el-input
231 - type="text"
232 - v-model="formData.mawbCode"
233 - class="formItem"
234 - ></el-input>
235 - </el-form-item>
236 - </el-col> -->
237 - <!-- <el-col :span="6">
238 <el-form-item label="配置航班类型:"> 253 <el-form-item label="配置航班类型:">
239 <el-select 254 <el-select
240 placeholder="不限" 255 placeholder="不限"
...@@ -270,8 +285,17 @@ ...@@ -270,8 +285,17 @@
270 </el-select> 285 </el-select>
271 </el-form-item> 286 </el-form-item>
272 </el-col> --> 287 </el-col> -->
288 + <!-- <el-col :span="6">
289 + <el-form-item label="航班序列单号:">
290 + <el-input
291 + type="text"
292 + v-model="formData.mawbCode"
293 + class="formItem"
294 + ></el-input>
295 + </el-form-item>
296 + </el-col> -->
273 </el-row> 297 </el-row>
274 - <div style="paddingleft: 10px;marginTop:20px"> 298 + <div style="paddingLeft: 10px;marginTop:20px">
275 <el-button 299 <el-button
276 type="primary" 300 type="primary"
277 icon="el-icon-search" 301 icon="el-icon-search"
...@@ -298,12 +322,13 @@ ...@@ -298,12 +322,13 @@
298 ref="cargoTable" 322 ref="cargoTable"
299 :data="tableData" 323 :data="tableData"
300 v-loading="tableLoading" 324 v-loading="tableLoading"
301 - border 325 + highlight-current-row border stripe
326 + size="mini"
302 @select="cheacked" 327 @select="cheacked"
303 @select-all="selectAll" 328 @select-all="selectAll"
304 > 329 >
305 - <el-table-column type="selection" width="55" fixed> </el-table-column> 330 + <el-table-column type="selection" width="55" fixed align="center"> </el-table-column>
306 - <el-table-column type="index" label="序号"> 331 + <el-table-column type="index" label="序号" align="center">
307 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 332 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
308 </el-table-column> 333 </el-table-column>
309 <el-table-column 334 <el-table-column
...@@ -311,9 +336,9 @@ ...@@ -311,9 +336,9 @@
311 :prop="item.value" 336 :prop="item.value"
312 :label="item.name" 337 :label="item.name"
313 :key="item.name" 338 :key="item.name"
314 - width="150"
315 header-align="center" 339 header-align="center"
316 align="center" 340 align="center"
341 + :width="item.value=='bigPretrialOpinion'?'300':'170'"
317 :formatter="formatter" 342 :formatter="formatter"
318 sortable 343 sortable
319 > 344 >
...@@ -323,7 +348,7 @@ ...@@ -323,7 +348,7 @@
323 :total="totalCount" 348 :total="totalCount"
324 :page-size.sync="limitSize" 349 :page-size.sync="limitSize"
325 background 350 background
326 - style="margin-top: 40px; text-align: right" 351 + style="marginTop: 40px; textAlign: right"
327 @next-click="nextClick" 352 @next-click="nextClick"
328 @prev-click="prevClick" 353 @prev-click="prevClick"
329 @current-change="currentChange" 354 @current-change="currentChange"
...@@ -371,10 +396,11 @@ export default { ...@@ -371,10 +396,11 @@ export default {
371 { name: "取件扫描号", value: "pickUpScanNo" }, 396 { name: "取件扫描号", value: "pickUpScanNo" },
372 { name: "服务类型", value: "serviceTypeName" }, 397 { name: "服务类型", value: "serviceTypeName" },
373 { name: "运单号", value: "waybillNo" }, 398 { name: "运单号", value: "waybillNo" },
399 + { name: "总单号", value: "totalWaybillNo" },
374 { name: "货物状态", value: "statusName" }, 400 { name: "货物状态", value: "statusName" },
375 - { name: "ACCS航班号", value: "fltNoAccs" }, 401 + { name: "ACCS原航班号", value: "fltNoAccs" },
376 - { name: "ACCS航班日期", value: "fltDateAccs" }, 402 + { name: "ACCS原航班日期", value: "fltDateAccs" },
377 - { name: "ACCS航线", value: "accsFlightRoute" }, 403 + { name: "ACCS原航线", value: "accsFlightRoute" },
378 { name: "预配航班日期", value: "preplanFlightTime" }, 404 { name: "预配航班日期", value: "preplanFlightTime" },
379 { name: "预配航班号", value: "preplanFlightNo" }, 405 { name: "预配航班号", value: "preplanFlightNo" },
380 { name: "二配航班日期", value: "twoMatchFlightTime" }, 406 { name: "二配航班日期", value: "twoMatchFlightTime" },
...@@ -470,6 +496,9 @@ export default { ...@@ -470,6 +496,9 @@ export default {
470 this.allQty = 0; 496 this.allQty = 0;
471 this.checks() 497 this.checks()
472 this.tableLoading = true; 498 this.tableLoading = true;
499 + if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
500 + this.formData.customsReceiptStatusId = null;
501 + }
473 if (this.createDate != null && this.createDate.length > 0) { 502 if (this.createDate != null && this.createDate.length > 0) {
474 this.formData.createTimeStart = this.createDate[0]; 503 this.formData.createTimeStart = this.createDate[0];
475 this.formData.createTimeEnd = this.createDate[1]; 504 this.formData.createTimeEnd = this.createDate[1];
...@@ -498,7 +527,6 @@ export default { ...@@ -498,7 +527,6 @@ export default {
498 this.formData.cargoPlaneStart = null; 527 this.formData.cargoPlaneStart = null;
499 this.formData.cargoPlaneEnd = null; 528 this.formData.cargoPlaneEnd = null;
500 } 529 }
501 -
502 this.formData.limitStart = this.limitStart; 530 this.formData.limitStart = this.limitStart;
503 this.formData.limitSize = this.limitSize; 531 this.formData.limitSize = this.limitSize;
504 findCargoData(this.formData).then((res) => { 532 findCargoData(this.formData).then((res) => {
...@@ -620,6 +648,9 @@ export default { ...@@ -620,6 +648,9 @@ export default {
620 // 导出表格 648 // 导出表格
621 xlse(page) { 649 xlse(page) {
622 let cargoXlse = {title:"货物导出表",cargoConditionDto:{}}; 650 let cargoXlse = {title:"货物导出表",cargoConditionDto:{}};
651 + if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
652 + this.formData.customsReceiptStatusId = null;
653 + }
623 if (this.createDate != null && this.createDate.length > 0) { 654 if (this.createDate != null && this.createDate.length > 0) {
624 this.formData.createTimeStart = this.createDate[0]; 655 this.formData.createTimeStart = this.createDate[0];
625 this.formData.createTimeEnd = this.createDate[1]; 656 this.formData.createTimeEnd = this.createDate[1];
...@@ -697,6 +728,14 @@ export default { ...@@ -697,6 +728,14 @@ export default {
697 this.formData.ursa = val.toUpperCase(); 728 this.formData.ursa = val.toUpperCase();
698 }, 729 },
699 }, 730 },
731 + cargoPlaneNo:{
732 + get: function () {
733 + return this.formData.cargoPlaneNo;
734 + },
735 + set: function (val) {
736 + this.formData.cargoPlaneNo = val.toUpperCase();
737 + },
738 + }
700 }, 739 },
701 }; 740 };
702 </script> 741 </script>
...@@ -712,5 +751,4 @@ export default { ...@@ -712,5 +751,4 @@ export default {
712 width:100%; 751 width:100%;
713 max-width: 300px; 752 max-width: 300px;
714 } 753 }
715 -
716 </style> 754 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 -//version:0.5.1 1 +//version:0.5.2
2 'use strict' 2 'use strict'
3 const path = require('path') 3 const path = require('path')
4 const defaultSettings = require('./src/settings.js') 4 const defaultSettings = require('./src/settings.js')
...@@ -36,7 +36,6 @@ module.exports = { ...@@ -36,7 +36,6 @@ module.exports = {
36 // detail: https://cli.vuejs.org/config/#devserver-proxy 36 // detail: https://cli.vuejs.org/config/#devserver-proxy
37 [process.env.VUE_APP_BASE_API]: { 37 [process.env.VUE_APP_BASE_API]: {
38 target: `https://imacuat.zmd.apac.fedex.com/IMAC2`, 38 target: `https://imacuat.zmd.apac.fedex.com/IMAC2`,
39 - // target: `http://192.168.1.45:8080`,
40 // target: `http://47.103.140.98:9002`, 39 // target: `http://47.103.140.98:9002`,
41 // target: `http://192.168.1.134:18080`, 40 // target: `http://192.168.1.134:18080`,
42 changeOrigin: true, 41 changeOrigin: true,
......