From 43ed84f95669dbff13df5dbe47c716b2c3c0a627 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Wed, 17 Nov 2021 16:30:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/components/ImportExcel-base/index.vue | 16 +- vue/src/components/ImportExcel-vw/index.vue | 19 - vue/src/router/modules/vwFisData.js | 28 +- vue/src/views/login/index.vue | 8 +- vue/src/views/ux/basedata/Invoice/index.vue | 213 +++--- .../ux/vw/dataInput/ScrapClaims/index.vue | 591 ++++++++++++++++ .../views/ux/vw/dataInput/SparePart/index.vue | 641 ++++++++++++++++++ .../views/ux/vw/dataInput/r3-open/index.vue | 2 +- .../views/ux/vw/dataInput/vwKanBan/index.vue | 610 +++++++++++++++++ vue/static/tableFieldForSearch.json | 191 ++++++ 10 files changed, 2200 insertions(+), 119 deletions(-) create mode 100644 vue/src/views/ux/vw/dataInput/ScrapClaims/index.vue create mode 100644 vue/src/views/ux/vw/dataInput/SparePart/index.vue create mode 100644 vue/src/views/ux/vw/dataInput/vwKanBan/index.vue diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index 5c7abefc..1f30a212 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -53,7 +53,6 @@ :value="item.value" > -
@@ -290,7 +289,7 @@ export default { this.isEditYearMont = true; this.isEditFactory = true; this.isState = false; - } else { + } else { this.isEditYearMont = false; this.isEditFactory = false; } @@ -298,11 +297,16 @@ export default { crmTypeName() { return ( { + invoice: "大众发票汇总", + vWKanBan: "大众看板结算明细", + scrapClaims: "CP7报废和索赔", + sparePart: "大众备件结算明细", + bomdatabase: "产品结构BOM", prebatch: "预批量", secondaryPriceRatio: "二配结算价格比例", factory: "工厂设置", - // materialRelation: "零件匹配关系", + // materialRelation: "零件匹配关系", carMaterialConfig: "车型代码与零件匹配", materialRelationSupplier: "供应商零件设置表", material: "物料主数据", @@ -319,6 +323,11 @@ export default { getWebApi() { return ( { + invoice: "/api/settleaccount/Invoices/ExcelImport", //大众发票导入 + vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //大众看板结算明细导入 + scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入 + sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入 + bomdatabase: "/api/settleaccount/bom/ExcelImport", prebatch: "/api/settleaccount/Prebatch/ExcelImport", secondaryPriceRatio: @@ -347,6 +356,7 @@ export default { //模板名称 return ( { + invoice: "大众发票汇总导入.xlsx", bomdatabase: "产品结构Bom导入模板.xlsx", secondaryPriceRatio: "二配价格比例导入模板.xlsx", factory: "工厂设置模板.xlsx", diff --git a/vue/src/components/ImportExcel-vw/index.vue b/vue/src/components/ImportExcel-vw/index.vue index 1947ba66..d1e8b5a6 100644 --- a/vue/src/components/ImportExcel-vw/index.vue +++ b/vue/src/components/ImportExcel-vw/index.vue @@ -545,25 +545,6 @@ export default { ",请在后台作业监控界面中查看进度!"; this.stepsActive = 4; } - // if (res === "Success") { - // if (this.isLt2M === "1" && this.isFileType === "1") { - // this.$notify({ - // title: "成功", - // message: "数据导入成功!", - // type: "success", - // duration: 2000, - // }); - // this.stepList[1].status = "finish"; - // this.resultData.successMessage = "数据导入成功!"; - // this.stepsActive = 4; - // } - // } else { - // this.stepList[0].status = "wait"; - // this.resultData.errTemplate = res; //指定错误模板名称,作为参数,用于错误模板下载 - // this.resultData.errSize = 1; //保持大于0,用于控制错误数据下载按钮的可不可见 - // this.resultData.successMessage = "数据导入失败!"; - // this.stepsActive = 3; - // } console.log(this.stepsActive); this.$emit("status", "finish"); // this.$nextTick(() => { diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js index f7b2dd1f..213c3609 100644 --- a/vue/src/router/modules/vwFisData.js +++ b/vue/src/router/modules/vwFisData.js @@ -2,9 +2,9 @@ import Layout from '@/layout' const vwFisDataRouter = { - path: '/jskp', + path: '/pg', component: Layout, - redirect: 'jskp', + redirect: 'pg', name: '业务数据', //hidden: true, meta: { @@ -18,7 +18,7 @@ const vwFisDataRouter = { children: [ { path: '/settleAccount', - component: () => import('@/views/ux/vw/dataInput/r3'), + component: () => import('@/views/ux/vw/dataInput/r3-open'), name: 'SettleAccount',//命名路由 meta: { title: 'FIS未结算数据导入', @@ -28,7 +28,7 @@ const vwFisDataRouter = { }, { path: '/settleAccount-finish', - component: () => import('@/views/ux/vw/dataInput/r3-open'), + component: () => import('@/views/ux/vw/dataInput/r3'), name: 'SettleAccount',//命名路由 meta: { title: 'FIS已结算数据导入', @@ -47,19 +47,19 @@ const vwFisDataRouter = { } }, { - path: 'itemInvoicePrice', - component: () => import('@/views/ux/vw/dataInput/itemInvoicePrice/index'), - name: 'ItemInvoicePrice',//命名路由 + path: 'kanBan', + component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'), + name: 'VWKanBan',//命名路由 meta: { title: '看板结算明细导入', - roles: ['SettleAccount.ItemInvoicePrices'], + //roles: ['SettleAccount.ItemInvoicePrices'], icon: '发运' } }, { - path: '/fis', - component: () => import('@/views/ux/vw/dataInput/fis'), - name: 'FIS', + path: '/scrapClaims', + component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), + name: 'ScrapClaims', meta: { title: 'CP7报废和索赔导入', roles: ['SettleAccount.FISs'], @@ -68,9 +68,9 @@ const vwFisDataRouter = { }, { - path: '/SettlementCrossReference', - component: () => import('@/views/ux/vw/dataInput/SettlementCrossReference'), - name: 'SettlementCrossReference',//命名路由 + path: '/SparePart', + component: () => import('@/views/ux/vw/dataInput/SparePart'), + name: 'SparePart',//命名路由 meta: { title: '大众备件结算明细导入', roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色) diff --git a/vue/src/views/login/index.vue b/vue/src/views/login/index.vue index 5a82dc2c..bcf29743 100644 --- a/vue/src/views/login/index.vue +++ b/vue/src/views/login/index.vue @@ -1,11 +1,11 @@