diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index fb7631b0..f8468ed3 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -302,6 +302,7 @@ export default { scrapClaims: "CP7报废和索赔", sparePart: "大众备件结算明细", hqHPlatform: "红旗H平台导入", + hqMPlatform: "红旗M平台导入", bomdatabase: "产品结构BOM", prebatch: "预批量", secondaryPriceRatio: "二配结算价格比例", @@ -328,7 +329,7 @@ export default { scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入 sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入 hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //红旗H平台导入 - + hqMPlatform: "/api/settleaccount/HQMPlatform/ExcelImport", //红旗M平台导入 bomdatabase: "/api/settleaccount/bom/ExcelImport", prebatch: "/api/settleaccount/Prebatch/ExcelImport", secondaryPriceRatio: diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 4f0f543f..a1bc2d5a 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -16,6 +16,10 @@ import vwFisDataRouter from './modules/vwFisData' import wheeldataRouter from './modules/wheeldata' import vwNoBarcodeRouter from './modules/vwKBNoBarcodedata' import JobTimeDataRouter from './modules/jobtimedata' +import vwMenudataRouter from './modules/vw_menu' +import hqMenudataRouter from './modules/hq_menu' +import btcarDataRouter from './modules/bt_menu' +import vwOutOrderDataRouter from './modules/vw_out_order' //import newjitRouter from './modules/newjit-basedata' import pgfis from './modules/fis' import pgfisPrint from './modules/fisprint' @@ -86,8 +90,8 @@ export const constantRoutes = [ children: [ { path: 'dashboard', - component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis - //component: () => import('@/views/ux/backGroundWork'), + //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis + component: () => import('@/views/ux/backGroundWork'), name: 'Dashboard', meta: { title: '系统首页', @@ -170,14 +174,18 @@ export const asyncRoutes = [ /** when your routing map is too long, you can split it into small modules **/ managerRouter,//系统首页 personRouter,//系统管理 - //basedataRouter,//基础数据维护 + basedataRouter,//基础数据维护 + vwMenudataRouter,//大众 + hqMenudataRouter,//红旗 + vwOutOrderDataRouter, + //btcarDataRouter,//一汽轿车 //vwFisDataRouter,//结算与开票数据导入 //billdataRouter,//销售结算与开票报表 //businessdataRouter, //wheeldataRouter,//大众看板和备件 - pgfisPrint,//排序单打印 - pgfis,//派格fis - //JobTimeDataRouter,//后台作业监控 + // pgfisPrint,//排序单打印 + // pgfis,//派格fis + JobTimeDataRouter,//后台作业监控 // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/vue/src/router/modules/bt_menu.js b/vue/src/router/modules/bt_menu.js new file mode 100644 index 00000000..b20b3408 --- /dev/null +++ b/vue/src/router/modules/bt_menu.js @@ -0,0 +1,44 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const btcarDataRouter = { + path: '/cpat', + component: Layout, + redirect: 'pg', + name: 'btcar', + //hidden: true, + meta: { + //requiresAuth: true, + title: '一轿奔腾', + index: 0, + type: 'crm', + icon: '单据导入', + keepAlive: false, + }, + children: [ + { + path: 'hq-car-platform', + component: () => import('@/views/ux/vw/dataInput/hq_bt'), + name: 'ERPEI',//命名路由 + meta: { + title: '一轿奔腾导入', + roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + { + path: 'hq-car-platform-export', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'ERPEI',//命名路由 + meta: { + title: '一轿奔腾结算核对输出', + //roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + + ] +} + +export default btcarDataRouter + diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js new file mode 100644 index 00000000..be030aad --- /dev/null +++ b/vue/src/router/modules/hq_menu.js @@ -0,0 +1,125 @@ + +import Layout from '@/layout' + +const hqMenudataRouter = { + path: '/capt-hq', + component: Layout, + redirect: 'ux/vw/dataInput/hq_h', + name: 'HQData', + meta: { + title: '红旗工厂', + icon: '红旗', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + keepAlive: false, + }, + children: [ + { + path: '/import-h-data', + name: 'import-h-data',//命名路由-二级 + component: () => import('@/views/ux/vw/dataInput/hq_h'), + redirect: 'ux/vw/dataInput/hq_h', + meta: { + title: 'H平台', + // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + icon: '看板' + }, + children: [ + { + path: 'hq-H-platform', + component: () => import('@/views/ux/vw/dataInput/hq_h'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗H平台导入', + roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + { + path: 'hq-H-platform-export', + component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), + name: 'ScrapClaims', + meta: { + title: 'H平台结算差异输出', + roles: ['SettleAccount.FISs'], + icon: '文件' + } + } + ] + }, + { + path: '/export-m-data', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'export-m-data',//命名路由 + redirect: '/ux/vw/dataInput/hq_m', + meta: { + title: 'M平台', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], + icon: '结算' + }, + children: [ + { + path: 'hq-M-platform', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗M平台导入', + //roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + + { + path: 'hq-M-platform-export', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 + meta: { + title: 'H平台结算差异输出', + //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色(可以设置多个角色) + icon: '二配' + } + } + ] + }, + { + path: '/export-f-data', + component: () => import('@/views/ux/vw/dataInput/hq_f'), + name: 'export-f-data',//命名路由 + redirect: '/ux/vw/dataInput/hq_f', + meta: { + title: 'F平台', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], + icon: '结算' + }, + children: [ + { + path: 'hq-F-platform', + component: () => import('@/views/ux/vw/dataInput/hq_f'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗F平台导入', + //roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + + { + path: 'hq-F-platform-export', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 + meta: { + title: 'F平台结算差异输出', + //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色(可以设置多个角色) + icon: '二配' + } + } + ] + } + ] +} + +export default hqMenudataRouter + + + + + diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js index 6b4da0d5..e52fc1d1 100644 --- a/vue/src/router/modules/vwFisData.js +++ b/vue/src/router/modules/vwFisData.js @@ -88,6 +88,16 @@ const vwFisDataRouter = { icon: '结算' } }, + { + path: 'hq-M-platform', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗M平台导入', + //roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, ] } diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js new file mode 100644 index 00000000..2ec6da00 --- /dev/null +++ b/vue/src/router/modules/vw_menu.js @@ -0,0 +1,171 @@ + +import Layout from '@/layout' + +const vwMenudataRouter = { + path: '/capt-vw', + component: Layout, + redirect: 'ux/basedata/Invoice/index', + name: 'HQData', + meta: { + title: '大众工厂', + icon: 'vw', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + keepAlive: false, + }, + children: [ + { + path: '/import-data', + name: 'import-data',//命名路由-二级 + component: () => import('@/views/ux/billManage/index'), + redirect: 'ux/basedata/Invoice/index', + meta: { + title: '数据导入', + // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + icon: '看板' + }, + children: [ + { + path: 'invoice', + component: () => import('@/views/ux/basedata/Invoice/index'), + name: 'Invoices', + meta: { + title: '发票汇总', + roles: ['SettleAccount.Invoices'], + icon: '对比' + } + }, + { + path: 'settle-account-finish', + component: () => import('@/views/ux/vw/dataInput/r3'), + name: 'SettleAccount', + meta: { + title: 'FIS结算明细', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + { + path: 'unsettle-account', + component: () => import('@/views/ux/vw/dataInput/r3'), + name: 'SettleAccount', + meta: { + title: 'FIS未结明细', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + { + path: 'kan-ban', + component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'), + name: 'VWKanBan',//命名路由 + meta: { + title: '大众看板结算明细', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '发运' + } + }, + { + path: 'spare-part', + component: () => import('@/views/ux/vw/dataInput/SparePart'), + name: 'SparePart',//命名路由 + meta: { + title: '大众备件结算明细导入', + roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + { + path: 'scrap-claims', + component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), + name: 'ScrapClaims', + meta: { + title: 'CP7报废和索赔导入', + roles: ['SettleAccount.FISs'], + icon: '文件' + } + }, + ] + }, + { + path: '/export-data', + component: () => import('@/views/ux/billManage/index'), + name: 'export-data',//命名路由 + redirect: 'export-data', + meta: { + title: '数据输出', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], + icon: '结算' + }, + children: [ + { + path: '/invoice-settled/diff', + component: () => import('@/views/ux/billManage/InvoiceSettledDiff'), + name: 'InvoiceSettledDiff',//命名路由 + meta: { + title: '发票与结算核对汇总', + roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) + icon: '结算对比' + } + }, + { + path: '/invoice-settled/detaildiff', + component: () => import('@/views/ux/billManage/InvoiceSettledDetailDiff'), + name: 'InvoiceSettledDetailDiff',//命名路由 + meta: { + title: '准时化结算核对明细', + roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) + icon: '结算对比' + } + }, + { + path: '/unInvoice-settled/detailDiff', + component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'), + name: 'UnInvoiceSettledDetailDiff',//命名路由 + meta: { + title: '准时化量差输出', + roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) + icon: '售后' + } + }, + { + path: '/unsettle-diff/export', + component: () => import('@/views/ux/billManage/UnSettleDiffExport'), + name: 'UnSettleDiffExport',//命名路由 + meta: { + title: '准时化未结差异比对输出', + roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色) + icon: '售后' + } + }, + { + path: '/kbwithcode', + component: () => import('@/views/ux/billManage/kanBanWithCode'), + name: 'KanBanWithCode',//命名路由 + meta: { + title: '看板结算数量差异输出', + //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色(可以设置多个角色) + icon: '对比' + } + }, + + { + path: '/vwsparepart', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 + meta: { + title: '备件结算数量差异输出', + //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色(可以设置多个角色) + icon: '二配' + } + } + ] + } + ] +} + +export default vwMenudataRouter + + + + + diff --git a/vue/src/router/modules/vw_out_order.js b/vue/src/router/modules/vw_out_order.js new file mode 100644 index 00000000..cba355fb --- /dev/null +++ b/vue/src/router/modules/vw_out_order.js @@ -0,0 +1,54 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const vwOutOrderDataRouter = { + path: '/cpat-order', + component: Layout, + redirect: 'pg', + name: '业务数据', + //hidden: true, + meta: { + //requiresAuth: true, + title: '大众出库单管理', + index: 0, + type: 'crm', + icon: '单据导入', + keepAlive: false, + }, + children: [ + { + path: 'vw-out-order', + component: () => import('@/views/ux/billManage/vwOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众准时化出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + { + path: 'kanban-out-order', + component: () => import('@/views/ux/billManage/kanbanOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众看板出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色) + icon: '结算' + } + }, + // { + // path: 'invoice', + // component: () => import('@/views/ux/basedata/Invoice/index'), + // name: 'Invoices',//命名路由 + // meta: { + // title: '大众发票汇总导入', + // roles: ['SettleAccount.Invoices'], + // icon: '对比' + // } + // }, + + ] +} + +export default vwOutOrderDataRouter + diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue index 41361ed5..4bc19bd0 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/index.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue @@ -857,7 +857,7 @@ export default { }, getList(data) { this.listLoading = true; - if (data != undefined) {alert() + if (data != undefined) { this.listQuery.SkipCount = (this.page - 1) * data.limit; } else { this.listQuery.SkipCount = (this.page - 1) * 15; diff --git a/vue/src/views/ux/basedata/index.vue b/vue/src/views/ux/basedata/index.vue new file mode 100644 index 00000000..509198d1 --- /dev/null +++ b/vue/src/views/ux/basedata/index.vue @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 93de70ed..7a5ed184 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -17,7 +17,7 @@ type="primary" icon="el-icon-plus" @click="handleCreate" - >统计 + >统计明细 + \ No newline at end of file diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue new file mode 100644 index 00000000..c7fdcb9a --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue @@ -0,0 +1,541 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/index.vue b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue new file mode 100644 index 00000000..cd7f23ba --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue @@ -0,0 +1,317 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue new file mode 100644 index 00000000..41322532 --- /dev/null +++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue @@ -0,0 +1,540 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/vwOutOrder/index.vue b/vue/src/views/ux/billManage/vwOutOrder/index.vue new file mode 100644 index 00000000..cd7f23ba --- /dev/null +++ b/vue/src/views/ux/billManage/vwOutOrder/index.vue @@ -0,0 +1,317 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_bt/index.vue b/vue/src/views/ux/vw/dataInput/hq_bt/index.vue new file mode 100644 index 00000000..e5d35866 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_bt/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_f/index.vue b/vue/src/views/ux/vw/dataInput/hq_f/index.vue new file mode 100644 index 00000000..e5d35866 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_f/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_h/index.vue b/vue/src/views/ux/vw/dataInput/hq_h/index.vue index b14ebcbe..e5d35866 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h/index.vue @@ -243,7 +243,7 @@ export default { formTitle: "", drawer: false, showExcelImport: false, - tableHeight: document.documentElement.clientHeight - 260, + tableHeight: document.documentElement.clientHeight - 220, isEdit: false, }; }, @@ -251,7 +251,7 @@ export default { var self = this; window.onresize = function () { var offsetHei = document.documentElement.clientHeight; - self.tableHeight = offsetHei - 260; + self.tableHeight = offsetHei - 220; }; }, created() { diff --git a/vue/src/views/ux/vw/dataInput/hq_m/index.vue b/vue/src/views/ux/vw/dataInput/hq_m/index.vue new file mode 100644 index 00000000..f4c47c4e --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_m/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 555b4a5d..f86d9b2e 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2773,5 +2773,160 @@ "setting": [] } ] + }, + "hqHPlatform": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "采购订单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "purchaseOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料代码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "科目号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "accountNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "deliveryOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factory", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂名称", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factoryName", + "setting": [] + } + ] + }, + "hqMPlatform": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "采购订单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "purchaseOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料代码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "科目号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "accountNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "deliveryOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factory", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂名称", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factoryName", + "setting": [] + } + ] + }, + "vwOutOrder": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "单据号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "wmsBillNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料组", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialGroup", + "setting": [] + } + ] } } \ No newline at end of file