Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
511f6d80 1 parent 6131799d

英文品名黑名单联调

Inline Side-by-side
Showing 5 changed files with 40 additions and 51 deletions
1 import request from "@/utils/request"; 1 import request from "@/utils/request";
2 2
3 +// HScode英文品名黑名单查询
4 +export function findShipmentDescList(data) {
5 + return request({
6 + url: "/etes/findShipmentDescList",
7 + method: "post",
8 + data: data,
9 + });
10 +}
11 +
12 +// HScode英文品名黑名单导入
13 +export function uploadShipmentDesc(data) {
14 + return request({
15 + url: "/etes/uploadShipmentDesc",
16 + method: "post",
17 + data: data,
18 + });
19 +}
20 +
3 // HScode黑名单/英文品名删除 21 // HScode黑名单/英文品名删除
4 export function delBlackList(data) { 22 export function delBlackList(data) {
5 return request({ 23 return request({
6 - url: "/etes/delBlackList", 24 + url: "/etes/delBlackList ",
7 method: "post", 25 method: "post",
8 data: data, 26 data: data,
9 }); 27 });
10 } 28 }
29 +
30 +
......
...@@ -191,9 +191,9 @@ export default { ...@@ -191,9 +191,9 @@ export default {
191 const { code, data, msg } = res; 191 const { code, data, msg } = res;
192 if (code == 200) { 192 if (code == 200) {
193 this.searchBtn(); 193 this.searchBtn();
194 - this.msgSuccess(msg || "增加成功!"); 194 + this.msgSuccess(msg || "导入成功!");
195 } else { 195 } else {
196 - this.$message.error(msg || "增加失败"); 196 + this.$message.error(msg || "导入失败");
197 this.$router.push({ 197 this.$router.push({
198 path: "/errorInfo", 198 path: "/errorInfo",
199 query: { 199 query: {
......
...@@ -2,8 +2,8 @@ export const formConfig = [ ...@@ -2,8 +2,8 @@ export const formConfig = [
2 { 2 {
3 label: "ShipmentDesc", 3 label: "ShipmentDesc",
4 type: "Input", 4 type: "Input",
5 - name: "ShipmentDesc", 5 + name: "searchValue",
6 - prop: "ShipmentDesc", 6 + prop: "searchValue",
7 placeholder: "根据ShipmentDesc查询", 7 placeholder: "根据ShipmentDesc查询",
8 span: 7, 8 span: 7,
9 trigger: "blur", // 事件名 9 trigger: "blur", // 事件名
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
20 :tableData="tableData" 20 :tableData="tableData"
21 :pageConfig="pageConfig" 21 :pageConfig="pageConfig"
22 @search="searchBtn" 22 @search="searchBtn"
23 - @download="downloadTemplate"
24 @upload="toUpload" 23 @upload="toUpload"
25 @rmfile="onRemoveUpload" 24 @rmfile="onRemoveUpload"
26 @export="exportTemplate" 25 @export="exportTemplate"
...@@ -90,14 +89,13 @@ import { formConfig } from "./formConfig"; ...@@ -90,14 +89,13 @@ import { formConfig } from "./formConfig";
90 import { tableAttr, columnHeader } from "./tableConfig"; 89 import { tableAttr, columnHeader } from "./tableConfig";
91 import { restTableHeight } from "@/utils"; 90 import { restTableHeight } from "@/utils";
92 import { 91 import {
93 - findHsCodeList, // HScode黑名单查询 92 + findShipmentDescList, // HScode英文品名黑名单查询
94 - delBlackList, // HScode黑名单删除 93 + uploadShipmentDesc, // HScode英文品名黑名单导入
95 - downLoadTemplate, // HScode黑名单下载模板 94 + delBlackList, // HScode黑名单/英文品名删除
96 - uploadHsCode, // HScode黑名单导入 95 +} from "@/api/et86ShipmentDesc";
97 -} from "@/api/et86HsCodeBlack";
98 import { downLoadXlsx } from "@/utils/zipdownload"; 96 import { downLoadXlsx } from "@/utils/zipdownload";
99 export default { 97 export default {
100 - name: "Et86HsCodeBlack", 98 + name: "et86ShipmentDesc",
101 components: { 99 components: {
102 YlForm, 100 YlForm,
103 YlTable, 101 YlTable,
...@@ -147,7 +145,7 @@ export default { ...@@ -147,7 +145,7 @@ export default {
147 }, 145 },
148 methods: { 146 methods: {
149 // HScode黑名单查询 147 // HScode黑名单查询
150 - queryFindHsCodeList() { 148 + queryFindShipmentDescList() {
151 const { page, size } = this.pageConfig.pageData; 149 const { page, size } = this.pageConfig.pageData;
152 let params = { 150 let params = {
153 limitStart: (page - 1) * size, 151 limitStart: (page - 1) * size,
...@@ -155,7 +153,7 @@ export default { ...@@ -155,7 +153,7 @@ export default {
155 ...this.queryForm, 153 ...this.queryForm,
156 }; 154 };
157 this.tableAttr.loadingTable = true; 155 this.tableAttr.loadingTable = true;
158 - findHsCodeList(params) 156 + findShipmentDescList(params)
159 .then((res) => { 157 .then((res) => {
160 this.tableAttr.loadingTable = false; 158 this.tableAttr.loadingTable = false;
161 const { code, data } = res; 159 const { code, data } = res;
...@@ -186,14 +184,14 @@ export default { ...@@ -186,14 +184,14 @@ export default {
186 toUpload({ file }) { 184 toUpload({ file }) {
187 const formData = new FormData(); 185 const formData = new FormData();
188 formData.append("file", file); 186 formData.append("file", file);
189 - uploadHsCode(formData) 187 + uploadShipmentDesc(formData)
190 .then((res) => { 188 .then((res) => {
191 const { code, data, msg } = res; 189 const { code, data, msg } = res;
192 if (code == 200) { 190 if (code == 200) {
193 this.searchBtn(); 191 this.searchBtn();
194 - this.msgSuccess(msg || "增加成功!"); 192 + this.msgSuccess(msg || "导入成功!");
195 } else { 193 } else {
196 - this.$message.error(msg || "增加失败"); 194 + this.$message.error(msg || "导入失败");
197 this.$router.push({ 195 this.$router.push({
198 path: "/errorInfo", 196 path: "/errorInfo",
199 query: { 197 query: {
...@@ -215,31 +213,11 @@ export default { ...@@ -215,31 +213,11 @@ export default {
215 this.pageConfig.pageData.page = 1; 213 this.pageConfig.pageData.page = 1;
216 this.pageConfig.pageData.size = 10; 214 this.pageConfig.pageData.size = 10;
217 this.$refs.ruleForm.handleSearch("ruleForm", (val) => { 215 this.$refs.ruleForm.handleSearch("ruleForm", (val) => {
218 - this.queryFindHsCodeList(); 216 + this.queryFindShipmentDescList();
219 }); 217 });
220 }, 218 },
221 // 确认对话框 219 // 确认对话框
222 dialogConfirm() {}, 220 dialogConfirm() {},
223 - // 下载【HScode黑名单下载模板】
224 - downloadTemplate() {
225 - downLoadTemplate("hsCode")
226 - .then((res) => {
227 - if (res) {
228 - const blob = new Blob([res]);
229 - const link = document.createElement("a"); //创建a标签
230 - link.download = "HSCODE黑名单表.xlsx"; //a标签添加属性
231 - link.style.display = "none";
232 - link.href = URL.createObjectURL(blob);
233 - document.body.appendChild(link);
234 - link.click(); //执行下载
235 - URL.revokeObjectURL(link.href); //释放url
236 - document.body.removeChild(link); //释放标签
237 - } else {
238 - this.$message.error("下载失败");
239 - }
240 - })
241 - .catch(() => {});
242 - },
243 // 上传 221 // 上传
244 upLoadTemplate() { 222 upLoadTemplate() {
245 // console.log(this.$refs.modleViewRef); 223 // console.log(this.$refs.modleViewRef);
...@@ -247,7 +225,7 @@ export default { ...@@ -247,7 +225,7 @@ export default {
247 // 导出 225 // 导出
248 exportTemplate(row, i) { 226 exportTemplate(row, i) {
249 this.tableAttr.btnCofig.btnGroup[i].loading = true; 227 this.tableAttr.btnCofig.btnGroup[i].loading = true;
250 - downLoadXlsx("/etes/exportHsCodeList", this.queryForm, "HSCODE黑名单表") 228 + downLoadXlsx("/etes/exportShipmentDescList", this.queryForm, "HSCODE英文品名黑名单表")
251 .then(() => { 229 .then(() => {
252 this.tableAttr.btnCofig.btnGroup[i].loading = false; 230 this.tableAttr.btnCofig.btnGroup[i].loading = false;
253 }) 231 })
...@@ -280,12 +258,12 @@ export default { ...@@ -280,12 +258,12 @@ export default {
280 handleSizeChange(e) { 258 handleSizeChange(e) {
281 this.pageConfig.pageData.size = e; 259 this.pageConfig.pageData.size = e;
282 this.pageConfig.pageData.page = 1; 260 this.pageConfig.pageData.page = 1;
283 - this.queryFindHsCodeList(); 261 + this.queryFindShipmentDescList();
284 }, 262 },
285 //页码变化 263 //页码变化
286 handleCurrentChange(e) { 264 handleCurrentChange(e) {
287 this.pageConfig.pageData.page = e; 265 this.pageConfig.pageData.page = e;
288 - this.queryFindHsCodeList(); 266 + this.queryFindShipmentDescList();
289 }, 267 },
290 // table勾选 268 // table勾选
291 tableSelectionChange(val) { 269 tableSelectionChange(val) {
......
...@@ -17,15 +17,6 @@ export const tableAttr = { ...@@ -17,15 +17,6 @@ export const tableAttr = {
17 }, 17 },
18 { 18 {
19 type: "primary", 19 type: "primary",
20 - icon: "el-icon-download",
21 - btnName: "下载模板",
22 - size: "mini",
23 - round: false,
24 - loading: false,
25 - event: "download",
26 - },
27 - {
28 - type: "primary",
29 icon: "el-icon-upload", 20 icon: "el-icon-upload",
30 btnName: "导入", 21 btnName: "导入",
31 size: "mini", 22 size: "mini",
...@@ -74,7 +65,7 @@ export const columnHeader = (deleteRow) => [ ...@@ -74,7 +65,7 @@ export const columnHeader = (deleteRow) => [
74 }, 65 },
75 { 66 {
76 label: "ShipmentDesc", 67 label: "ShipmentDesc",
77 - prop: "ShipmentDesc", 68 + prop: "blackValue",
78 align: "center", 69 align: "center",
79 minWidth: 100, 70 minWidth: 100,
80 }, 71 },
......