Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
91cd51b0 1 parent 682080ec

feat: 修改查询页面的请求参数

Inline Side-by-side
Showing 21 changed files with 268 additions and 107 deletions
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
8 v-model="textareaVisible" 8 v-model="textareaVisible"
9 > 9 >
10 <el-input 10 <el-input
11 - :name="`${dataKey}-textarea`" 11 + :name="`${dataKey}${curKey}-textarea`"
12 type="textarea" 12 type="textarea"
13 :rows="5" 13 :rows="5"
14 - :id="`popoverInput${dataKey}`" 14 + :id="`popoverInput${dataKey}${curKey}`"
15 class="inputShadow textareaPopover" 15 class="inputShadow textareaPopover"
16 v-model="formData[dataKey]" 16 v-model="formData[dataKey]"
17 resize="none" 17 resize="none"
...@@ -63,6 +63,10 @@ export default { ...@@ -63,6 +63,10 @@ export default {
63 type: String, 63 type: String,
64 default: "", 64 default: "",
65 }, 65 },
66 + curKey: {
67 + type: Number,
68 + default: 1,
69 + },
66 }, 70 },
67 data() { 71 data() {
68 return { 72 return {
...@@ -72,7 +76,7 @@ export default { ...@@ -72,7 +76,7 @@ export default {
72 watch: { 76 watch: {
73 formData: { 77 formData: {
74 handler(val) { 78 handler(val) {
75 - if (!val[this.dataKey]) { 79 + if (!val[this.dataKey] || val[this.dataKey].length <= 0) {
76 this.textareaVisible = false; 80 this.textareaVisible = false;
77 let inputInner = document.querySelector( 81 let inputInner = document.querySelector(
78 "#inputInner--" + this.dataKey 82 "#inputInner--" + this.dataKey
...@@ -89,7 +93,9 @@ export default { ...@@ -89,7 +93,9 @@ export default {
89 textareaFocus(val) { 93 textareaFocus(val) {
90 this.textareaVisible = true; 94 this.textareaVisible = true;
91 this.$nextTick(() => { 95 this.$nextTick(() => {
92 - document.querySelector("#popoverInput" + this.dataKey).focus(); 96 + document
97 + .querySelector(`#popoverInput${this.dataKey}${this.curKey}`)
98 + .focus();
93 document.querySelector("#inputInner--" + this.dataKey).style.display = 99 document.querySelector("#inputInner--" + this.dataKey).style.display =
94 "none"; 100 "none";
95 }); 101 });
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
4 <!-- <keep-alive :include="cachedViews"> 4 <!-- <keep-alive :include="cachedViews">
5 <router-view :key="key" /> 5 <router-view :key="key" />
6 </keep-alive> --> 6 </keep-alive> -->
7 - <router-view v-if="!cachedViews.includes(cachesName)"></router-view> 7 + <!-- <router-view v-if="!cachedViews.includes(cachesName)"></router-view> -->
8 - <keep-alive v-else> 8 + <keep-alive :include="tagsViewNames">
9 <router-view :key="key"></router-view> 9 <router-view :key="key"></router-view>
10 </keep-alive> 10 </keep-alive>
11 </transition> 11 </transition>
...@@ -20,6 +20,10 @@ export default { ...@@ -20,6 +20,10 @@ export default {
20 console.log(this.$store.state.tagsView); 20 console.log(this.$store.state.tagsView);
21 return this.$store.state.tagsView.cachedViews; 21 return this.$store.state.tagsView.cachedViews;
22 }, 22 },
23 + tagsViewNames() {
24 + console.log(this.$store.state.tagsView);
25 + return this.$store.state.tagsView.tagsViewNames;
26 + },
23 key() { 27 key() {
24 console.log(this.$route, this.$route.fullPath); 28 console.log(this.$route, this.$route.fullPath);
25 return this.$route.fullPath; 29 return this.$route.fullPath;
......
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
27 }, 27 },
28 methods: { 28 methods: {
29 linkProps(to) { 29 linkProps(to) {
30 - console.log(to); 30 + // console.log(to);
31 31
32 if (this.isExternal) { 32 if (this.isExternal) {
33 return { 33 return {
......
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
81 }, 81 },
82 }, 82 },
83 mounted() { 83 mounted() {
84 - this.initTags(); 84 + // this.initTags();
85 this.addTags(); 85 this.addTags();
86 }, 86 },
87 methods: { 87 methods: {
...@@ -161,7 +161,7 @@ export default { ...@@ -161,7 +161,7 @@ export default {
161 }); 161 });
162 }, 162 },
163 refreshSelectedTag(view) { 163 refreshSelectedTag(view) {
164 - this.$store.dispatch("tagsView/delCachedView", view).then(() => { 164 + this.$store.dispatch("tagsView/delCachedName", view).then(() => {
165 const { fullPath } = view; 165 const { fullPath } = view;
166 this.$nextTick(() => { 166 this.$nextTick(() => {
167 this.$router.replace({ 167 this.$router.replace({
...@@ -199,11 +199,9 @@ export default { ...@@ -199,11 +199,9 @@ export default {
199 }, 199 },
200 closeAllTags(view) { 200 closeAllTags(view) {
201 this.$store.dispatch("tagsView/delAllViews").then(({ visitedViews }) => { 201 this.$store.dispatch("tagsView/delAllViews").then(({ visitedViews }) => {
202 - console.log(this.affixTags, visitedViews, view); 202 + // if (this.affixTags.some((tag) => tag.path === this.$route.path)) {
203 - 203 + // return;
204 - if (this.affixTags.some((tag) => tag.path === this.$route.path)) { 204 + // }
205 - return;
206 - }
207 this.toLastView(visitedViews, view); 205 this.toLastView(visitedViews, view);
208 }); 206 });
209 }, 207 },
......
1 +import { routeNameMap } from "../../layout/components/TagsView/route";
2 +
1 const state = { 3 const state = {
2 visitedViews: [], 4 visitedViews: [],
3 cachedViews: [], 5 cachedViews: [],
6 + tagsViewNames: [],
4 }; 7 };
5 8
6 const mutations = { 9 const mutations = {
...@@ -76,16 +79,44 @@ const mutations = { ...@@ -76,16 +79,44 @@ const mutations = {
76 const i = state.cachedViews.indexOf(item.name); 79 const i = state.cachedViews.indexOf(item.name);
77 if (i > -1) { 80 if (i > -1) {
78 state.cachedViews.splice(i, 1); 81 state.cachedViews.splice(i, 1);
82 + state.tagsViewNames.splice(i, 1);
79 } 83 }
84 +
80 return false; 85 return false;
81 }); 86 });
82 }, 87 },
88 + // add Name tagsViewNames
89 + ADD_CACHED_NAME: (state, view) => {
90 + const name = routeNameMap[view.path];
91 + if (state.tagsViewNames.includes(name)) return;
92 + if (!view.meta.noCache) {
93 + state.tagsViewNames.push(name);
94 + }
95 + },
96 + DEL_CACHED_NAME: (state, view) => {
97 + const name = routeNameMap[view.path];
98 + const index = state.tagsViewNames.indexOf(name);
99 + index > -1 && state.tagsViewNames.splice(index, 1);
100 + },
101 + DEL_OTHERS_CACHED_NAMES: (state, view) => {
102 + const name = routeNameMap[view.path];
103 + const index = state.tagsViewNames.indexOf(name);
104 + if (index > -1) {
105 + state.tagsViewNames = state.tagsViewNames.slice(index, index + 1);
106 + } else {
107 + state.tagsViewNames = [];
108 + }
109 + },
110 + DEL_ALL_CACHED_NAMES: (state) => {
111 + state.tagsViewNames = [];
112 + },
83 }; 113 };
84 114
85 const actions = { 115 const actions = {
86 addView({ dispatch }, view) { 116 addView({ dispatch }, view) {
87 dispatch("addVisitedView", view); 117 dispatch("addVisitedView", view);
88 dispatch("addCachedView", view); 118 dispatch("addCachedView", view);
119 + dispatch("addCachedName", view);
89 console.log("addView", view); 120 console.log("addView", view);
90 }, 121 },
91 addVisitedView({ commit }, view) { 122 addVisitedView({ commit }, view) {
...@@ -94,14 +125,19 @@ const actions = { ...@@ -94,14 +125,19 @@ const actions = {
94 addCachedView({ commit }, view) { 125 addCachedView({ commit }, view) {
95 commit("ADD_CACHED_VIEW", view); 126 commit("ADD_CACHED_VIEW", view);
96 }, 127 },
128 + addCachedName({ commit }, view) {
129 + commit("ADD_CACHED_NAME", view);
130 + },
97 131
98 delView({ dispatch, state }, view) { 132 delView({ dispatch, state }, view) {
99 return new Promise((resolve) => { 133 return new Promise((resolve) => {
100 dispatch("delVisitedView", view); 134 dispatch("delVisitedView", view);
101 dispatch("delCachedView", view); 135 dispatch("delCachedView", view);
136 + dispatch("delCachedName", view);
102 resolve({ 137 resolve({
103 visitedViews: [...state.visitedViews], 138 visitedViews: [...state.visitedViews],
104 cachedViews: [...state.cachedViews], 139 cachedViews: [...state.cachedViews],
140 + tagsViewNames: [...state.tagsViewNames],
105 }); 141 });
106 }); 142 });
107 }, 143 },
...@@ -117,14 +153,22 @@ const actions = { ...@@ -117,14 +153,22 @@ const actions = {
117 resolve([...state.cachedViews]); 153 resolve([...state.cachedViews]);
118 }); 154 });
119 }, 155 },
156 + delCachedName({ commit, state }, view) {
157 + return new Promise((resolve) => {
158 + commit("DEL_CACHED_NAME", view);
159 + resolve([...state.tagsViewNames]);
160 + });
161 + },
120 162
121 delOthersViews({ dispatch, state }, view) { 163 delOthersViews({ dispatch, state }, view) {
122 return new Promise((resolve) => { 164 return new Promise((resolve) => {
123 dispatch("delOthersVisitedViews", view); 165 dispatch("delOthersVisitedViews", view);
124 dispatch("delOthersCachedViews", view); 166 dispatch("delOthersCachedViews", view);
167 + dispatch("delOthersCachedName", view);
125 resolve({ 168 resolve({
126 visitedViews: [...state.visitedViews], 169 visitedViews: [...state.visitedViews],
127 cachedViews: [...state.cachedViews], 170 cachedViews: [...state.cachedViews],
171 + tagsViewNames: [...state.tagsViewNames],
128 }); 172 });
129 }); 173 });
130 }, 174 },
...@@ -140,14 +184,22 @@ const actions = { ...@@ -140,14 +184,22 @@ const actions = {
140 resolve([...state.cachedViews]); 184 resolve([...state.cachedViews]);
141 }); 185 });
142 }, 186 },
187 + delOthersCachedName({ commit, state }, view) {
188 + return new Promise((resolve) => {
189 + commit("DEL_OTHERS_CACHED_NAMES", view);
190 + resolve([...state.tagsViewNames]);
191 + });
192 + },
143 193
144 delAllViews({ dispatch, state }, view) { 194 delAllViews({ dispatch, state }, view) {
145 return new Promise((resolve) => { 195 return new Promise((resolve) => {
146 dispatch("delAllVisitedViews", view); 196 dispatch("delAllVisitedViews", view);
147 dispatch("delAllCachedViews", view); 197 dispatch("delAllCachedViews", view);
198 + dispatch("delAllCachedName", view);
148 resolve({ 199 resolve({
149 visitedViews: [...state.visitedViews], 200 visitedViews: [...state.visitedViews],
150 cachedViews: [...state.cachedViews], 201 cachedViews: [...state.cachedViews],
202 + tagsViewNames: [...state.tagsViewNames],
151 }); 203 });
152 }); 204 });
153 }, 205 },
...@@ -163,6 +215,12 @@ const actions = { ...@@ -163,6 +215,12 @@ const actions = {
163 resolve([...state.cachedViews]); 215 resolve([...state.cachedViews]);
164 }); 216 });
165 }, 217 },
218 + delAllCachedName({ commit, state }) {
219 + return new Promise((resolve) => {
220 + commit("DEL_ALL_CACHED_NAMES");
221 + resolve([...state.tagsViewNames]);
222 + });
223 + },
166 224
167 updateVisitedView({ commit }, view) { 225 updateVisitedView({ commit }, view) {
168 commit("UPDATE_VISITED_VIEW", view); 226 commit("UPDATE_VISITED_VIEW", view);
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
47 <FormTextareaInput 47 <FormTextareaInput
48 :formData="sreachFormData" 48 :formData="sreachFormData"
49 dataKey="billNo" 49 dataKey="billNo"
50 + :curKey="Date.now()"
50 @formChange="formChange" 51 @formChange="formChange"
51 /> 52 />
52 </Formitem> 53 </Formitem>
...@@ -538,16 +539,22 @@ export default { ...@@ -538,16 +539,22 @@ export default {
538 }, 539 },
539 created() { 540 created() {
540 this.search(0); 541 this.search(0);
541 - this.tableMaxheight = window.innerHeight - 300; 542 + this.tableMaxheight = window.innerHeight - 260;
542 }, 543 },
543 watch: { 544 watch: {
544 $route(val, oldval) { 545 $route(val, oldval) {
546 + console.log("========================");
547 +
545 this.popoverClose(); 548 this.popoverClose();
549 + this.popperClose();
546 }, 550 },
547 }, 551 },
548 mounted() { 552 mounted() {
549 this.searchPortDictData(); 553 this.searchPortDictData();
550 }, 554 },
555 + // beforeDestroy() {
556 + // this.popoverClose();
557 + // },
551 methods: { 558 methods: {
552 getTotalDocumentsLevelLog: getTotalDocumentsLevelLog, 559 getTotalDocumentsLevelLog: getTotalDocumentsLevelLog,
553 getOperationLogByBillNo: getOperationLogByBillNo, 560 getOperationLogByBillNo: getOperationLogByBillNo,
......
...@@ -120,6 +120,8 @@ export default { ...@@ -120,6 +120,8 @@ export default {
120 this.tabsKey = "1"; 120 this.tabsKey = "1";
121 this.fetchData(); 121 this.fetchData();
122 this.popperVisible = true; 122 this.popperVisible = true;
123 + } else {
124 + this.popperVisible = false;
123 } 125 }
124 }, 126 },
125 }, 127 },
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 <el-col :span="5"> 11 <el-col :span="5">
12 <Formitem label="提运单号" prop="billNo"> 12 <Formitem label="提运单号" prop="billNo">
13 - <el-input 13 + <!-- <el-input
14 type="text" 14 type="text"
15 class="inputShadow" 15 class="inputShadow"
16 id="inputInner--billNo" 16 id="inputInner--billNo"
...@@ -18,7 +18,13 @@ ...@@ -18,7 +18,13 @@
18 v-model="sreachFormData.billNo" 18 v-model="sreachFormData.billNo"
19 clearable 19 clearable
20 placeholder="" 20 placeholder=""
21 - ></el-input> 21 + ></el-input> -->
22 + <FormTextareaInput
23 + :formData="sreachFormData"
24 + dataKey="billNo"
25 + :curKey="Date.now()"
26 + @formChange="formChange"
27 + />
22 </Formitem> 28 </Formitem>
23 </el-col> 29 </el-col>
24 <el-col :span="5"> 30 <el-col :span="5">
...@@ -26,6 +32,7 @@ ...@@ -26,6 +32,7 @@
26 <FormTextareaInput 32 <FormTextareaInput
27 :formData="sreachFormData" 33 :formData="sreachFormData"
28 dataKey="logisticsNo" 34 dataKey="logisticsNo"
35 + :curKey="Date.now()"
29 @formChange="formChange" 36 @formChange="formChange"
30 /> 37 />
31 </Formitem> 38 </Formitem>
...@@ -147,7 +154,7 @@ export default { ...@@ -147,7 +154,7 @@ export default {
147 return { 154 return {
148 sreachFormData: { 155 sreachFormData: {
149 logisticsNo: [], 156 logisticsNo: [],
150 - billNo: "", 157 + billNo: [],
151 returnStatus: "", 158 returnStatus: "",
152 preNo: "", 159 preNo: "",
153 }, 160 },
...@@ -246,7 +253,7 @@ export default { ...@@ -246,7 +253,7 @@ export default {
246 this.search(0); 253 this.search(0);
247 }, 254 },
248 mounted() { 255 mounted() {
249 - this.tableMaxheight = window.innerHeight - 300; 256 + this.tableMaxheight = window.innerHeight - 220;
250 }, 257 },
251 methods: { 258 methods: {
252 popoverClose(val) { 259 popoverClose(val) {
...@@ -309,8 +316,8 @@ export default { ...@@ -309,8 +316,8 @@ export default {
309 // 清空 316 // 清空
310 clear() { 317 clear() {
311 this.sreachFormData = { 318 this.sreachFormData = {
312 - ogisticsNo: [], 319 + logisticsNo: [],
313 - billNo: "", 320 + billNo: [],
314 returnStatus: "", 321 returnStatus: "",
315 preNo: "", 322 preNo: "",
316 }; 323 };
...@@ -332,6 +339,11 @@ export default { ...@@ -332,6 +339,11 @@ export default {
332 } else { 339 } else {
333 obj.logisticsNo = []; 340 obj.logisticsNo = [];
334 } 341 }
342 + if (obj.billNo != null && obj.billNo != "") {
343 + obj.billNo = obj.billNo.split("\n");
344 + } else {
345 + obj.billNo = [];
346 + }
335 347
336 getExportArrivalInList(obj) 348 getExportArrivalInList(obj)
337 .then((res) => { 349 .then((res) => {
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
14 <FormTextareaInput 14 <FormTextareaInput
15 :formData="sreachFormData" 15 :formData="sreachFormData"
16 dataKey="logisticsNo" 16 dataKey="logisticsNo"
17 + :curKey="Date.now()"
17 @formChange="formChange" 18 @formChange="formChange"
18 /> 19 />
19 </Formitem> 20 </Formitem>
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
21 <!-- 订单编号 --> 22 <!-- 订单编号 -->
22 <el-col :span="5"> 23 <el-col :span="5">
23 <Formitem label="订单编号" prop="orderNo"> 24 <Formitem label="订单编号" prop="orderNo">
24 - <el-input 25 + <!-- <el-input
25 type="text" 26 type="text"
26 class="inputShadow" 27 class="inputShadow"
27 id="inputInner--orderNo" 28 id="inputInner--orderNo"
...@@ -29,7 +30,13 @@ ...@@ -29,7 +30,13 @@
29 v-model="sreachFormData.orderNo" 30 v-model="sreachFormData.orderNo"
30 clearable 31 clearable
31 placeholder="" 32 placeholder=""
32 - ></el-input> 33 + ></el-input> -->
34 + <FormTextareaInput
35 + :formData="sreachFormData"
36 + dataKey="orderNo"
37 + :curKey="Date.now()"
38 + @formChange="formChange"
39 + />
33 </Formitem> 40 </Formitem>
34 </el-col> 41 </el-col>
35 <!-- 电商企业代码 --> 42 <!-- 电商企业代码 -->
...@@ -179,11 +186,11 @@ export default { ...@@ -179,11 +186,11 @@ export default {
179 data() { 186 data() {
180 return { 187 return {
181 sreachFormData: { 188 sreachFormData: {
182 - orderNo: "", 189 + logisticsNo: [],
190 + orderNo: [],
183 ebccode: "", 191 ebccode: "",
184 returnStatus: "", 192 returnStatus: "",
185 createTime: [], 193 createTime: [],
186 - logisticsNo: "",
187 }, 194 },
188 originalLogisticsNo: "", // 用于保存原始的 logisticsNo 字符串 195 originalLogisticsNo: "", // 用于保存原始的 logisticsNo 字符串
189 page: { 196 page: {
...@@ -294,7 +301,7 @@ export default { ...@@ -294,7 +301,7 @@ export default {
294 this.search(0); 301 this.search(0);
295 }, 302 },
296 mounted() { 303 mounted() {
297 - this.tableMaxheight = window.innerHeight - 300; 304 + this.tableMaxheight = window.innerHeight - 270;
298 }, 305 },
299 watch: { 306 watch: {
300 $route() { 307 $route() {
...@@ -325,6 +332,12 @@ export default { ...@@ -325,6 +332,12 @@ export default {
325 } else { 332 } else {
326 obj.logisticsNo = []; 333 obj.logisticsNo = [];
327 } 334 }
335 + // 使用保存的原始 orderNo 字符串
336 + if (obj.orderNo != null && obj.orderNo != "") {
337 + obj.orderNo = obj.orderNo.split("\n");
338 + } else {
339 + obj.orderNo = [];
340 + }
328 getAllExportingBills(obj) 341 getAllExportingBills(obj)
329 .then((res) => { 342 .then((res) => {
330 if (res.code === "200") { 343 if (res.code === "200") {
...@@ -348,7 +361,8 @@ export default { ...@@ -348,7 +361,8 @@ export default {
348 //重置 361 //重置
349 clear() { 362 clear() {
350 this.sreachFormData = { 363 this.sreachFormData = {
351 - orderNo: "", 364 + logisticsNo: [],
365 + orderNo: [],
352 ebccode: "", 366 ebccode: "",
353 returnStatus: "", 367 returnStatus: "",
354 createTime: [], 368 createTime: [],
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
14 <FormTextareaInput 14 <FormTextareaInput
15 :formData="sreachFormData" 15 :formData="sreachFormData"
16 dataKey="logisticsNo" 16 dataKey="logisticsNo"
17 + :curKey="Date.now()"
17 @formChange="formChange" 18 @formChange="formChange"
18 /> 19 />
19 </Formitem> 20 </Formitem>
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
21 <!-- 提运单号 --> 22 <!-- 提运单号 -->
22 <el-col :span="5"> 23 <el-col :span="5">
23 <Formitem label="提运单号" prop="billNo"> 24 <Formitem label="提运单号" prop="billNo">
24 - <el-input 25 + <!-- <el-input
25 type="text" 26 type="text"
26 class="inputShadow" 27 class="inputShadow"
27 id="inputInner--billNo" 28 id="inputInner--billNo"
...@@ -29,13 +30,19 @@ ...@@ -29,13 +30,19 @@
29 v-model="sreachFormData.billNo" 30 v-model="sreachFormData.billNo"
30 clearable 31 clearable
31 placeholder="" 32 placeholder=""
32 - ></el-input> 33 + ></el-input> -->
34 + <FormTextareaInput
35 + :formData="sreachFormData"
36 + dataKey="billNo"
37 + :curKey="Date.now()"
38 + @formChange="formChange"
39 + />
33 </Formitem> 40 </Formitem>
34 </el-col> 41 </el-col>
35 <!-- 订单编号 --> 42 <!-- 订单编号 -->
36 <el-col :span="5"> 43 <el-col :span="5">
37 <Formitem label="订单编号" prop="orderNo"> 44 <Formitem label="订单编号" prop="orderNo">
38 - <el-input 45 + <!-- <el-input
39 type="text" 46 type="text"
40 class="inputShadow" 47 class="inputShadow"
41 id="inputInner--orderNo" 48 id="inputInner--orderNo"
...@@ -43,7 +50,13 @@ ...@@ -43,7 +50,13 @@
43 v-model="sreachFormData.orderNo" 50 v-model="sreachFormData.orderNo"
44 clearable 51 clearable
45 placeholder="" 52 placeholder=""
46 - ></el-input> 53 + ></el-input> -->
54 + <FormTextareaInput
55 + :formData="sreachFormData"
56 + dataKey="orderNo"
57 + :curKey="Date.now()"
58 + @formChange="formChange"
59 + />
47 </Formitem> 60 </Formitem>
48 </el-col> 61 </el-col>
49 <!-- 创建时间 --> 62 <!-- 创建时间 -->
...@@ -282,11 +295,11 @@ export default { ...@@ -282,11 +295,11 @@ export default {
282 return { 295 return {
283 customDialogShow: false, 296 customDialogShow: false,
284 sreachFormData: { 297 sreachFormData: {
285 - billNo: "", 298 + billNo: [],
286 ebcName: "", 299 ebcName: "",
287 invtNo: "", 300 invtNo: "",
288 logisticsNo: [], 301 logisticsNo: [],
289 - orderNo: "", 302 + orderNo: [],
290 returnStatus: "", 303 returnStatus: "",
291 summaryApplicationStatus: "", 304 summaryApplicationStatus: "",
292 createTime: [], 305 createTime: [],
...@@ -390,10 +403,10 @@ export default { ...@@ -390,10 +403,10 @@ export default {
390 align: "left", 403 align: "left",
391 }, 404 },
392 ], 405 ],
393 - dictData: { 406 + // dictData: {
394 - ebccode: [], 407 + // ebccode: [],
395 - returnStatus: [], 408 + // returnStatus: [],
396 - }, 409 + // },
397 loadings: { 410 loadings: {
398 searchLoading: false, 411 searchLoading: false,
399 }, 412 },
...@@ -408,7 +421,7 @@ export default { ...@@ -408,7 +421,7 @@ export default {
408 this.search(0); 421 this.search(0);
409 }, 422 },
410 mounted() { 423 mounted() {
411 - this.tableMaxheight = window.innerHeight - 300; 424 + this.tableMaxheight = window.innerHeight - 360;
412 }, 425 },
413 watch: { 426 watch: {
414 $route() { 427 $route() {
...@@ -440,6 +453,16 @@ export default { ...@@ -440,6 +453,16 @@ export default {
440 } else { 453 } else {
441 obj.logisticsNo = []; 454 obj.logisticsNo = [];
442 } 455 }
456 + if (obj.billNo != null && obj.billNo != "") {
457 + obj.billNo = obj.billNo.split("\n");
458 + } else {
459 + obj.billNo = [];
460 + }
461 + if (obj.orderNo != null && obj.orderNo != "") {
462 + obj.orderNo = obj.orderNo.split("\n");
463 + } else {
464 + obj.orderNo = [];
465 + }
443 getAllexportList(obj) 466 getAllexportList(obj)
444 .then((res) => { 467 .then((res) => {
445 if (res.code === "200") { 468 if (res.code === "200") {
...@@ -463,8 +486,8 @@ export default { ...@@ -463,8 +486,8 @@ export default {
463 //重置 486 //重置
464 clear() { 487 clear() {
465 this.sreachFormData = { 488 this.sreachFormData = {
466 - orderNo: "", 489 + orderNo: [],
467 - ebccode: "", 490 + billNo: [],
468 returnStatus: "", 491 returnStatus: "",
469 createTime: [], 492 createTime: [],
470 ebcName: "", 493 ebcName: "",
...@@ -489,7 +512,16 @@ export default { ...@@ -489,7 +512,16 @@ export default {
489 } else { 512 } else {
490 obj.logisticsNo = []; 513 obj.logisticsNo = [];
491 } 514 }
492 - 515 + if (obj.billNo != null && obj.billNo != "") {
516 + obj.billNo = obj.billNo.split("\n");
517 + } else {
518 + obj.billNo = [];
519 + }
520 + if (obj.orderNo != null && obj.orderNo != "") {
521 + obj.orderNo = obj.orderNo.split("\n");
522 + } else {
523 + obj.orderNo = [];
524 + }
493 // getListExport(obj).then((res) => { 525 // getListExport(obj).then((res) => {
494 // // 2. 清单查询 526 // // 2. 清单查询
495 // console.log(res); 527 // console.log(res);
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
24 <FormTextareaInput 24 <FormTextareaInput
25 :formData="sreachFormData" 25 :formData="sreachFormData"
26 dataKey="logisticsNo" 26 dataKey="logisticsNo"
27 + :curKey="Date.now()"
27 @formChange="formChange" 28 @formChange="formChange"
28 /> 29 />
29 </Formitem> 30 </Formitem>
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
31 <!-- 提运单号 --> 32 <!-- 提运单号 -->
32 <el-col :span="5"> 33 <el-col :span="5">
33 <Formitem label="提运单号" prop="billNo"> 34 <Formitem label="提运单号" prop="billNo">
34 - <el-input 35 + <!-- <el-input
35 type="text" 36 type="text"
36 class="inputShadow" 37 class="inputShadow"
37 id="inputInner--billNo" 38 id="inputInner--billNo"
...@@ -39,12 +40,13 @@ ...@@ -39,12 +40,13 @@
39 v-model="sreachFormData.billNo" 40 v-model="sreachFormData.billNo"
40 clearable 41 clearable
41 placeholder="" 42 placeholder=""
42 - ></el-input> 43 + ></el-input> -->
43 - <!-- <FormTextareaInput 44 + <FormTextareaInput
44 :formData="sreachFormData" 45 :formData="sreachFormData"
45 dataKey="billNo" 46 dataKey="billNo"
47 + :curKey="Date.now()"
46 @formChange="formChange" 48 @formChange="formChange"
47 - /> --> 49 + />
48 </Formitem> 50 </Formitem>
49 </el-col> 51 </el-col>
50 <!-- 回执状态 --> 52 <!-- 回执状态 -->
...@@ -174,9 +176,10 @@ export default { ...@@ -174,9 +176,10 @@ export default {
174 data() { 176 data() {
175 return { 177 return {
176 sreachFormData: { 178 sreachFormData: {
177 - billNo: "", 179 + billNo: [],
178 returnStatus: "", 180 returnStatus: "",
179 createTime: [], 181 createTime: [],
182 + logisticsNo: [],
180 }, 183 },
181 page: { 184 page: {
182 pageIndex: 1, 185 pageIndex: 1,
...@@ -280,7 +283,7 @@ export default { ...@@ -280,7 +283,7 @@ export default {
280 this.search(0); 283 this.search(0);
281 }, 284 },
282 mounted() { 285 mounted() {
283 - this.tableMaxheight = window.innerHeight - 300; 286 + this.tableMaxheight = window.innerHeight - 220;
284 }, 287 },
285 methods: { 288 methods: {
286 //查询详情 289 //查询详情
...@@ -317,11 +320,11 @@ export default { ...@@ -317,11 +320,11 @@ export default {
317 } else { 320 } else {
318 obj.logisticsNo = []; 321 obj.logisticsNo = [];
319 } 322 }
320 - // if (obj.billNo != null && obj.billNo != "") { 323 + if (obj.billNo != null && obj.billNo != "") {
321 - // obj.billNo = obj.billNo.split("\n"); 324 + obj.billNo = obj.billNo.split("\n");
322 - // } else { 325 + } else {
323 - // obj.billNo = []; 326 + obj.billNo = [];
324 - // } 327 + }
325 getAllCancellation(obj) 328 getAllCancellation(obj)
326 .then((res) => { 329 .then((res) => {
327 if (res.code === "200") { 330 if (res.code === "200") {
...@@ -345,8 +348,8 @@ export default { ...@@ -345,8 +348,8 @@ export default {
345 //重置 348 //重置
346 clear() { 349 clear() {
347 this.sreachFormData = { 350 this.sreachFormData = {
348 - orderNo: "", 351 + logisticsNo: [],
349 - ebccode: "", 352 + billNo: [],
350 returnStatus: "", 353 returnStatus: "",
351 createTime: [], 354 createTime: [],
352 }; 355 };
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
14 <FormTextareaInput 14 <FormTextareaInput
15 :formData="sreachFormData" 15 :formData="sreachFormData"
16 dataKey="logisticsNo" 16 dataKey="logisticsNo"
17 + :curKey="Date.now()"
17 @formChange="formChange" 18 @formChange="formChange"
18 /> 19 />
19 </Formitem> 20 </Formitem>
...@@ -164,8 +165,7 @@ export default { ...@@ -164,8 +165,7 @@ export default {
164 data() { 165 data() {
165 return { 166 return {
166 sreachFormData: { 167 sreachFormData: {
167 - logisticsNo: "", 168 + logisticsNo: [],
168 - logisticsCode: "",
169 returnStatus: "", 169 returnStatus: "",
170 createTime: [], 170 createTime: [],
171 }, 171 },
...@@ -265,7 +265,7 @@ export default { ...@@ -265,7 +265,7 @@ export default {
265 this.search(0); 265 this.search(0);
266 }, 266 },
267 mounted() { 267 mounted() {
268 - this.tableMaxheight = window.innerHeight - 300; 268 + this.tableMaxheight = window.innerHeight - 220;
269 }, 269 },
270 methods: { 270 methods: {
271 //查询详情 271 //查询详情
...@@ -319,8 +319,8 @@ export default { ...@@ -319,8 +319,8 @@ export default {
319 //重置 319 //重置
320 clear() { 320 clear() {
321 this.sreachFormData = { 321 this.sreachFormData = {
322 - orderNo: "", 322 + logisticsNo: [],
323 - ebccode: "", 323 +
324 returnStatus: "", 324 returnStatus: "",
325 createTime: [], 325 createTime: [],
326 }; 326 };
......
...@@ -229,7 +229,7 @@ export default { ...@@ -229,7 +229,7 @@ export default {
229 }, 229 },
230 created() { 230 created() {
231 this.search(0); 231 this.search(0);
232 - this.tableMaxheight = window.innerHeight - 300; 232 + this.tableMaxheight = window.innerHeight - 255;
233 }, 233 },
234 watch: {}, 234 watch: {},
235 235
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
14 <FormTextareaInput 14 <FormTextareaInput
15 :formData="sreachFormData" 15 :formData="sreachFormData"
16 dataKey="logisticsNo" 16 dataKey="logisticsNo"
17 + :curKey="Date.now()"
17 @formChange="formChange" 18 @formChange="formChange"
18 /> 19 />
19 </Formitem> 20 </Formitem>
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
21 <!-- 提运单号 --> 22 <!-- 提运单号 -->
22 <el-col :span="5"> 23 <el-col :span="5">
23 <Formitem label="提运单号" prop="billNo"> 24 <Formitem label="提运单号" prop="billNo">
24 - <el-input 25 + <!-- <el-input
25 type="text" 26 type="text"
26 class="inputShadow" 27 class="inputShadow"
27 id="inputInner--billNo" 28 id="inputInner--billNo"
...@@ -29,12 +30,13 @@ ...@@ -29,12 +30,13 @@
29 v-model="sreachFormData.billNo" 30 v-model="sreachFormData.billNo"
30 clearable 31 clearable
31 placeholder="" 32 placeholder=""
32 - ></el-input> 33 + ></el-input> -->
33 - <!-- <FormTextareaInput 34 + <FormTextareaInput
34 :formData="sreachFormData" 35 :formData="sreachFormData"
35 dataKey="billNo" 36 dataKey="billNo"
37 + :curKey="Date.now()"
36 @formChange="formChange" 38 @formChange="formChange"
37 - /> --> 39 + />
38 </Formitem> 40 </Formitem>
39 </el-col> 41 </el-col>
40 <!-- 回执状态 --> 42 <!-- 回执状态 -->
...@@ -169,7 +171,7 @@ export default { ...@@ -169,7 +171,7 @@ export default {
169 data() { 171 data() {
170 return { 172 return {
171 sreachFormData: { 173 sreachFormData: {
172 - billNo: "", 174 + billNo: [],
173 returnStatus: "", 175 returnStatus: "",
174 createTime: [], 176 createTime: [],
175 logisticsNo: [], 177 logisticsNo: [],
...@@ -277,7 +279,7 @@ export default { ...@@ -277,7 +279,7 @@ export default {
277 this.search(0); 279 this.search(0);
278 }, 280 },
279 mounted() { 281 mounted() {
280 - this.tableMaxheight = window.innerHeight - 300; 282 + this.tableMaxheight = window.innerHeight - 220;
281 }, 283 },
282 methods: { 284 methods: {
283 //查询详情 285 //查询详情
...@@ -305,11 +307,6 @@ export default { ...@@ -305,11 +307,6 @@ export default {
305 obj.createTimeStart = obj.createTime[0]; 307 obj.createTimeStart = obj.createTime[0];
306 obj.createTimeEnd = obj.createTime[1]; 308 obj.createTimeEnd = obj.createTime[1];
307 } 309 }
308 - // if (obj.billNo != null && obj.billNo != "") {
309 - // obj.billNo = obj.billNo.split("\n");
310 - // } else {
311 - // obj.billNo = [];
312 - // }
313 // 使用保存的原始 logisticsNo 字符串 310 // 使用保存的原始 logisticsNo 字符串
314 obj.logisticsNo = this.originalLogisticsNo; 311 obj.logisticsNo = this.originalLogisticsNo;
315 if (obj.logisticsNo != null && obj.logisticsNo != "") { 312 if (obj.logisticsNo != null && obj.logisticsNo != "") {
...@@ -317,6 +314,12 @@ export default { ...@@ -317,6 +314,12 @@ export default {
317 } else { 314 } else {
318 obj.logisticsNo = []; 315 obj.logisticsNo = [];
319 } 316 }
317 + if (obj.billNo != null && obj.billNo != "") {
318 + obj.billNo = obj.billNo.split("\n");
319 + } else {
320 + obj.billNo = [];
321 + }
322 +
320 getAllTotalScoreList(obj) 323 getAllTotalScoreList(obj)
321 .then((res) => { 324 .then((res) => {
322 if (res.code === "200") { 325 if (res.code === "200") {
...@@ -340,10 +343,10 @@ export default { ...@@ -340,10 +343,10 @@ export default {
340 //重置 343 //重置
341 clear() { 344 clear() {
342 this.sreachFormData = { 345 this.sreachFormData = {
343 - orderNo: "",
344 - ebccode: "",
345 returnStatus: "", 346 returnStatus: "",
346 createTime: [], 347 createTime: [],
348 + billNo: [],
349 + logisticsNo: [],
347 }; 350 };
348 this.originalLogisticsNo = ""; 351 this.originalLogisticsNo = "";
349 }, 352 },
......
...@@ -228,7 +228,7 @@ export default { ...@@ -228,7 +228,7 @@ export default {
228 }, 228 },
229 created() { 229 created() {
230 this.search(0); 230 this.search(0);
231 - this.tableMaxheight = window.innerHeight - 300; 231 + this.tableMaxheight = window.innerHeight - 270;
232 }, 232 },
233 mounted() { 233 mounted() {
234 this.fetchStatusList(); 234 this.fetchStatusList();
......
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 <!-- 运单号 --> 11 <!-- 运单号 -->
12 <el-col :span="5"> 12 <el-col :span="5">
13 - <Formitem label="物流运单编号" prop="logisticsWaybillNumber"> 13 + <Formitem label="物流运单编号" prop="logisticsNo">
14 <FormTextareaInput 14 <FormTextareaInput
15 :formData="sreachFormData" 15 :formData="sreachFormData"
16 - dataKey="logisticsWaybillNumber" 16 + dataKey="logisticsNo"
17 + :curKey="Date.now()"
17 @formChange="formChange" 18 @formChange="formChange"
18 /> 19 />
19 </Formitem> 20 </Formitem>
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
21 <!-- 提运单号 --> 22 <!-- 提运单号 -->
22 <el-col :span="5"> 23 <el-col :span="5">
23 <Formitem label="提运单号" prop="billNo"> 24 <Formitem label="提运单号" prop="billNo">
24 - <el-input 25 + <!-- <el-input
25 type="text" 26 type="text"
26 class="inputShadow" 27 class="inputShadow"
27 id="inputInner--billNo" 28 id="inputInner--billNo"
...@@ -29,12 +30,13 @@ ...@@ -29,12 +30,13 @@
29 v-model="sreachFormData.billNo" 30 v-model="sreachFormData.billNo"
30 clearable 31 clearable
31 placeholder="" 32 placeholder=""
32 - ></el-input> 33 + ></el-input> -->
33 - <!-- <FormTextareaInput 34 + <FormTextareaInput
34 :formData="sreachFormData" 35 :formData="sreachFormData"
35 dataKey="billNo" 36 dataKey="billNo"
37 + :curKey="Date.now()"
36 @formChange="formChange" 38 @formChange="formChange"
37 - /> --> 39 + />
38 </Formitem> 40 </Formitem>
39 </el-col> 41 </el-col>
40 <!-- 回执状态 --> 42 <!-- 回执状态 -->
...@@ -169,8 +171,8 @@ export default { ...@@ -169,8 +171,8 @@ export default {
169 data() { 171 data() {
170 return { 172 return {
171 sreachFormData: { 173 sreachFormData: {
172 - billNo: "", 174 + billNo: [],
173 - logisticsWaybillNumber: "", 175 + logisticsNo: [],
174 returnStatus: "", 176 returnStatus: "",
175 createTime: [], 177 createTime: [],
176 }, 178 },
...@@ -283,7 +285,7 @@ export default { ...@@ -283,7 +285,7 @@ export default {
283 this.search(0); 285 this.search(0);
284 }, 286 },
285 mounted() { 287 mounted() {
286 - this.tableMaxheight = window.innerHeight - 300; 288 + this.tableMaxheight = window.innerHeight - 220;
287 }, 289 },
288 methods: { 290 methods: {
289 //查询详情 291 //查询详情
...@@ -305,13 +307,17 @@ export default { ...@@ -305,13 +307,17 @@ export default {
305 obj.pageSize = this.page.pageSize; 307 obj.pageSize = this.page.pageSize;
306 obj.createTimeStart = ""; 308 obj.createTimeStart = "";
307 obj.createTimeEnd = ""; 309 obj.createTimeEnd = "";
308 - obj.logisticsNo = obj.logisticsWaybillNumber; 310 +
309 - delete obj.logisticsWaybillNumber;
310 if (obj.logisticsNo != null && obj.logisticsNo != "") { 311 if (obj.logisticsNo != null && obj.logisticsNo != "") {
311 obj.logisticsNo = obj.logisticsNo.split("\n"); 312 obj.logisticsNo = obj.logisticsNo.split("\n");
312 } else { 313 } else {
313 obj.logisticsNo = []; 314 obj.logisticsNo = [];
314 } 315 }
316 + if (obj.billNo != null && obj.billNo != "") {
317 + obj.billNo = obj.billNo.split("\n");
318 + } else {
319 + obj.billNo = [];
320 + }
315 if (obj.createTime.length > 0) { 321 if (obj.createTime.length > 0) {
316 obj.createTimeStart = obj.createTime[0]; 322 obj.createTimeStart = obj.createTime[0];
317 obj.createTimeEnd = obj.createTime[1]; 323 obj.createTimeEnd = obj.createTime[1];
...@@ -345,8 +351,8 @@ export default { ...@@ -345,8 +351,8 @@ export default {
345 //重置 351 //重置
346 clear() { 352 clear() {
347 this.sreachFormData = { 353 this.sreachFormData = {
348 - billNo: "", 354 + billNo: [],
349 - logisticsWaybillNumber: "", 355 + logisticsNo: [],
350 returnStatus: "", 356 returnStatus: "",
351 createTime: [], 357 createTime: [],
352 }; 358 };
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 <el-col :span="5"> 11 <el-col :span="5">
12 <Formitem label="订单编号" prop="orderNo"> 12 <Formitem label="订单编号" prop="orderNo">
13 - <el-input 13 + <!-- <el-input
14 type="text" 14 type="text"
15 class="inputShadow" 15 class="inputShadow"
16 id="inputInner--orderNo" 16 id="inputInner--orderNo"
...@@ -18,7 +18,13 @@ ...@@ -18,7 +18,13 @@
18 v-model="sreachFormData.orderNo" 18 v-model="sreachFormData.orderNo"
19 clearable 19 clearable
20 placeholder="" 20 placeholder=""
21 - ></el-input> 21 + ></el-input> -->
22 + <FormTextareaInput
23 + :formData="sreachFormData"
24 + dataKey="orderNo"
25 + :curKey="Date.now()"
26 + @formChange="formChange"
27 + />
22 </Formitem> 28 </Formitem>
23 </el-col> 29 </el-col>
24 <el-col :span="5"> 30 <el-col :span="5">
...@@ -26,6 +32,7 @@ ...@@ -26,6 +32,7 @@
26 <FormTextareaInput 32 <FormTextareaInput
27 :formData="sreachFormData" 33 :formData="sreachFormData"
28 dataKey="logisticsNo" 34 dataKey="logisticsNo"
35 + :curKey="Date.now()"
29 @formChange="formChange" 36 @formChange="formChange"
30 /> 37 />
31 <!-- <el-input 38 <!-- <el-input
...@@ -118,7 +125,7 @@ ...@@ -118,7 +125,7 @@
118 </el-col> 125 </el-col>
119 </el-row> 126 </el-row>
120 </el-form> 127 </el-form>
121 - 128 + <div style="height: 20px"></div>
122 <Table 129 <Table
123 class="fedexDetialTable fedexSreachTable" 130 class="fedexDetialTable fedexSreachTable"
124 ref="entryTable" 131 ref="entryTable"
...@@ -167,7 +174,7 @@ export default { ...@@ -167,7 +174,7 @@ export default {
167 data() { 174 data() {
168 return { 175 return {
169 sreachFormData: { 176 sreachFormData: {
170 - orderNo: "", 177 + orderNo: [],
171 forwardStatus: "", 178 forwardStatus: "",
172 returnStatus: "", 179 returnStatus: "",
173 logisticsNo: [], 180 logisticsNo: [],
...@@ -249,7 +256,7 @@ export default { ...@@ -249,7 +256,7 @@ export default {
249 this.search(0); 256 this.search(0);
250 }, 257 },
251 mounted() { 258 mounted() {
252 - this.tableMaxheight = window.innerHeight - 300; 259 + this.tableMaxheight = window.innerHeight - 270;
253 }, 260 },
254 methods: { 261 methods: {
255 formChange(val) { 262 formChange(val) {
...@@ -275,7 +282,7 @@ export default { ...@@ -275,7 +282,7 @@ export default {
275 // 清空 282 // 清空
276 clear() { 283 clear() {
277 this.sreachFormData = { 284 this.sreachFormData = {
278 - orderNo: "", 285 + orderNo: [],
279 forwardStatus: "", 286 forwardStatus: "",
280 returnStatus: "", 287 returnStatus: "",
281 logisticsNo: [], 288 logisticsNo: [],
...@@ -316,6 +323,11 @@ export default { ...@@ -316,6 +323,11 @@ export default {
316 } else { 323 } else {
317 obj.logisticsNo = []; 324 obj.logisticsNo = [];
318 } 325 }
326 + if (obj.orderNo != null && obj.orderNo != "") {
327 + obj.orderNo = obj.orderNo.split("\n");
328 + } else {
329 + obj.orderNo = [];
330 + }
319 obj.startTime = ""; 331 obj.startTime = "";
320 obj.endTime = ""; 332 obj.endTime = "";
321 if (this.sreachFormData.createTime.length > 0) { 333 if (this.sreachFormData.createTime.length > 0) {
......
...@@ -209,7 +209,7 @@ export default { ...@@ -209,7 +209,7 @@ export default {
209 this.fetchReceiptStatus(); 209 this.fetchReceiptStatus();
210 }, 210 },
211 mounted() { 211 mounted() {
212 - this.tableMaxheight = window.innerHeight - 300; 212 + this.tableMaxheight = window.innerHeight - 255;
213 }, 213 },
214 methods: { 214 methods: {
215 fetchReceiptStatus() { 215 fetchReceiptStatus() {
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
51 <FormTextareaInput 51 <FormTextareaInput
52 :formData="sreachFormData" 52 :formData="sreachFormData"
53 dataKey="billNo" 53 dataKey="billNo"
54 + :curKey="Date.now()"
54 @formChange="formChange" 55 @formChange="formChange"
55 /> 56 />
56 </Formitem> 57 </Formitem>
...@@ -61,6 +62,7 @@ ...@@ -61,6 +62,7 @@
61 <FormTextareaInput 62 <FormTextareaInput
62 :formData="sreachFormData" 63 :formData="sreachFormData"
63 dataKey="logisticsNo" 64 dataKey="logisticsNo"
65 + :curKey="Date.now()"
64 @formChange="formChange" 66 @formChange="formChange"
65 /> 67 />
66 </Formitem> 68 </Formitem>
...@@ -80,6 +82,7 @@ ...@@ -80,6 +82,7 @@
80 <FormTextareaInput 82 <FormTextareaInput
81 :formData="sreachFormData" 83 :formData="sreachFormData"
82 dataKey="orderNo" 84 dataKey="orderNo"
85 + :curKey="Date.now()"
83 @formChange="formChange" 86 @formChange="formChange"
84 /> 87 />
85 </Formitem> 88 </Formitem>
...@@ -939,7 +942,7 @@ export default { ...@@ -939,7 +942,7 @@ export default {
939 console.log(error); 942 console.log(error);
940 } finally { 943 } finally {
941 this.search(0); 944 this.search(0);
942 - this.tableMaxheight = window.innerHeight - 360; 945 + this.tableMaxheight = window.innerHeight - 355;
943 } 946 }
944 }, 947 },
945 mounted() { 948 mounted() {
......
...@@ -159,16 +159,17 @@ ...@@ -159,16 +159,17 @@
159 <!-- </el-col>--> 159 <!-- </el-col>-->
160 </el-row> 160 </el-row>
161 </el-form> 161 </el-form>
162 - <!-- <div class="optionButton">--> 162 + <div class="optionButton">
163 - <!-- <el-button--> 163 + <!-- <el-button-->
164 - <!-- class="entrySaveButton"--> 164 + <!-- class="entrySaveButton"-->
165 - <!-- size="small"--> 165 + <!-- size="small"-->
166 - <!-- icon="el-icon-download"--> 166 + <!-- icon="el-icon-download"-->
167 - <!-- @click="downloadData"--> 167 + <!-- @click="downloadData"-->
168 - <!-- >--> 168 + <!-- >-->
169 - <!-- 导出--> 169 + <!-- 导出-->
170 - <!-- </el-button>--> 170 + <!-- </el-button>-->
171 - <!-- </div>--> 171 + </div>
172 +
172 <Table 173 <Table
173 class="fedexDetialTable fedexSreachTable" 174 class="fedexDetialTable fedexSreachTable"
174 ref="entryTable" 175 ref="entryTable"
...@@ -356,7 +357,7 @@ export default { ...@@ -356,7 +357,7 @@ export default {
356 }, 357 },
357 created() { 358 created() {
358 this.search(0); 359 this.search(0);
359 - this.tableMaxheight = window.innerHeight - 300; 360 + this.tableMaxheight = window.innerHeight - 270;
360 }, 361 },
361 362
362 watch: { 363 watch: {
......
...@@ -237,7 +237,7 @@ export default { ...@@ -237,7 +237,7 @@ export default {
237 this.search(0); 237 this.search(0);
238 }, 238 },
239 mounted() { 239 mounted() {
240 - this.tableMaxheight = window.innerHeight - 300; 240 + this.tableMaxheight = window.innerHeight - 220;
241 }, 241 },
242 methods: { 242 methods: {
243 //查询 243 //查询
......