Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
682080ec 1 parent 39077e06

feat: 缓存页面

Inline Side-by-side
Showing 35 changed files with 416 additions and 336 deletions
...@@ -69,23 +69,33 @@ export default { ...@@ -69,23 +69,33 @@ export default {
69 textareaVisible: false, 69 textareaVisible: false,
70 }; 70 };
71 }, 71 },
72 + watch: {
73 + formData: {
74 + handler(val) {
75 + if (!val[this.dataKey]) {
76 + this.textareaVisible = false;
77 + let inputInner = document.querySelector(
78 + "#inputInner--" + this.dataKey
79 + );
80 + inputInner.classList.remove("inputFocus");
81 + }
82 + },
83 + deep: true,
84 + },
85 + },
86 +
72 methods: { 87 methods: {
73 //文本域展示状态切换 88 //文本域展示状态切换
74 textareaFocus(val) { 89 textareaFocus(val) {
75 this.textareaVisible = true; 90 this.textareaVisible = true;
76 this.$nextTick(() => { 91 this.$nextTick(() => {
77 - document 92 + document.querySelector("#popoverInput" + this.dataKey).focus();
78 - .querySelector("#popoverInput" + val.target.name.split("-")[0]) 93 + document.querySelector("#inputInner--" + this.dataKey).style.display =
79 - .focus(); 94 + "none";
80 - document.querySelector(
81 - "#inputInner--" + val.target.name.split("-")[0]
82 - ).style.display = "none";
83 }); 95 });
84 }, 96 },
85 textareaBlur(val) { 97 textareaBlur(val) {
86 - let inputInner = document.querySelector( 98 + let inputInner = document.querySelector("#inputInner--" + this.dataKey);
87 - "#inputInner--" + val.target.name.split("-")[0]
88 - );
89 this.textareaVisible = false; 99 this.textareaVisible = false;
90 inputInner.style.display = "block"; 100 inputInner.style.display = "block";
91 this.$nextTick(() => { 101 this.$nextTick(() => {
...@@ -101,7 +111,7 @@ export default { ...@@ -101,7 +111,7 @@ export default {
101 } 111 }
102 }); 112 });
103 let arr = []; 113 let arr = [];
104 - this.formData[val.target.name.split("-")[0]] 114 + this.formData[this.dataKey]
105 .replace(/[\n\，\；\;]/g, ",") 115 .replace(/[\n\，\；\;]/g, ",")
106 .replace(/[\t]/g, "") 116 .replace(/[\t]/g, "")
107 .split(",") 117 .split(",")
...@@ -110,7 +120,7 @@ export default { ...@@ -110,7 +120,7 @@ export default {
110 arr.push(str.trim()); 120 arr.push(str.trim());
111 } 121 }
112 }); 122 });
113 - this.formData[val.target.name.split("-")[0]] = arr.join("\n"); 123 + this.formData[this.dataKey] = arr.join("\n");
114 this.$emit("formChange", this.formData); 124 this.$emit("formChange", this.formData);
115 this.$forceUpdate(); 125 this.$forceUpdate();
116 }, 126 },
......
1 <template> 1 <template>
2 <section class="app-main"> 2 <section class="app-main">
3 <transition name="fade-transform" mode="out-in"> 3 <transition name="fade-transform" mode="out-in">
4 - <keep-alive :include="cachedViews"> 4 + <!-- <keep-alive :include="cachedViews">
5 <router-view :key="key" /> 5 <router-view :key="key" />
6 + </keep-alive> -->
7 + <router-view v-if="!cachedViews.includes(cachesName)"></router-view>
8 + <keep-alive v-else>
9 + <router-view :key="key"></router-view>
6 </keep-alive> 10 </keep-alive>
7 </transition> 11 </transition>
8 </section> 12 </section>
...@@ -13,11 +17,16 @@ export default { ...@@ -13,11 +17,16 @@ export default {
13 name: "AppMain", 17 name: "AppMain",
14 computed: { 18 computed: {
15 cachedViews() { 19 cachedViews() {
20 + console.log(this.$store.state.tagsView);
16 return this.$store.state.tagsView.cachedViews; 21 return this.$store.state.tagsView.cachedViews;
17 }, 22 },
18 key() { 23 key() {
24 + console.log(this.$route, this.$route.fullPath);
19 return this.$route.fullPath; 25 return this.$route.fullPath;
20 }, 26 },
27 + cachesName() {
28 + return this.$route.name;
29 + },
21 }, 30 },
22 }; 31 };
23 </script> 32 </script>
...@@ -42,7 +51,7 @@ export default { ...@@ -42,7 +51,7 @@ export default {
42 .hasTagsView { 51 .hasTagsView {
43 .app-main { 52 .app-main {
44 /* 84 = navbar + tags-view = 50 + 34 */ 53 /* 84 = navbar + tags-view = 50 + 34 */
45 - min-height: calc(100vh - 84px); 54 + min-height: calc(100vh - 98px);
46 } 55 }
47 56
48 .fixed-header + .app-main { 57 .fixed-header + .app-main {
......
...@@ -5,39 +5,41 @@ ...@@ -5,39 +5,41 @@
5 </template> 5 </template>
6 6
7 <script> 7 <script>
8 -import { isExternal } from '@/utils/validate' 8 +import { isExternal } from "@/utils/validate";
9 9
10 export default { 10 export default {
11 props: { 11 props: {
12 to: { 12 to: {
13 type: String, 13 type: String,
14 - required: true 14 + required: true,
15 - } 15 + },
16 }, 16 },
17 computed: { 17 computed: {
18 isExternal() { 18 isExternal() {
19 - return isExternal(this.to) 19 + return isExternal(this.to);
20 }, 20 },
21 type() { 21 type() {
22 if (this.isExternal) { 22 if (this.isExternal) {
23 - return 'a' 23 + return "a";
24 } 24 }
25 - return 'router-link' 25 + return "router-link";
26 - } 26 + },
27 }, 27 },
28 methods: { 28 methods: {
29 linkProps(to) { 29 linkProps(to) {
30 + console.log(to);
31 +
30 if (this.isExternal) { 32 if (this.isExternal) {
31 return { 33 return {
32 href: to, 34 href: to,
33 - target: '_blank', 35 + target: "_blank",
34 - rel: 'noopener' 36 + rel: "noopener",
35 - } 37 + };
36 } 38 }
37 return { 39 return {
38 - to: to 40 + to: to,
39 - } 41 + };
40 - } 42 + },
41 - } 43 + },
42 -} 44 +};
43 </script> 45 </script>
......
1 <template> 1 <template>
2 <div id="tags-view-container" class="tags-view-container"> 2 <div id="tags-view-container" class="tags-view-container">
3 - <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll"> 3 + <scroll-pane
4 - <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''" 4 + ref="scrollPane"
5 - :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item" 5 + class="tags-view-wrapper"
6 - :style="activeStyle(tag)" @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''" 6 + @scroll="handleScroll"
7 - @contextmenu.prevent.native="openMenu(tag, $event)"> 7 + >
8 + <router-link
9 + v-for="tag in visitedViews"
10 + ref="tag"
11 + :key="tag.path"
12 + :class="isActive(tag) ? 'active' : ''"
13 + :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
14 + tag="span"
15 + class="tags-view-item"
16 + :style="activeStyle(tag)"
17 + @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
18 + @contextmenu.prevent.native="openMenu(tag, $event)"
19 + >
8 {{ tag.title }} 20 {{ tag.title }}
9 - <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" /> 21 + <span
22 + v-if="!isAffix(tag)"
23 + class="el-icon-close"
24 + @click.prevent.stop="closeSelectedTag(tag)"
25 + />
10 </router-link> 26 </router-link>
11 </scroll-pane> 27 </scroll-pane>
12 - <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu"> 28 + <ul
29 + v-show="visible"
30 + :style="{ left: left + 'px', top: top + 'px' }"
31 + class="contextmenu"
32 + >
13 <li @click="refreshSelectedTag(selectedTag)">刷新页面</li> 33 <li @click="refreshSelectedTag(selectedTag)">刷新页面</li>
14 - <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭当前</li> 34 + <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
35 + 关闭当前
36 + </li>
15 <li @click="closeOthersTags">关闭其他</li> 37 <li @click="closeOthersTags">关闭其他</li>
16 <li v-if="!isLastView()" @click="closeRightTags">关闭右侧</li> 38 <li v-if="!isLastView()" @click="closeRightTags">关闭右侧</li>
17 <li @click="closeAllTags(selectedTag)">关闭所有</li> 39 <li @click="closeAllTags(selectedTag)">关闭所有</li>
...@@ -20,8 +42,8 @@ ...@@ -20,8 +42,8 @@
20 </template> 42 </template>
21 43
22 <script> 44 <script>
23 -import ScrollPane from './ScrollPane' 45 +import ScrollPane from "./ScrollPane";
24 -import path from 'path' 46 +import path from "path";
25 47
26 export default { 48 export default {
27 components: { ScrollPane }, 49 components: { ScrollPane },
...@@ -31,188 +53,200 @@ export default { ...@@ -31,188 +53,200 @@ export default {
31 top: 0, 53 top: 0,
32 left: 0, 54 left: 0,
33 selectedTag: {}, 55 selectedTag: {},
34 - affixTags: [] 56 + affixTags: [],
35 - } 57 + };
36 }, 58 },
37 computed: { 59 computed: {
38 visitedViews() { 60 visitedViews() {
39 - return this.$store.state.tagsView.visitedViews 61 + return this.$store.state.tagsView.visitedViews;
40 }, 62 },
41 routes() { 63 routes() {
42 - return this.$store.state.permission.routes 64 + return this.$store.state.permission.routes;
43 }, 65 },
44 theme() { 66 theme() {
45 return this.$store.state.settings.theme; 67 return this.$store.state.settings.theme;
46 - } 68 + },
47 }, 69 },
48 watch: { 70 watch: {
49 $route() { 71 $route() {
50 - this.addTags() 72 + this.addTags();
51 - this.moveToCurrentTag() 73 + this.moveToCurrentTag();
52 }, 74 },
53 visible(value) { 75 visible(value) {
54 if (value) { 76 if (value) {
55 - document.body.addEventListener('click', this.closeMenu) 77 + document.body.addEventListener("click", this.closeMenu);
56 } else { 78 } else {
57 - document.body.removeEventListener('click', this.closeMenu) 79 + document.body.removeEventListener("click", this.closeMenu);
58 } 80 }
59 - } 81 + },
60 }, 82 },
61 mounted() { 83 mounted() {
62 - this.initTags() 84 + this.initTags();
63 - this.addTags() 85 + this.addTags();
64 }, 86 },
65 methods: { 87 methods: {
66 isActive(route) { 88 isActive(route) {
67 - return route.path === this.$route.path 89 + return route.path === this.$route.path;
68 }, 90 },
69 activeStyle(tag) { 91 activeStyle(tag) {
70 if (!this.isActive(tag)) return {}; 92 if (!this.isActive(tag)) return {};
71 return { 93 return {
72 "background-color": this.theme, 94 "background-color": this.theme,
73 - "border-color": this.theme 95 + "border-color": this.theme,
74 }; 96 };
75 }, 97 },
76 isAffix(tag) { 98 isAffix(tag) {
77 - return tag.meta && tag.meta.affix 99 + return tag.meta && tag.meta.affix;
78 }, 100 },
79 isLastView() { 101 isLastView() {
80 try { 102 try {
81 - return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath 103 + return (
104 + this.selectedTag.fullPath ===
105 + this.visitedViews[this.visitedViews.length - 1].fullPath
106 + );
82 } catch (err) { 107 } catch (err) {
83 - return false 108 + return false;
84 } 109 }
85 }, 110 },
86 - filterAffixTags(routes, basePath = '/') { 111 + filterAffixTags(routes, basePath = "/") {
87 - let tags = [] 112 + let tags = [];
88 - routes.forEach(route => { 113 + routes.forEach((route) => {
89 if (route.meta && route.meta.affix) { 114 if (route.meta && route.meta.affix) {
90 - const tagPath = path.resolve(basePath, route.path) 115 + const tagPath = path.resolve(basePath, route.path);
91 tags.push({ 116 tags.push({
92 fullPath: tagPath, 117 fullPath: tagPath,
93 path: tagPath, 118 path: tagPath,
94 name: route.name, 119 name: route.name,
95 - meta: { ...route.meta } 120 + meta: { ...route.meta },
96 - }) 121 + });
97 } 122 }
98 if (route.children) { 123 if (route.children) {
99 - const tempTags = this.filterAffixTags(route.children, route.path) 124 + const tempTags = this.filterAffixTags(route.children, route.path);
100 if (tempTags.length >= 1) { 125 if (tempTags.length >= 1) {
101 - tags = [...tags, ...tempTags] 126 + tags = [...tags, ...tempTags];
102 } 127 }
103 } 128 }
104 - }) 129 + });
105 - return tags 130 + return tags;
106 }, 131 },
107 initTags() { 132 initTags() {
108 - const affixTags = this.affixTags = this.filterAffixTags(this.routes) 133 + const affixTags = (this.affixTags = this.filterAffixTags(this.routes));
109 for (const tag of affixTags) { 134 for (const tag of affixTags) {
110 // Must have tag name 135 // Must have tag name
111 if (tag.name) { 136 if (tag.name) {
112 - this.$store.dispatch('tagsView/addVisitedView', tag) 137 + this.$store.dispatch("tagsView/addVisitedView", tag);
113 } 138 }
114 } 139 }
115 }, 140 },
116 addTags() { 141 addTags() {
117 - const { name } = this.$route 142 + const { name } = this.$route;
118 if (name) { 143 if (name) {
119 - this.$store.dispatch('tagsView/addView', this.$route) 144 + this.$store.dispatch("tagsView/addView", this.$route);
120 } 145 }
121 - return false 146 + return false;
122 }, 147 },
123 moveToCurrentTag() { 148 moveToCurrentTag() {
124 - const tags = this.$refs.tag 149 + const tags = this.$refs.tag;
125 this.$nextTick(() => { 150 this.$nextTick(() => {
126 for (const tag of tags) { 151 for (const tag of tags) {
127 if (tag.to.path === this.$route.path) { 152 if (tag.to.path === this.$route.path) {
128 - this.$refs.scrollPane.moveToTarget(tag) 153 + this.$refs.scrollPane.moveToTarget(tag);
129 // when query is different then update 154 // when query is different then update
130 if (tag.to.fullPath !== this.$route.fullPath) { 155 if (tag.to.fullPath !== this.$route.fullPath) {
131 - this.$store.dispatch('tagsView/updateVisitedView', this.$route) 156 + this.$store.dispatch("tagsView/updateVisitedView", this.$route);
132 } 157 }
133 - break 158 + break;
134 } 159 }
135 } 160 }
136 - }) 161 + });
137 }, 162 },
138 refreshSelectedTag(view) { 163 refreshSelectedTag(view) {
139 - this.$store.dispatch('tagsView/delCachedView', view).then(() => { 164 + this.$store.dispatch("tagsView/delCachedView", view).then(() => {
140 - const { fullPath } = view 165 + const { fullPath } = view;
141 this.$nextTick(() => { 166 this.$nextTick(() => {
142 this.$router.replace({ 167 this.$router.replace({
143 - path: '/redirect' + fullPath 168 + // path: fullPath,
144 - }) 169 + path: "/redirect" + fullPath,
145 - }) 170 + });
146 - }) 171 + });
172 + });
147 }, 173 },
148 closeSelectedTag(view) { 174 closeSelectedTag(view) {
149 - this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => { 175 + this.$store
150 - if (this.isActive(view)) { 176 + .dispatch("tagsView/delView", view)
151 - this.toLastView(visitedViews, view) 177 + .then(({ visitedViews }) => {
152 - } 178 + if (this.isActive(view)) {
153 - }) 179 + this.toLastView(visitedViews, view);
180 + }
181 + });
154 }, 182 },
155 closeRightTags() { 183 closeRightTags() {
156 - this.$store.dispatch('tagsView/delRightTags', this.selectedTag).then(visitedViews => { 184 + this.$store
157 - if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) { 185 + .dispatch("tagsView/delRightTags", this.selectedTag)
158 - this.toLastView(visitedViews) 186 + .then((visitedViews) => {
159 - } 187 + if (!visitedViews.find((i) => i.fullPath === this.$route.fullPath)) {
160 - }) 188 + this.toLastView(visitedViews);
189 + }
190 + });
161 }, 191 },
162 closeOthersTags() { 192 closeOthersTags() {
163 - this.$router.push(this.selectedTag).catch(() => { }); 193 + this.$router.push(this.selectedTag).catch(() => {});
164 - this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => { 194 + this.$store
165 - this.moveToCurrentTag() 195 + .dispatch("tagsView/delOthersViews", this.selectedTag)
166 - }) 196 + .then(() => {
197 + this.moveToCurrentTag();
198 + });
167 }, 199 },
168 closeAllTags(view) { 200 closeAllTags(view) {
169 - this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => { 201 + this.$store.dispatch("tagsView/delAllViews").then(({ visitedViews }) => {
170 - if (this.affixTags.some(tag => tag.path === this.$route.path)) { 202 + console.log(this.affixTags, visitedViews, view);
171 - return 203 +
204 + if (this.affixTags.some((tag) => tag.path === this.$route.path)) {
205 + return;
172 } 206 }
173 - this.toLastView(visitedViews, view) 207 + this.toLastView(visitedViews, view);
174 - }) 208 + });
175 }, 209 },
176 toLastView(visitedViews, view) { 210 toLastView(visitedViews, view) {
177 - const latestView = visitedViews.slice(-1)[0] 211 + const latestView = visitedViews.slice(-1)[0];
178 if (latestView) { 212 if (latestView) {
179 - this.$router.push(latestView.fullPath) 213 + this.$router.push(latestView.fullPath);
180 } else { 214 } else {
181 // now the default is to redirect to the home page if there is no tags-view, 215 // now the default is to redirect to the home page if there is no tags-view,
182 // you can adjust it according to your needs. 216 // you can adjust it according to your needs.
183 - if (view.name === 'Dashboard') { 217 + // if (view.name === "Dashboard") {
184 - // to reload home page 218 + // to reload home page
185 - this.$router.replace({ path: '/redirect' + view.fullPath }) 219 + this.$router.replace({ path: "/redirect" + view.fullPath });
186 - } else { 220 + // } else {
187 - this.$router.push('/') 221 + // this.$router.push("/");
188 - } 222 + // }
189 } 223 }
190 }, 224 },
191 openMenu(tag, e) { 225 openMenu(tag, e) {
192 - const menuMinWidth = 105 226 + const menuMinWidth = 105;
193 - const offsetLeft = this.$el.getBoundingClientRect().left // container margin left 227 + const offsetLeft = this.$el.getBoundingClientRect().left; // container margin left
194 - const offsetWidth = this.$el.offsetWidth // container width 228 + const offsetWidth = this.$el.offsetWidth; // container width
195 - const maxLeft = offsetWidth - menuMinWidth // left boundary 229 + const maxLeft = offsetWidth - menuMinWidth; // left boundary
196 - const left = e.clientX - offsetLeft + 15 // 15: margin right 230 + const left = e.clientX - offsetLeft + 15; // 15: margin right
197 231
198 if (left > maxLeft) { 232 if (left > maxLeft) {
199 - this.left = maxLeft 233 + this.left = maxLeft;
200 } else { 234 } else {
201 - this.left = left 235 + this.left = left;
202 } 236 }
203 237
204 - this.top = e.clientY 238 + this.top = e.clientY;
205 - this.visible = true 239 + this.visible = true;
206 - this.selectedTag = tag 240 + this.selectedTag = tag;
207 }, 241 },
208 closeMenu() { 242 closeMenu() {
209 - this.visible = false 243 + this.visible = false;
210 }, 244 },
211 handleScroll() { 245 handleScroll() {
212 - this.closeMenu() 246 + this.closeMenu();
213 - } 247 + },
214 - } 248 + },
215 -} 249 +};
216 </script> 250 </script>
217 251
218 <style lang="scss" scoped> 252 <style lang="scss" scoped>
...@@ -221,7 +255,7 @@ export default { ...@@ -221,7 +255,7 @@ export default {
221 width: 100%; 255 width: 100%;
222 background: #fff; 256 background: #fff;
223 border-bottom: 1px solid #d8dce5; 257 border-bottom: 1px solid #d8dce5;
224 - box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04); 258 + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
225 259
226 .tags-view-wrapper { 260 .tags-view-wrapper {
227 .tags-view-item { 261 .tags-view-item {
...@@ -252,7 +286,7 @@ export default { ...@@ -252,7 +286,7 @@ export default {
252 border-color: #42b983; 286 border-color: #42b983;
253 287
254 &::before { 288 &::before {
255 - content: ''; 289 + content: "";
256 background: #fff; 290 background: #fff;
257 display: inline-block; 291 display: inline-block;
258 width: 8px; 292 width: 8px;
...@@ -276,7 +310,7 @@ export default { ...@@ -276,7 +310,7 @@ export default {
276 font-size: 12px; 310 font-size: 12px;
277 font-weight: 400; 311 font-weight: 400;
278 color: #333; 312 color: #333;
279 - box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3); 313 + box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
280 314
281 li { 315 li {
282 margin: 0; 316 margin: 0;
...@@ -301,11 +335,11 @@ export default { ...@@ -301,11 +335,11 @@ export default {
301 vertical-align: 2px; 335 vertical-align: 2px;
302 border-radius: 50%; 336 border-radius: 50%;
303 text-align: center; 337 text-align: center;
304 - transition: all .3s cubic-bezier(.645, .045, .355, 1); 338 + transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
305 transform-origin: 100% 50%; 339 transform-origin: 100% 50%;
306 340
307 &:before { 341 &:before {
308 - transform: scale(.6); 342 + transform: scale(0.6);
309 display: inline-block; 343 display: inline-block;
310 vertical-align: -3px; 344 vertical-align: -3px;
311 } 345 }
......
1 +export const routeNameMap = {
2 + "/reportingData": "ReportingData", // 分单级申报数据
3 + "/editReportingData": "EditReportingData", // 申报数据编辑
4 + "/arrival-declare": "ArrivalDeclare", // 总单级申报数据
5 + "/receipt-management": "ReceiptManagement", //模拟回执管理
6 + "/exportBillQuery": "ExportBillQuery",
7 + "/exportBillDetail": "ExportBillDetail",
8 + "/exportTransportBillQuery": "ExportTransportBillQuery",
9 + "/exportTransportDetail": "ExportTransportDetail", //出口运单详情
10 + "/exportListQuery": "ExportListQuery",
11 + "/exportListDetail": "ExportListDetail",
12 + "/listBranchQuery": "ListBranchQuery",
13 + "/listBranchDetail": "ListBranchDetail",
14 + "/arrival-list": "ArrivalList",
15 + "/arrival-list-detail": "ArrivalListDetail",
16 + "/logisticsExitQuery": "LogisticsExitQuery",
17 + "/logisticsExitDetail": "LogisticsExitDetail",
18 + "/exportRevokeBillQuery": "ExportRevokeBillQuery",
19 + "/pdd-info": "PddList",
20 + "/pdd-detail": "PddListDetail",
21 + "/summaryEdit": "SummaryEdit",
22 + "/summaryDetail": "SummaryDetail",
23 + "/summaryDataSearch": "SummaryDataSearch",
24 + "/log-search": "LogSearch",
25 + "/portConfig": "PortConfig",
26 + "/customerConfig": "CustomerConfig",
27 + "/hs-code": "HsCode",
28 + "/cipherMachineConfig": "CipherMachineConfig",
29 + "/api-key": "ApiKey",
30 + "/supervise-place-manage": "SupervisePlaceManage",
31 + "/userRoleConfig": "UserRoleConfig",
32 + "/roleConfig": "RoleConfig",
33 +};
...@@ -99,15 +99,15 @@ export default { ...@@ -99,15 +99,15 @@ export default {
99 watch: { 99 watch: {
100 $route(val) { 100 $route(val) {
101 this.activeRoute = val; 101 this.activeRoute = val;
102 - this.setMainHeight(); 102 + // this.setMainHeight();
103 }, 103 },
104 }, 104 },
105 mounted() {}, 105 mounted() {},
106 methods: { 106 methods: {
107 - setMainHeight(val) { 107 + // setMainHeight(val) {
108 - document.querySelector(".main-container").style.height = 108 + // document.querySelector(".main-container").style.height =
109 - "calc(100% - 64px)"; 109 + // "calc(100% - 64px)";
110 - }, 110 + // },
111 handleClickOutside() { 111 handleClickOutside() {
112 this.$store.dispatch("app/closeSideBar", { withoutAnimation: false }); 112 this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
113 }, 113 },
...@@ -127,6 +127,10 @@ export default { ...@@ -127,6 +127,10 @@ export default {
127 @import "~@/assets/styles/mixin.scss"; 127 @import "~@/assets/styles/mixin.scss";
128 @import "~@/assets/styles/variables.scss"; 128 @import "~@/assets/styles/variables.scss";
129 129
130 +.main-container {
131 + height: calc(100vh - 98px) !important;
132 +}
133 +
130 .app-wrapper { 134 .app-wrapper {
131 @include clearfix; 135 @include clearfix;
132 position: relative; 136 position: relative;
......
1 module.exports = { 1 module.exports = {
2 - title: '跨境电商在线申报', 2 + title: "跨境电商在线申报",
3 3
4 /** 4 /**
5 * 侧边栏主题 深色主题theme-dark，浅色主题theme-light 5 * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
6 */ 6 */
7 - sideTheme: 'theme-light', 7 + sideTheme: "theme-light",
8 8
9 /** 9 /**
10 * 是否系统布局配置 10 * 是否系统布局配置
...@@ -19,7 +19,7 @@ module.exports = { ...@@ -19,7 +19,7 @@ module.exports = {
19 /** 19 /**
20 * 是否显示 tagsView 20 * 是否显示 tagsView
21 */ 21 */
22 - tagsView: false, 22 + tagsView: true,
23 23
24 /** 24 /**
25 * 是否固定头部 25 * 是否固定头部
...@@ -37,5 +37,5 @@ module.exports = { ...@@ -37,5 +37,5 @@ 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 -} 41 +};
......
1 const state = { 1 const state = {
2 visitedViews: [], 2 visitedViews: [],
3 - cachedViews: [] 3 + cachedViews: [],
4 -} 4 +};
5 5
6 const mutations = { 6 const mutations = {
7 ADD_VISITED_VIEW: (state, view) => { 7 ADD_VISITED_VIEW: (state, view) => {
8 - if (state.visitedViews.some(v => v.path === view.path)) return 8 + if (state.visitedViews.some((v) => v.path === view.path)) return;
9 state.visitedViews.push( 9 state.visitedViews.push(
10 Object.assign({}, view, { 10 Object.assign({}, view, {
11 - title: view.meta.title || 'no-name' 11 + title: view.meta.title || "no-name",
12 }) 12 })
13 - ) 13 + );
14 }, 14 },
15 ADD_CACHED_VIEW: (state, view) => { 15 ADD_CACHED_VIEW: (state, view) => {
16 - if (state.cachedViews.includes(view.name)) return 16 + if (state.cachedViews.includes(view.name)) return;
17 if (!view.meta.noCache) { 17 if (!view.meta.noCache) {
18 - state.cachedViews.push(view.name) 18 + state.cachedViews.push(view.name);
19 } 19 }
20 }, 20 },
21 21
22 DEL_VISITED_VIEW: (state, view) => { 22 DEL_VISITED_VIEW: (state, view) => {
23 for (const [i, v] of state.visitedViews.entries()) { 23 for (const [i, v] of state.visitedViews.entries()) {
24 if (v.path === view.path) { 24 if (v.path === view.path) {
25 - state.visitedViews.splice(i, 1) 25 + state.visitedViews.splice(i, 1);
26 - break 26 + break;
27 } 27 }
28 } 28 }
29 }, 29 },
30 DEL_CACHED_VIEW: (state, view) => { 30 DEL_CACHED_VIEW: (state, view) => {
31 - const index = state.cachedViews.indexOf(view.name) 31 + const index = state.cachedViews.indexOf(view.name);
32 - index > -1 && state.cachedViews.splice(index, 1) 32 + index > -1 && state.cachedViews.splice(index, 1);
33 }, 33 },
34 34
35 DEL_OTHERS_VISITED_VIEWS: (state, view) => { 35 DEL_OTHERS_VISITED_VIEWS: (state, view) => {
36 - state.visitedViews = state.visitedViews.filter(v => { 36 + state.visitedViews = state.visitedViews.filter((v) => {
37 - return v.meta.affix || v.path === view.path 37 + return v.meta.affix || v.path === view.path;
38 - }) 38 + });
39 }, 39 },
40 DEL_OTHERS_CACHED_VIEWS: (state, view) => { 40 DEL_OTHERS_CACHED_VIEWS: (state, view) => {
41 - const index = state.cachedViews.indexOf(view.name) 41 + const index = state.cachedViews.indexOf(view.name);
42 if (index > -1) { 42 if (index > -1) {
43 - state.cachedViews = state.cachedViews.slice(index, index + 1) 43 + state.cachedViews = state.cachedViews.slice(index, index + 1);
44 } else { 44 } else {
45 - state.cachedViews = [] 45 + state.cachedViews = [];
46 } 46 }
47 }, 47 },
48 48
49 - DEL_ALL_VISITED_VIEWS: state => { 49 + DEL_ALL_VISITED_VIEWS: (state) => {
50 // keep affix tags 50 // keep affix tags
51 - const affixTags = state.visitedViews.filter(tag => tag.meta.affix) 51 + const affixTags = state.visitedViews.filter((tag) => tag.meta.affix);
52 - state.visitedViews = affixTags 52 + state.visitedViews = affixTags;
53 }, 53 },
54 - DEL_ALL_CACHED_VIEWS: state => { 54 + DEL_ALL_CACHED_VIEWS: (state) => {
55 - state.cachedViews = [] 55 + state.cachedViews = [];
56 }, 56 },
57 57
58 UPDATE_VISITED_VIEW: (state, view) => { 58 UPDATE_VISITED_VIEW: (state, view) => {
59 for (let v of state.visitedViews) { 59 for (let v of state.visitedViews) {
60 if (v.path === view.path) { 60 if (v.path === view.path) {
61 - v = Object.assign(v, view) 61 + v = Object.assign(v, view);
62 - break 62 + break;
63 } 63 }
64 } 64 }
65 }, 65 },
66 66
67 DEL_RIGHT_VIEWS: (state, view) => { 67 DEL_RIGHT_VIEWS: (state, view) => {
68 - const index = state.visitedViews.findIndex(v => v.path === view.path) 68 + const index = state.visitedViews.findIndex((v) => v.path === view.path);
69 if (index === -1) { 69 if (index === -1) {
70 - return 70 + return;
71 } 71 }
72 state.visitedViews = state.visitedViews.filter((item, idx) => { 72 state.visitedViews = state.visitedViews.filter((item, idx) => {
73 if (idx <= index || (item.meta && item.meta.affix)) { 73 if (idx <= index || (item.meta && item.meta.affix)) {
74 - return true 74 + return true;
75 } 75 }
76 - const i = state.cachedViews.indexOf(item.name) 76 + const i = state.cachedViews.indexOf(item.name);
77 if (i > -1) { 77 if (i > -1) {
78 - state.cachedViews.splice(i, 1) 78 + state.cachedViews.splice(i, 1);
79 } 79 }
80 - return false 80 + return false;
81 - }) 81 + });
82 - } 82 + },
83 -} 83 +};
84 84
85 const actions = { 85 const actions = {
86 addView({ dispatch }, view) { 86 addView({ dispatch }, view) {
87 - dispatch('addVisitedView', view) 87 + dispatch("addVisitedView", view);
88 - dispatch('addCachedView', view) 88 + dispatch("addCachedView", view);
89 + console.log("addView", view);
89 }, 90 },
90 addVisitedView({ commit }, view) { 91 addVisitedView({ commit }, view) {
91 - commit('ADD_VISITED_VIEW', view) 92 + commit("ADD_VISITED_VIEW", view);
92 }, 93 },
93 addCachedView({ commit }, view) { 94 addCachedView({ commit }, view) {
94 - commit('ADD_CACHED_VIEW', view) 95 + commit("ADD_CACHED_VIEW", view);
95 }, 96 },
96 97
97 delView({ dispatch, state }, view) { 98 delView({ dispatch, state }, view) {
98 - return new Promise(resolve => { 99 + return new Promise((resolve) => {
99 - dispatch('delVisitedView', view) 100 + dispatch("delVisitedView", view);
100 - dispatch('delCachedView', view) 101 + dispatch("delCachedView", view);
101 resolve({ 102 resolve({
102 visitedViews: [...state.visitedViews], 103 visitedViews: [...state.visitedViews],
103 - cachedViews: [...state.cachedViews] 104 + cachedViews: [...state.cachedViews],
104 - }) 105 + });
105 - }) 106 + });
106 }, 107 },
107 delVisitedView({ commit, state }, view) { 108 delVisitedView({ commit, state }, view) {
108 - return new Promise(resolve => { 109 + return new Promise((resolve) => {
109 - commit('DEL_VISITED_VIEW', view) 110 + commit("DEL_VISITED_VIEW", view);
110 - resolve([...state.visitedViews]) 111 + resolve([...state.visitedViews]);
111 - }) 112 + });
112 }, 113 },
113 delCachedView({ commit, state }, view) { 114 delCachedView({ commit, state }, view) {
114 - return new Promise(resolve => { 115 + return new Promise((resolve) => {
115 - commit('DEL_CACHED_VIEW', view) 116 + commit("DEL_CACHED_VIEW", view);
116 - resolve([...state.cachedViews]) 117 + resolve([...state.cachedViews]);
117 - }) 118 + });
118 }, 119 },
119 120
120 delOthersViews({ dispatch, state }, view) { 121 delOthersViews({ dispatch, state }, view) {
121 - return new Promise(resolve => { 122 + return new Promise((resolve) => {
122 - dispatch('delOthersVisitedViews', view) 123 + dispatch("delOthersVisitedViews", view);
123 - dispatch('delOthersCachedViews', view) 124 + dispatch("delOthersCachedViews", view);
124 resolve({ 125 resolve({
125 visitedViews: [...state.visitedViews], 126 visitedViews: [...state.visitedViews],
126 - cachedViews: [...state.cachedViews] 127 + cachedViews: [...state.cachedViews],
127 - }) 128 + });
128 - }) 129 + });
129 }, 130 },
130 delOthersVisitedViews({ commit, state }, view) { 131 delOthersVisitedViews({ commit, state }, view) {
131 - return new Promise(resolve => { 132 + return new Promise((resolve) => {
132 - commit('DEL_OTHERS_VISITED_VIEWS', view) 133 + commit("DEL_OTHERS_VISITED_VIEWS", view);
133 - resolve([...state.visitedViews]) 134 + resolve([...state.visitedViews]);
134 - }) 135 + });
135 }, 136 },
136 delOthersCachedViews({ commit, state }, view) { 137 delOthersCachedViews({ commit, state }, view) {
137 - return new Promise(resolve => { 138 + return new Promise((resolve) => {
138 - commit('DEL_OTHERS_CACHED_VIEWS', view) 139 + commit("DEL_OTHERS_CACHED_VIEWS", view);
139 - resolve([...state.cachedViews]) 140 + resolve([...state.cachedViews]);
140 - }) 141 + });
141 }, 142 },
142 143
143 delAllViews({ dispatch, state }, view) { 144 delAllViews({ dispatch, state }, view) {
144 - return new Promise(resolve => { 145 + return new Promise((resolve) => {
145 - dispatch('delAllVisitedViews', view) 146 + dispatch("delAllVisitedViews", view);
146 - dispatch('delAllCachedViews', view) 147 + dispatch("delAllCachedViews", view);
147 resolve({ 148 resolve({
148 visitedViews: [...state.visitedViews], 149 visitedViews: [...state.visitedViews],
149 - cachedViews: [...state.cachedViews] 150 + cachedViews: [...state.cachedViews],
150 - }) 151 + });
151 - }) 152 + });
152 }, 153 },
153 delAllVisitedViews({ commit, state }) { 154 delAllVisitedViews({ commit, state }) {
154 - return new Promise(resolve => { 155 + return new Promise((resolve) => {
155 - commit('DEL_ALL_VISITED_VIEWS') 156 + commit("DEL_ALL_VISITED_VIEWS");
156 - resolve([...state.visitedViews]) 157 + resolve([...state.visitedViews]);
157 - }) 158 + });
158 }, 159 },
159 delAllCachedViews({ commit, state }) { 160 delAllCachedViews({ commit, state }) {
160 - return new Promise(resolve => { 161 + return new Promise((resolve) => {
161 - commit('DEL_ALL_CACHED_VIEWS') 162 + commit("DEL_ALL_CACHED_VIEWS");
162 - resolve([...state.cachedViews]) 163 + resolve([...state.cachedViews]);
163 - }) 164 + });
164 }, 165 },
165 166
166 updateVisitedView({ commit }, view) { 167 updateVisitedView({ commit }, view) {
167 - commit('UPDATE_VISITED_VIEW', view) 168 + commit("UPDATE_VISITED_VIEW", view);
168 }, 169 },
169 170
170 delRightTags({ commit }, view) { 171 delRightTags({ commit }, view) {
171 - return new Promise(resolve => { 172 + return new Promise((resolve) => {
172 - commit('DEL_RIGHT_VIEWS', view) 173 + commit("DEL_RIGHT_VIEWS", view);
173 - resolve([...state.visitedViews]) 174 + resolve([...state.visitedViews]);
174 - }) 175 + });
175 - } 176 + },
176 -} 177 +};
177 178
178 export default { 179 export default {
179 namespaced: true, 180 namespaced: true,
180 state, 181 state,
181 mutations, 182 mutations,
182 - actions 183 + actions,
183 -} 184 +};
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 <!-- 提运单号 --> 35 <!-- 提运单号 -->
36 <el-col :span="5"> 36 <el-col :span="5">
37 <Formitem label="提运单号" prop="billNo"> 37 <Formitem label="提运单号" prop="billNo">
38 - <el-input 38 + <!-- <el-input
39 type="text" 39 type="text"
40 class="inputShadow" 40 class="inputShadow"
41 id="inputInner--billNo" 41 id="inputInner--billNo"
...@@ -43,7 +43,12 @@ ...@@ -43,7 +43,12 @@
43 v-model="sreachFormData.billNo" 43 v-model="sreachFormData.billNo"
44 clearable 44 clearable
45 placeholder="" 45 placeholder=""
46 - ></el-input> 46 + ></el-input> -->
47 + <FormTextareaInput
48 + :formData="sreachFormData"
49 + dataKey="billNo"
50 + @formChange="formChange"
51 + />
47 </Formitem> 52 </Formitem>
48 </el-col> 53 </el-col>
49 54
...@@ -350,7 +355,7 @@ import { getCurrUserPortInfo } from "@/api/system/user.js"; ...@@ -350,7 +355,7 @@ import { getCurrUserPortInfo } from "@/api/system/user.js";
350 import PopoverComponent from "./popover-component.vue"; 355 import PopoverComponent from "./popover-component.vue";
351 356
352 export default { 357 export default {
353 - name: "SupervisePlaceManage", 358 + name: "ArrivalDeclare",
354 components: { 359 components: {
355 DialogVue, 360 DialogVue,
356 DataPreview, 361 DataPreview,
...@@ -546,6 +551,10 @@ export default { ...@@ -546,6 +551,10 @@ export default {
546 methods: { 551 methods: {
547 getTotalDocumentsLevelLog: getTotalDocumentsLevelLog, 552 getTotalDocumentsLevelLog: getTotalDocumentsLevelLog,
548 getOperationLogByBillNo: getOperationLogByBillNo, 553 getOperationLogByBillNo: getOperationLogByBillNo,
554 +
555 + formChange(val) {
556 + this.sreachFormData = val;
557 + },
549 //申报日志 558 //申报日志
550 popperClose() { 559 popperClose() {
551 this.optionsVisible = false; 560 this.optionsVisible = false;
......
...@@ -317,7 +317,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; ...@@ -317,7 +317,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
317 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 317 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
318 import { getExportArrivalInDetails } from "@/api/arrivalList-api"; 318 import { getExportArrivalInDetails } from "@/api/arrivalList-api";
319 export default { 319 export default {
320 - name: "", 320 + name: "ArrivalListDetail",
321 components: { ProductDetailTable, ReceiptInfoTable }, 321 components: { ProductDetailTable, ReceiptInfoTable },
322 data() { 322 data() {
323 return { 323 return {
...@@ -378,8 +378,8 @@ export default { ...@@ -378,8 +378,8 @@ export default {
378 }; 378 };
379 }, 379 },
380 created() { 380 created() {
381 - if (this.$route.params.data) { 381 + if (this.$route.query.id) {
382 - this.id = this.$route.params.data.id; 382 + this.id = this.$route.query.id;
383 this.searchData(); 383 this.searchData();
384 } else { 384 } else {
385 this.back(); 385 this.back();
......
...@@ -298,7 +298,8 @@ export default { ...@@ -298,7 +298,8 @@ export default {
298 view(val) { 298 view(val) {
299 this.$router.push({ 299 this.$router.push({
300 name: "ArrivalListDetail", 300 name: "ArrivalListDetail",
301 - params: { data: val }, 301 + // params: { data: val },
302 + query: { id: val.id },
302 }); 303 });
303 }, 304 },
304 formChange(val) { 305 formChange(val) {
......
...@@ -175,7 +175,7 @@ import { getDictData } from "@/api/system/dict-api.js"; ...@@ -175,7 +175,7 @@ import { getDictData } from "@/api/system/dict-api.js";
175 175
176 import DialogVue from "./dialog.vue"; 176 import DialogVue from "./dialog.vue";
177 export default { 177 export default {
178 - name: "PortConfig", 178 + name: "CustomerConfig",
179 components: { 179 components: {
180 DialogVue, 180 DialogVue,
181 }, 181 },
......
...@@ -668,7 +668,7 @@ import { ...@@ -668,7 +668,7 @@ import {
668 updateDeclareData, 668 updateDeclareData,
669 } from "@/api/declareData-api.js"; 669 } from "@/api/declareData-api.js";
670 export default { 670 export default {
671 - name: "", 671 + name: "EditReportingData",
672 components: { RowDataEditForm }, 672 components: { RowDataEditForm },
673 data() { 673 data() {
674 var checkNegativeNum = (rule, value, callback) => { 674 var checkNegativeNum = (rule, value, callback) => {
...@@ -972,8 +972,8 @@ export default { ...@@ -972,8 +972,8 @@ export default {
972 }; 972 };
973 }, 973 },
974 created() { 974 created() {
975 - if (this.$route.params.data) { 975 + if (this.$route.query.declareId) {
976 - this.declareId = this.$route.params.data.declareId; 976 + this.declareId = this.$route.query.declareId;
977 this.queryDeclareData(this.declareId); 977 this.queryDeclareData(this.declareId);
978 this.queryCustomerList(); 978 this.queryCustomerList();
979 this.queryPortList(); 979 this.queryPortList();
......
...@@ -101,8 +101,8 @@ ...@@ -101,8 +101,8 @@
101 </el-col> 101 </el-col>
102 </el-row> 102 </el-row>
103 <el-row :gutter="5"> 103 <el-row :gutter="5">
104 - <!-- 商品金额 --> 104 + <!-- 商品金额 -->
105 - <el-col :span="3"> 105 + <el-col :span="3">
106 <Formitem label="商品金额" prop="goodsValue"> 106 <Formitem label="商品金额" prop="goodsValue">
107 <el-input 107 <el-input
108 type="text" 108 type="text"
...@@ -247,7 +247,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; ...@@ -247,7 +247,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
247 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 247 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
248 import { getOrderDetailData } from "@/api/exportDetail-api.js"; 248 import { getOrderDetailData } from "@/api/exportDetail-api.js";
249 export default { 249 export default {
250 - name: "", 250 + name: "ExportBillDetail",
251 components: { ProductDetailTable, ReceiptInfoTable }, 251 components: { ProductDetailTable, ReceiptInfoTable },
252 data() { 252 data() {
253 return { 253 return {
...@@ -352,8 +352,8 @@ export default { ...@@ -352,8 +352,8 @@ export default {
352 }; 352 };
353 }, 353 },
354 created() { 354 created() {
355 - if (this.$route.params.data) { 355 + if (this.$route.query.id) {
356 - this.id = this.$route.params.data.id; 356 + this.id = this.$route.query.id;
357 this.searchData(); 357 this.searchData();
358 } else { 358 } else {
359 this.back(); 359 this.back();
......
...@@ -361,7 +361,8 @@ export default { ...@@ -361,7 +361,8 @@ export default {
361 view(val) { 361 view(val) {
362 this.$router.push({ 362 this.$router.push({
363 name: "ExportBillDetail", 363 name: "ExportBillDetail",
364 - params: { data: val }, 364 + // params: { data: val },
365 + query: { id: val.id },
365 }); 366 });
366 }, 367 },
367 popoverChange(val) { 368 popoverChange(val) {
......
...@@ -747,7 +747,7 @@ import DialogVue from "./dialog.vue"; ...@@ -747,7 +747,7 @@ import DialogVue from "./dialog.vue";
747 import { isHasAuth } from "../../utils/auth"; 747 import { isHasAuth } from "../../utils/auth";
748 748
749 export default { 749 export default {
750 - name: "", 750 + name: "ExportListDetail",
751 components: { ProductDetailTable, ReceiptInfoTable, DialogVue }, 751 components: { ProductDetailTable, ReceiptInfoTable, DialogVue },
752 data() { 752 data() {
753 return { 753 return {
...@@ -874,8 +874,8 @@ export default { ...@@ -874,8 +874,8 @@ export default {
874 }; 874 };
875 }, 875 },
876 created() { 876 created() {
877 - if (this.$route.params.data) { 877 + if (this.$route.query.id) {
878 - this.id = this.$route.params.data.id; 878 + this.id = this.$route.query.id;
879 this.searchData(); 879 this.searchData();
880 } else { 880 } else {
881 this.back(); 881 this.back();
......
...@@ -274,7 +274,7 @@ import CustomDialog from "./custom-dialog.vue"; ...@@ -274,7 +274,7 @@ import CustomDialog from "./custom-dialog.vue";
274 import { formatDateNew } from "../../utils"; 274 import { formatDateNew } from "../../utils";
275 275
276 export default { 276 export default {
277 - name: "ExportBillQuery", 277 + name: "ExportListQuery",
278 components: { 278 components: {
279 CustomDialog, 279 CustomDialog,
280 }, 280 },
...@@ -507,7 +507,8 @@ export default { ...@@ -507,7 +507,8 @@ export default {
507 view(val) { 507 view(val) {
508 this.$router.push({ 508 this.$router.push({
509 name: "ExportListDetail", 509 name: "ExportListDetail",
510 - params: { data: val }, 510 + // params: { data: val },
511 + query: { id: val.id },
511 }); 512 });
512 }, 513 },
513 popoverChange(val) { 514 popoverChange(val) {
......
...@@ -287,7 +287,8 @@ export default { ...@@ -287,7 +287,8 @@ export default {
287 view(val) { 287 view(val) {
288 this.$router.push({ 288 this.$router.push({
289 name: "ExportTransportDetail", 289 name: "ExportTransportDetail",
290 - params: { data: val }, 290 + // params: { data: val },
291 + query: { id: val.id },
291 }); 292 });
292 }, 293 },
293 //查询 294 //查询
......
...@@ -272,7 +272,8 @@ export default { ...@@ -272,7 +272,8 @@ export default {
272 view(val) { 272 view(val) {
273 this.$router.push({ 273 this.$router.push({
274 name: "ExportTransportDetail", 274 name: "ExportTransportDetail",
275 - params: { data: val }, 275 + // params: { data: val },
276 + query: { id: val.id },
276 }); 277 });
277 }, 278 },
278 //查询 279 //查询
......
...@@ -99,7 +99,6 @@ ...@@ -99,7 +99,6 @@
99 ></el-input> 99 ></el-input>
100 </Formitem> 100 </Formitem>
101 </el-col> 101 </el-col>
102 -
103 </el-row> 102 </el-row>
104 <el-row :gutter="5"> 103 <el-row :gutter="5">
105 <!-- 币制 --> 104 <!-- 币制 -->
...@@ -135,7 +134,7 @@ ...@@ -135,7 +134,7 @@
135 ></el-input> 134 ></el-input>
136 </Formitem> 135 </Formitem>
137 </el-col> 136 </el-col>
138 - 137 +
139 <!-- 主要货物信息 --> 138 <!-- 主要货物信息 -->
140 <el-col :span="6"> 139 <el-col :span="6">
141 <Formitem label="主要货物信息" prop="goodsInfo"> 140 <Formitem label="主要货物信息" prop="goodsInfo">
...@@ -182,8 +181,8 @@ ...@@ -182,8 +181,8 @@
182 ></el-input> 181 ></el-input>
183 </Formitem> 182 </Formitem>
184 </el-col> 183 </el-col>
185 - <!-- 件数 --> 184 + <!-- 件数 -->
186 - <el-col :span="3"> 185 + <el-col :span="3">
187 <Formitem label="件数" prop="packNo"> 186 <Formitem label="件数" prop="packNo">
188 <el-input 187 <el-input
189 type="text" 188 type="text"
...@@ -214,8 +213,8 @@ ...@@ -214,8 +213,8 @@
214 </el-select> 213 </el-select>
215 </Formitem> 214 </Formitem>
216 </el-col> 215 </el-col>
217 - <!-- 运费 --> 216 + <!-- 运费 -->
218 - <el-col :span="3"> 217 + <el-col :span="3">
219 <Formitem label="运费" prop="freight"> 218 <Formitem label="运费" prop="freight">
220 <el-input 219 <el-input
221 type="text" 220 type="text"
...@@ -283,7 +282,7 @@ ...@@ -283,7 +282,7 @@
283 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; 282 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
284 import { getTransportDetail } from "@/api/exportDetail-api.js"; 283 import { getTransportDetail } from "@/api/exportDetail-api.js";
285 export default { 284 export default {
286 - name: "", 285 + name: "ExportTransportDetail",
287 components: { ReceiptInfoTable }, 286 components: { ReceiptInfoTable },
288 data() { 287 data() {
289 return { 288 return {
...@@ -388,8 +387,8 @@ export default { ...@@ -388,8 +387,8 @@ export default {
388 }; 387 };
389 }, 388 },
390 created() { 389 created() {
391 - if (this.$route.params.data) { 390 + if (this.$route.query.id) {
392 - this.id = this.$route.params.data.id; 391 + this.id = this.$route.query.id;
393 this.searchData(); 392 this.searchData();
394 } else { 393 } else {
395 this.back(); 394 this.back();
......
...@@ -149,7 +149,7 @@ import { getHsCodeList, getHsCodeSingleSync } from "@/api/arrivalList-api.js"; ...@@ -149,7 +149,7 @@ import { getHsCodeList, getHsCodeSingleSync } from "@/api/arrivalList-api.js";
149 import DialogVue from "./dialog.vue"; 149 import DialogVue from "./dialog.vue";
150 import TimeDialog from "./time-dialog.vue"; 150 import TimeDialog from "./time-dialog.vue";
151 export default { 151 export default {
152 - name: "SupervisePlaceManage", 152 + name: "HsCode",
153 components: { 153 components: {
154 DialogVue, 154 DialogVue,
155 TimeDialog, 155 TimeDialog,
...@@ -429,5 +429,7 @@ export default { ...@@ -429,5 +429,7 @@ export default {
429 } 429 }
430 .name-wrapper-content { 430 .name-wrapper-content {
431 max-width: 400px; 431 max-width: 400px;
432 + max-height: 400px;
433 + overflow-y: scroll;
432 } 434 }
433 </style> 435 </style>
......
...@@ -13,12 +13,8 @@ export default { ...@@ -13,12 +13,8 @@ export default {
13 fcl: false, 13 fcl: false,
14 }; 14 };
15 }, 15 },
16 - created() { 16 + created() {},
17 - 17 + methods: {},
18 - },
19 - methods: {
20 -
21 - },
22 }; 18 };
23 </script> 19 </script>
24 20
......
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
269 :label="item.itemChineseName" 269 :label="item.itemChineseName"
270 :value="item.itemValue" 270 :value="item.itemValue"
271 ></el-option> 271 ></el-option>
272 - </el-select> 272 + </el-select>
273 </Formitem> 273 </Formitem>
274 </el-col> 274 </el-col>
275 <!-- 申报日期 --> 275 <!-- 申报日期 -->
...@@ -333,7 +333,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; ...@@ -333,7 +333,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
333 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 333 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
334 import { getListBranchDetail } from "@/api/exportDetail-api.js"; 334 import { getListBranchDetail } from "@/api/exportDetail-api.js";
335 export default { 335 export default {
336 - name: "", 336 + name: "ListBranchDetail",
337 components: { ProductDetailTable, ReceiptInfoTable }, 337 components: { ProductDetailTable, ReceiptInfoTable },
338 data() { 338 data() {
339 return { 339 return {
...@@ -400,8 +400,8 @@ export default { ...@@ -400,8 +400,8 @@ export default {
400 }; 400 };
401 }, 401 },
402 created() { 402 created() {
403 - if (this.$route.params.data) { 403 + if (this.$route.query.id) {
404 - this.id = this.$route.params.data.id; 404 + this.id = this.$route.query.id;
405 this.searchData(); 405 this.searchData();
406 } else { 406 } else {
407 this.back(); 407 this.back();
......
...@@ -284,7 +284,8 @@ export default { ...@@ -284,7 +284,8 @@ export default {
284 view(val) { 284 view(val) {
285 this.$router.push({ 285 this.$router.push({
286 name: "ListBranchDetail", 286 name: "ListBranchDetail",
287 - params: { data: val }, 287 + // params: { data: val },
288 + query: { id: val.id },
288 }); 289 });
289 }, 290 },
290 //查询 291 //查询
......
...@@ -152,7 +152,7 @@ import { getOperationLogList } from "@/api/logSearch-api.js"; ...@@ -152,7 +152,7 @@ import { getOperationLogList } from "@/api/logSearch-api.js";
152 import { getDictData } from "@/api/system/dict-api.js"; 152 import { getDictData } from "@/api/system/dict-api.js";
153 153
154 export default { 154 export default {
155 - name: "SupervisePlaceManage", 155 + name: "LogSearch",
156 components: {}, 156 components: {},
157 data() { 157 data() {
158 return { 158 return {
......
...@@ -104,11 +104,10 @@ ...@@ -104,11 +104,10 @@
104 ></el-input> 104 ></el-input>
105 </Formitem> 105 </Formitem>
106 </el-col> 106 </el-col>
107 -
108 </el-row> 107 </el-row>
109 <el-row :gutter="5"> 108 <el-row :gutter="5">
110 - <!-- 申报地海关代码 --> 109 + <!-- 申报地海关代码 -->
111 - <el-col :span="3"> 110 + <el-col :span="3">
112 <Formitem label="申报地海关代码" prop="customsCode"> 111 <Formitem label="申报地海关代码" prop="customsCode">
113 <el-input 112 <el-input
114 type="text" 113 type="text"
...@@ -229,7 +228,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; ...@@ -229,7 +228,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
229 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 228 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
230 import { getLogisticsExitDetail } from "@/api/exportDetail-api.js"; 229 import { getLogisticsExitDetail } from "@/api/exportDetail-api.js";
231 export default { 230 export default {
232 - name: "index.vue", 231 + name: "LogisticsExitDetail",
233 components: { ProductDetailTable, ReceiptInfoTable }, 232 components: { ProductDetailTable, ReceiptInfoTable },
234 data() { 233 data() {
235 return { 234 return {
...@@ -290,8 +289,8 @@ export default { ...@@ -290,8 +289,8 @@ export default {
290 }; 289 };
291 }, 290 },
292 created() { 291 created() {
293 - if (this.$route.params.data) { 292 + if (this.$route.query.id) {
294 - this.id = this.$route.params.data.id; 293 + this.id = this.$route.query.id;
295 this.searchData(); 294 this.searchData();
296 } else { 295 } else {
297 this.back(); 296 this.back();
......
...@@ -290,7 +290,8 @@ export default { ...@@ -290,7 +290,8 @@ export default {
290 view(val) { 290 view(val) {
291 this.$router.push({ 291 this.$router.push({
292 name: "LogisticsExitDetail", 292 name: "LogisticsExitDetail",
293 - params: { data: val }, 293 + // params: { data: val },
294 + query: { id: val.id },
294 }); 295 });
295 }, 296 },
296 //查询 297 //查询
......
...@@ -91,7 +91,7 @@ import { getRoleList } from "@/api/system/user.js"; ...@@ -91,7 +91,7 @@ import { getRoleList } from "@/api/system/user.js";
91 import DialogVue from "./dialog.vue"; 91 import DialogVue from "./dialog.vue";
92 92
93 export default { 93 export default {
94 - name: "SupervisePlaceManage", 94 + name: "MenuList",
95 components: { 95 components: {
96 DialogVue, 96 DialogVue,
97 }, 97 },
......
...@@ -660,7 +660,7 @@ ...@@ -660,7 +660,7 @@
660 import { getCustomerDeclareDataId } from "@/api/pdd-info"; 660 import { getCustomerDeclareDataId } from "@/api/pdd-info";
661 import { getCustomerList, getPortList } from "@/api/declareData-api.js"; 661 import { getCustomerList, getPortList } from "@/api/declareData-api.js";
662 export default { 662 export default {
663 - name: "", 663 + name: "PddListDetail",
664 // components: { RowDataEditForm }, 664 // components: { RowDataEditForm },
665 data() { 665 data() {
666 var checkNegativeNum = (rule, value, callback) => { 666 var checkNegativeNum = (rule, value, callback) => {
...@@ -965,8 +965,8 @@ export default { ...@@ -965,8 +965,8 @@ export default {
965 }; 965 };
966 }, 966 },
967 created() { 967 created() {
968 - if (this.$route.params.data) { 968 + if (this.$route.query.id) {
969 - this.declareId = this.$route.params.data.id; 969 + this.declareId = this.$route.query.id;
970 this.queryDeclareData(this.declareId); 970 this.queryDeclareData(this.declareId);
971 this.queryCustomerList(); 971 this.queryCustomerList();
972 this.queryPortList(); 972 this.queryPortList();
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
162 <script> 162 <script>
163 import { getPddInfo, getResend } from "@/api/pdd-info"; 163 import { getPddInfo, getResend } from "@/api/pdd-info";
164 export default { 164 export default {
165 - name: "ArrivalList", 165 + name: "PddList",
166 components: {}, 166 components: {},
167 data() { 167 data() {
168 return { 168 return {
...@@ -268,7 +268,8 @@ export default { ...@@ -268,7 +268,8 @@ export default {
268 view(val) { 268 view(val) {
269 this.$router.push({ 269 this.$router.push({
270 name: "PddListDetail", 270 name: "PddListDetail",
271 - params: { data: val }, 271 + // params: { data: val },
272 + query: { id: val.id },
272 }); 273 });
273 }, 274 },
274 // 清空 275 // 清空
......
...@@ -138,7 +138,7 @@ import { getDictData } from "@/api/system/dict-api.js"; ...@@ -138,7 +138,7 @@ import { getDictData } from "@/api/system/dict-api.js";
138 138
139 import DialogVue from "./dialog.vue"; 139 import DialogVue from "./dialog.vue";
140 export default { 140 export default {
141 - name: "SupervisePlaceManage", 141 + name: "ReceiptManagement",
142 components: { 142 components: {
143 DialogVue, 143 DialogVue,
144 }, 144 },
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 <!-- 提运单号 --> 39 <!-- 提运单号 -->
40 <el-col :span="5"> 40 <el-col :span="5">
41 <Formitem label="提运单号" prop="billNo"> 41 <Formitem label="提运单号" prop="billNo">
42 - <el-input 42 + <!-- <el-input
43 type="text" 43 type="text"
44 class="inputShadow" 44 class="inputShadow"
45 id="inputInner--billNo" 45 id="inputInner--billNo"
...@@ -47,7 +47,12 @@ ...@@ -47,7 +47,12 @@
47 v-model="sreachFormData.billNo" 47 v-model="sreachFormData.billNo"
48 clearable 48 clearable
49 placeholder="" 49 placeholder=""
50 - ></el-input> 50 + ></el-input> -->
51 + <FormTextareaInput
52 + :formData="sreachFormData"
53 + dataKey="billNo"
54 + @formChange="formChange"
55 + />
51 </Formitem> 56 </Formitem>
52 </el-col> 57 </el-col>
53 <!-- 物流运单编号 --> 58 <!-- 物流运单编号 -->
...@@ -63,7 +68,7 @@ ...@@ -63,7 +68,7 @@
63 <!-- 订单编号 --> 68 <!-- 订单编号 -->
64 <el-col :span="5"> 69 <el-col :span="5">
65 <Formitem label="订单编号" prop="orderNo"> 70 <Formitem label="订单编号" prop="orderNo">
66 - <el-input 71 + <!-- <el-input
67 type="text" 72 type="text"
68 class="inputShadow" 73 class="inputShadow"
69 id="inputInner--orderNo" 74 id="inputInner--orderNo"
...@@ -71,7 +76,12 @@ ...@@ -71,7 +76,12 @@
71 v-model="sreachFormData.orderNo" 76 v-model="sreachFormData.orderNo"
72 clearable 77 clearable
73 placeholder="" 78 placeholder=""
74 - ></el-input> 79 + ></el-input> -->
80 + <FormTextareaInput
81 + :formData="sreachFormData"
82 + dataKey="orderNo"
83 + @formChange="formChange"
84 + />
75 </Formitem> 85 </Formitem>
76 </el-col> 86 </el-col>
77 87
...@@ -929,7 +939,7 @@ export default { ...@@ -929,7 +939,7 @@ export default {
929 console.log(error); 939 console.log(error);
930 } finally { 940 } finally {
931 this.search(0); 941 this.search(0);
932 - this.tableMaxheight = window.innerHeight - 335; 942 + this.tableMaxheight = window.innerHeight - 360;
933 } 943 }
934 }, 944 },
935 mounted() { 945 mounted() {
...@@ -1166,11 +1176,7 @@ export default { ...@@ -1166,11 +1176,7 @@ export default {
1166 1176
1167 datasDownload(dataSource) { 1177 datasDownload(dataSource) {
1168 let obj = { 1178 let obj = {
1169 - // billNo: this.sreachFormData.billNo,
1170 declareId: [], 1179 declareId: [],
1171 - // logisticsNo: this.sreachFormData.logisticsNo,
1172 - // orderNo: this.sreachFormData.orderNo,
1173 - // receiptStatus: this.sreachFormData.receiptStatus,
1174 dataSourceTemplate: dataSource, 1180 dataSourceTemplate: dataSource,
1175 ...this.sreachFormData, 1181 ...this.sreachFormData,
1176 }; 1182 };
...@@ -1513,7 +1519,8 @@ export default { ...@@ -1513,7 +1519,8 @@ export default {
1513 update(val) { 1519 update(val) {
1514 this.$router.push({ 1520 this.$router.push({
1515 name: "EditReportingData", 1521 name: "EditReportingData",
1516 - params: { data: val }, 1522 + // params: { data: val },
1523 + query: { declareId: val.declareId },
1517 }); 1524 });
1518 }, 1525 },
1519 //申报日志 1526 //申报日志
......
...@@ -8,26 +8,6 @@ ...@@ -8,26 +8,6 @@
8 size="small" 8 size="small"
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 - <!-- 提运单号 -->
12 - <!-- <el-col :span="5">-->
13 - <!-- <Formitem label="提运单号" prop="billNo">-->
14 - <!-- <el-input-->
15 - <!-- type="text"-->
16 - <!-- class="inputShadow"-->
17 - <!-- id="inputInner&#45;&#45;billNo"-->
18 - <!-- resize="none"-->
19 - <!-- v-model="sreachFormData.billNo"-->
20 - <!-- clearable-->
21 - <!-- placeholder=""-->
22 - <!-- ></el-input>-->
23 - <!--&lt;!&ndash; <FormTextareaInput&ndash;&gt;-->
24 - <!--&lt;!&ndash; :formData="sreachFormData"&ndash;&gt;-->
25 - <!--&lt;!&ndash; dataKey="billNo"&ndash;&gt;-->
26 - <!--&lt;!&ndash; @formChange="formChange"&ndash;&gt;-->
27 - <!--&lt;!&ndash; />&ndash;&gt;-->
28 - <!-- </Formitem>-->
29 - <!-- </el-col>-->
30 - <!-- 预录入编号 -->
31 <el-col :span="5"> 11 <el-col :span="5">
32 <Formitem label="预录入编号" prop="preNo"> 12 <Formitem label="预录入编号" prop="preNo">
33 <el-input 13 <el-input
...@@ -249,7 +229,7 @@ import { ...@@ -249,7 +229,7 @@ import {
249 getExportSummaryReceiptData, 229 getExportSummaryReceiptData,
250 } from "@/api/exportSummary-api"; 230 } from "@/api/exportSummary-api";
251 export default { 231 export default {
252 - name: "ExportBillQuery", 232 + name: "SummaryDataSearch",
253 data() { 233 data() {
254 return { 234 return {
255 sreachFormData: { 235 sreachFormData: {
...@@ -435,7 +415,8 @@ export default { ...@@ -435,7 +415,8 @@ export default {
435 view(val) { 415 view(val) {
436 this.$router.push({ 416 this.$router.push({
437 name: "SummaryDetail", 417 name: "SummaryDetail",
438 - params: { data: val }, 418 + // params: { data: val },
419 + query: { id: val.id },
439 }); 420 });
440 }, 421 },
441 popoverChange(val) { 422 popoverChange(val) {
......
...@@ -15,20 +15,6 @@ ...@@ -15,20 +15,6 @@
15 size="small" 15 size="small"
16 > 16 >
17 <el-row :gutter="5"> 17 <el-row :gutter="5">
18 - <!-- 提运单号 -->
19 - <!-- <el-col :span="3">-->
20 - <!-- <Formitem label="提运单号" prop="billNo">-->
21 - <!-- <el-input-->
22 - <!-- type="text"-->
23 - <!-- class="inputShadow"-->
24 - <!-- id="inputInner&#45;&#45;billNo"-->
25 - <!-- resize="none"-->
26 - <!-- v-model="formData.billNo"-->
27 - <!-- clearable-->
28 - <!-- placeholder=""-->
29 - <!-- ></el-input>-->
30 - <!-- </Formitem>-->
31 - <!-- </el-col>-->
32 <!-- 电子口岸编号 --> 18 <!-- 电子口岸编号 -->
33 <el-col :span="6"> 19 <el-col :span="6">
34 <Formitem label="电子口岸编号" prop="preNo"> 20 <Formitem label="电子口岸编号" prop="preNo">
...@@ -350,7 +336,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; ...@@ -350,7 +336,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
350 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 336 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
351 import { getExportSummaryDetail } from "@/api/exportSummary-api.js"; 337 import { getExportSummaryDetail } from "@/api/exportSummary-api.js";
352 export default { 338 export default {
353 - name: "", 339 + name: "SummaryDetail",
354 components: { ProductDetailTable, ReceiptInfoTable }, 340 components: { ProductDetailTable, ReceiptInfoTable },
355 data() { 341 data() {
356 return { 342 return {
...@@ -405,8 +391,8 @@ export default { ...@@ -405,8 +391,8 @@ export default {
405 }; 391 };
406 }, 392 },
407 created() { 393 created() {
408 - if (this.$route.params.data) { 394 + if (this.$route.query.id) {
409 - this.id = this.$route.params.data.id; 395 + this.id = this.$route.query.id;
410 this.searchData(); 396 this.searchData();
411 } else { 397 } else {
412 this.back(); 398 this.back();
......
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
174 components: { 174 components: {
175 DialogVue, 175 DialogVue,
176 }, 176 },
177 - name: "", 177 + name: "SummaryEdit",
178 data() { 178 data() {
179 return { 179 return {
180 formRules: { 180 formRules: {
......