diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 0f52e00e..84ce41c9 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -11,7 +11,7 @@ import { managerRouter } from './modules/manager' import personRouter from './modules/person' import basedataRouter from './modules/basedata' import billdataRouter from './modules/vwKBdata' -import businessdataRouter from './modules/businessdata' +//import businessdataRouter from './modules/businessdata' import vwFisDataRouter from './modules/vwFisData' import wheeldataRouter from './modules/wheeldata' import vwNoBarcodeRouter from './modules/vwKBNoBarcodedata' @@ -172,8 +172,9 @@ export const asyncRoutes = [ //newjitRouter,//FIS数据管理 vwFisDataRouter,//结算与开票数据导入 billdataRouter,//销售结算与开票报表 + //businessdataRouter, + wheeldataRouter,//大众看板和备件 pgfis,//派格fis - //wheeldataRouter,//二配 JobTimeDataRouter,//后台作业监控 // 404 page must be placed at the end !!! diff --git a/vue/src/router/modules/basedata.js b/vue/src/router/modules/basedata.js index 4d6d0346..7709d2af 100644 --- a/vue/src/router/modules/basedata.js +++ b/vue/src/router/modules/basedata.js @@ -2,7 +2,7 @@ import Layout from '@/layout' const basedataRouter = { - path: '/prebatch', + path: '/cpat/base', component: Layout, redirect: 'basedata', name: '基础数据维护', @@ -17,7 +17,7 @@ const basedataRouter = { }, children: [ { - path: '/centralizedControl', + path: 'date-control', component: () => import('@/views/ux/basedata/centralizedControl/index'), name: 'CentralizedControl',//命名路由 meta: { @@ -27,29 +27,19 @@ const basedataRouter = { } }, { - path: '/material', + path: 'material', component: () => import('@/views/ux/basedata/material/index'), name: 'material',//命名路由 meta: { title: '物料主数据', roles: ['SettleAccount.Materials'], icon: '物料' } }, { - path: '/codeSetting', + path: 'code-setting', component: () => import('@/views/ux/basedata/codeSetting/index'), name: 'codeSetting',//命名路由 meta: { title: '通用代码设置', roles: ['SettleAccount.CodeSettings'], icon: '通用' } }, - // { - // path: '/settlementParts', - // component: () => import('@/views/ux/basedata/settlementParts/index'), - // name: 'settlementParts',//命名路由 - // meta: { - // title: '结算件基本信息', - // roles: ['SettleAccount.SettlementParts'], - // icon: '零件' - // } - // }, { - path: '/partsSettlement', + path: 'part-settlement', component: () => import('@/views/ux/basedata/partsSettlement/index'), name: 'partsSettlement',//命名路由 meta: { @@ -69,37 +59,25 @@ const basedataRouter = { } }, { - path: 'invoiceBatch', - component: () => import('@/views/ux/basedata/Prebatch/index'), - name: 'Prebatch',//命名路由 + path: 'wms-kanban', + component: () => import('@/views/ux/vw/dataInput/wmsKanban'), + name: 'WMSVWKanBan', meta: { - title: '客户信息管理', - roles: ['SettleAccount.Prebatchs'], - icon: '批量' + title: '大众看板发货明细', + roles: ['SettleAccount.Reports'], + icon: '供货' } - }, - - // { - // path: 'bomdatabase', - // component: () => import('@/views/ux/basedata/bomdatabase/index'), - // name: 'Bomdatabase',//命名路由 - // meta: { - // title: 'BOM', - // roles: ['SettleAccount.Boms'], - // icon: '未结算' - // } - // }, - - // { - // path: '/settlementPakAndSparePartsRef', - // component: () => import('@/views/ux/basedata/settlementPakAndSparePartsRef/index'), - // name: 'settlementPakAndSparePartsRef',//命名路由 - // meta: { - // title: '结算包与散件对应关系', - // roles: ['SettleAccount.Boms'], - // icon: '零件' - // } - // }, + }, + { + path: 'wms-sparepart', + component: () => import('@/views/ux/vw/dataInput/wmsSparePart'), + name: 'WMSSparePart',//命名路由 + meta: { + title: '大众备件发货明细', + roles: ['SettleAccount.Reports'], + icon: '客户零件' + } + } ] } diff --git a/vue/src/router/modules/businessdata.js b/vue/src/router/modules/businessdata.js index b4b10c21..74bedc2a 100644 --- a/vue/src/router/modules/businessdata.js +++ b/vue/src/router/modules/businessdata.js @@ -3,55 +3,55 @@ import Layout from '@/layout' const businessdataRouter = { - path: '/vw-sparepart-js', + path: '/wms-js', component: Layout, - redirect: 'vw-sparepart-js', + redirect: 'wms-js', name: '大众备件结算', meta: { //requiresAuth: true, - title: '大众备件结算', + title: '大众看板备件发货', index: 0, type: 'crm', icon: '业务', keepAlive: false, }, children: [ + // { + // path: '/yu-fahuo-kb', + // component: () => import('@/views/ux/businessdata/deliverGoodsDrag'), + // name: 'jfcarkb',//命名路由 + // meta: { + // title: '结算与开票数据对比', + // roles: ['SettleAccount.Reports'], + // icon: '发货' + // } + // }, + // { + // path: '/jf-car-kb', + // component: () => import('@/views/ux/businessdata/deliverGoods'), + // name: 'jfcarkb',//命名路由 + // meta: { + // title: '备件发出未结算数据', + // roles: ['SettleAccount.Reports'], + // icon: '发货' + // } + // }, { - path: '/yu-fahuo-kb', - component: () => import('@/views/ux/businessdata/deliverGoodsDrag'), - name: 'jfcarkb',//命名路由 + path: '/wms-kanban', + component: () => import('@/views/ux/vw/dataInput/wmsKanban'), + name: 'WMSVWKanBan', meta: { - title: '结算与开票数据对比', - roles: ['SettleAccount.Reports'], - icon: '发货' - } - }, - { - path: '/jf-car-kb', - component: () => import('@/views/ux/businessdata/deliverGoods'), - name: 'jfcarkb',//命名路由 - meta: { - title: '备件发出未结算数据', - roles: ['SettleAccount.Reports'], - icon: '发货' - } - }, - { - path: '/jf-car-consign', - component: () => import('@/views/ux/businessdata/supplyGap'), - name: 'JFCarConsign', - meta: { - title: '定价与结算单价对比', + title: '大众看板发货明细', roles: ['SettleAccount.Reports'], icon: '供货' } }, { - path: '/settlement', - component: () => import('@/views/ux/billManage/FisUnSettledDiff'), - name: 'FisUnSettledDiff',//命名路由 + path: '/wms-sparepart', + component: () => import('@/views/ux/vw/dataInput/wmsSparePart'), + name: 'WMSSparePart',//命名路由 meta: { - title: '开票汇总数据', + title: '大众备件发货明细', roles: ['SettleAccount.Reports'], icon: '客户零件' } diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js index 36b90e97..b7e65281 100644 --- a/vue/src/router/modules/vwFisData.js +++ b/vue/src/router/modules/vwFisData.js @@ -9,7 +9,7 @@ const vwFisDataRouter = { //hidden: true, meta: { //requiresAuth: true, - title: '大众结算与开票数据导入', + title: '大众结算与开票导入', index: 0, type: 'crm', icon: '单据导入', diff --git a/vue/src/router/modules/vwKBdata.js b/vue/src/router/modules/vwKBdata.js index 4ca36bf7..53dfc510 100644 --- a/vue/src/router/modules/vwKBdata.js +++ b/vue/src/router/modules/vwKBdata.js @@ -9,7 +9,7 @@ const billdataRouter = { //hidden: true, meta: { //requiresAuth: true, - title: '大众销售结算与开票报表', + title: '大众结算与开票报表', index: 0, type: 'crm', icon: '销售', diff --git a/vue/src/router/modules/wheeldata.js b/vue/src/router/modules/wheeldata.js index 5e9ce17d..b6952155 100644 --- a/vue/src/router/modules/wheeldata.js +++ b/vue/src/router/modules/wheeldata.js @@ -1,15 +1,15 @@ -/** 车轮数据比对路由 */ +/**大众看板、备件数据比对路由 */ //import Layout from '@/layout/firstLayout' import Layout from '@/layout' const wheeldataRouter = { - path: '/wheeldata', + path: '/cpat/report', component: Layout, - redirect: 'wheeldata',//重定向 + redirect: 'cpat',//重定向 name: 'WheelData', meta: { // requiresAuth: true, - title: '二次配套比对', + title: '大众看板、备件报表', //index: 0, // type: 'crm', icon: '对比', @@ -18,22 +18,22 @@ const wheeldataRouter = { }, children: [ { - path: '/unSettleAccount', - component: () => import('@/views/ux/vw/dataInput/unSettleAccount'), - name: 'UnSettleAccount',//命名路由 + path: 'kbwithcode', + component: () => import('@/views/ux/billManage/kanBanWithCode'), + name: 'KanBanWithCode',//命名路由 meta: { - title: '二次配套比对报表', + title: '大众看板结算与交货核对', //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色(可以设置多个角色) icon: '对比' } }, { - path: '/twojs', - component: () => import('@/views/ux/billManage/FisUnSettledDiff'), - name: 'twojs',//命名路由 + path: 'vwsparepart', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 meta: { - title: '二次配套结算', + title: '大众备件结算核对', //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色(可以设置多个角色) icon: '二配' } diff --git a/vue/src/views/ux/basedata/material/index.vue b/vue/src/views/ux/basedata/material/index.vue index 506752a3..64755b00 100644 --- a/vue/src/views/ux/basedata/material/index.vue +++ b/vue/src/views/ux/basedata/material/index.vue @@ -9,7 +9,7 @@ icon="el-icon-plus" @click="handleCreate" >新增 - --> + 导入Excel - + --> 导出Excel @@ -462,6 +462,7 @@ export default { getList() { this.listLoading = true; this.listQuery.SkipCount = (this.page - 1) * 10; + this.listQuery.Filters = []; if (this.listQuery.Sorting === "") { this.listQuery.Sorting = "materialCode ascending"; } @@ -532,7 +533,7 @@ export default { /** 筛选操作 */ handleFilter() { this.page = 1; - this.getList(); + //this.getList(); this.listQuery.Filters = []; if (this.searchContent != "") { var column = "materialCode"; diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue new file mode 100644 index 00000000..6f7d3cd0 --- /dev/null +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -0,0 +1,837 @@ + + + + + + + diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue new file mode 100644 index 00000000..6ef5081a --- /dev/null +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -0,0 +1,835 @@ + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/SparePart/index.vue b/vue/src/views/ux/vw/dataInput/SparePart/index.vue index a94ed914..56a31ece 100644 --- a/vue/src/views/ux/vw/dataInput/SparePart/index.vue +++ b/vue/src/views/ux/vw/dataInput/SparePart/index.vue @@ -46,7 +46,7 @@ v-model="searchContent" clearable size="small" - placeholder="按照零件号搜索..." + placeholder="按照采购订单号搜索..." style="width: 200px" class="search-container" @keyup.enter.native="handleFilter" @@ -536,7 +536,7 @@ export default { this.getList(); this.listQuery.Filters = []; if (this.searchContent != "") { - var column = "materialCode"; + var column = "purchaseOrderNo"; let filter = { logic: 0, column: column, diff --git a/vue/src/views/ux/vw/dataInput/r3/index.vue b/vue/src/views/ux/vw/dataInput/r3/index.vue index 78a9af10..2cc26d79 100644 --- a/vue/src/views/ux/vw/dataInput/r3/index.vue +++ b/vue/src/views/ux/vw/dataInput/r3/index.vue @@ -420,7 +420,7 @@ export default { } else { this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000"; } - console.log("R3已结导出:" + JSON.stringify(this.listQuery.ParentId)); + console.log("R3已结导出:" + JSON.stringify(this.listQuery)); this.$axios .posts("/api/settleaccount/SettleAccount/Export", { parentId:this.listQuery.ParentId, diff --git a/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue b/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue index acfd7488..403682d0 100644 --- a/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue +++ b/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue @@ -41,7 +41,7 @@ v-model="searchContent" clearable size="small" - placeholder="按照零件号搜索..." + placeholder="按照看板条码号搜索..." style="width: 200px" class="search-container" @keyup.enter.native="handleFilter" @@ -505,7 +505,7 @@ export default { this.getList(); this.listQuery.Filters = []; if (this.searchContent != "") { - var column = "materialCode"; + var column = "kanban"; let filter = { logic: 0, column: column, diff --git a/vue/src/views/ux/vw/dataInput/wmsKanban/index.vue b/vue/src/views/ux/vw/dataInput/wmsKanban/index.vue new file mode 100644 index 00000000..bbebc908 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/wmsKanban/index.vue @@ -0,0 +1,611 @@ + + + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/wmsSparePart/index.vue b/vue/src/views/ux/vw/dataInput/wmsSparePart/index.vue new file mode 100644 index 00000000..20411337 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/wmsSparePart/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 9788367d..555b4a5d 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2508,6 +2508,82 @@ } ] }, + "WMSKanBan": { + "id": "36", + "data": [ + { + "fieldId": 1, + "formType": "text", + "name": "看板条码号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "kanban", + "setting": [] + }, + { + "fieldId": 2, + "formType": "text", + "name": "工厂", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factory", + "setting": [] + }, + { + "fieldId": 3, + "formType": "text", + "name": "零件号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 4, + "formType": "text", + "name": "零件类型", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "partType", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "供应商编码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "supplierCode", + "setting": [] + }, + { + "fieldId": 6, + "formType": "text", + "name": "入库结算标识", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "flag", + "setting": [] + }, + + { + "fieldId": 15, + "formType": "text", + "name": "结算状态", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "state", + "setting": [] + } + ] + }, "scrapClaims": { "id": "36", "data": [ @@ -2622,5 +2698,80 @@ "setting": [] } ] + }, + "wmsSparePart": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "采购类型", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "purchaseType", + "setting": [] + }, + { + "fieldId": 5, + "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": "deliveryOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "批次号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "batchNo", + "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": [] + } + ] } } \ No newline at end of file