From 25249c2e842d8565be67fe996d307dc1a22a7d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 28 Feb 2025 17:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AF-=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E3=80=91=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/UI.DY.AgGridReport/package-lock.json | 14 ++-- fe/UI.DY.AgGridReport/package.json | 2 +- fe/UI.DY.AgGridReport/public/config.js | 4 +- fe/UI.DY.AgGridReport/src/api/businessApi.js | 8 +- fe/UI.DY.AgGridReport/src/router/index.js | 64 +++++++++++++++ .../src/views/report/InventoryBalance.vue | 54 +++++++++++++ .../src/views/report/dailyReconciliation.vue | 44 +++++++++++ .../src/views/report/inspection.vue | 78 ++++++++++++++++--- .../src/views/report/interfaceError.vue | 10 ++- .../src/views/report/putInDetails.vue | 49 ++++++++++++ .../src/views/report/putOutDetails.vue | 48 ++++++++++++ .../src/views/report/putaway.vue | 52 +++++++++++++ .../src/views/report/returnAfterListing.vue | 53 +++++++++++++ .../src/views/report/returnBeforeListing.vue | 53 +++++++++++++ 14 files changed, 506 insertions(+), 27 deletions(-) create mode 100644 fe/UI.DY.AgGridReport/src/views/report/InventoryBalance.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/dailyReconciliation.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/putInDetails.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/putOutDetails.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/putaway.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/returnAfterListing.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/returnBeforeListing.vue diff --git a/fe/UI.DY.AgGridReport/package-lock.json b/fe/UI.DY.AgGridReport/package-lock.json index 68c4eb17a..f3ebe4a7a 100644 --- a/fe/UI.DY.AgGridReport/package-lock.json +++ b/fe/UI.DY.AgGridReport/package-lock.json @@ -14,7 +14,7 @@ "axios": "^0.21.1", "core-js": "^3.6.5", "echarts": "^5.4.0", - "element-ui": "2.15.13", + "element-ui": "^2.15.14", "file-saver": "^2.0.2", "js-cookie": "^3.0.1", "postcss-px-to-viewport": "^1.1.1", @@ -5987,9 +5987,9 @@ "dev": true }, "node_modules/element-ui": { - "version": "2.15.13", - "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.13.tgz", - "integrity": "sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg==", + "version": "2.15.14", + "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz", + "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==", "dependencies": { "async-validator": "~1.8.1", "babel-helper-vue-jsx-merge-props": "^2.0.0", @@ -21106,9 +21106,9 @@ "dev": true }, "element-ui": { - "version": "2.15.13", - "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.13.tgz", - "integrity": "sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg==", + "version": "2.15.14", + "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz", + "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==", "requires": { "async-validator": "~1.8.1", "babel-helper-vue-jsx-merge-props": "^2.0.0", diff --git a/fe/UI.DY.AgGridReport/package.json b/fe/UI.DY.AgGridReport/package.json index fcc776987..57f3e6c24 100644 --- a/fe/UI.DY.AgGridReport/package.json +++ b/fe/UI.DY.AgGridReport/package.json @@ -15,7 +15,7 @@ "axios": "^0.21.1", "core-js": "^3.6.5", "echarts": "^5.4.0", - "element-ui": "2.15.13", + "element-ui": "^2.15.14", "file-saver": "^2.0.2", "js-cookie": "^3.0.1", "postcss-px-to-viewport": "^1.1.1", diff --git a/fe/UI.DY.AgGridReport/public/config.js b/fe/UI.DY.AgGridReport/public/config.js index 98a5fcb7d..32b042144 100644 --- a/fe/UI.DY.AgGridReport/public/config.js +++ b/fe/UI.DY.AgGridReport/public/config.js @@ -1 +1,3 @@ -window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60078' \ No newline at end of file +window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60078' +//质检报告 +window.SITE_CONFIG['inspectionURL'] = 'http://dev.ccwin-in.com:60099' diff --git a/fe/UI.DY.AgGridReport/src/api/businessApi.js b/fe/UI.DY.AgGridReport/src/api/businessApi.js index eeac2756c..253e8e1e8 100644 --- a/fe/UI.DY.AgGridReport/src/api/businessApi.js +++ b/fe/UI.DY.AgGridReport/src/api/businessApi.js @@ -1,7 +1,7 @@ import axiosUtil from '@/utils/request' -let businessURL = window.SITE_CONFIG['businessURL'] +let inspectionURL = window.SITE_CONFIG['inspectionURL'] -// 备料看板 -export function getstockPreparationList() { - return axiosUtil.ajax_post(businessURL+'/api/wms/store/board/preparation-board-export') +// 质检报表-获取报告 +export function getInspectionImg(name) { + return axiosUtil.ajax_get(inspectionURL+'/api/filestore/file?blobName='+name) } \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/router/index.js b/fe/UI.DY.AgGridReport/src/router/index.js index ea784c371..cadc9c200 100644 --- a/fe/UI.DY.AgGridReport/src/router/index.js +++ b/fe/UI.DY.AgGridReport/src/router/index.js @@ -14,6 +14,7 @@ import SupplierDeliver from '../views/report/SupplierDeliver.vue' import interfaceError from '../views/report/interfaceError.vue' import InventoryJournalERP from '../views/report/InventoryJournalERP.vue' import InventoryJournalLocation from '../views/report/InventoryJournalLocation.vue' +import InventoryBalance from '../views/report/InventoryBalance.vue' import InventoryBalanceERP from '../views/report/InventoryBalanceERP.vue' import InventoryBalanceLocation from '../views/report/InventoryBalanceLocation.vue' import InventoryBalanceEnRoute from '../views/report/InventoryBalanceEnRoute.vue' @@ -26,6 +27,13 @@ import ProductReceiptSummary from '../views/report/ProductReceiptSummary.vue' import SupplierAndOrderSummary from '../views/report/SupplierAndOrderSummary.vue' import rawScrapList from '../views/report/rawScrapList.vue' import inspection from '../views/report/inspection.vue' +import dailyReconciliation from '../views/report/dailyReconciliation.vue' +import returnBeforeListing from '../views/report/returnBeforeListing.vue' +import returnAfterListing from '../views/report/returnAfterListing.vue' +import putaway from '../views/report/putaway.vue' +import putInDetails from '../views/report/putInDetails.vue' +import putOutDetails from '../views/report/putOutDetails.vue' + // import InventoryBookDetail from '../views/report/InventoryBookDetail.vue' Vue.use(VueRouter) @@ -142,6 +150,14 @@ const routes = [ title:"库存流水账汇总(库位)", } }, + { + path: '/InventoryBalance', + name: 'InventoryBalance', + component: InventoryBalance, + meta:{ + title:"库存余额报表", + } + }, { path: '/InventoryBalanceERP', name: 'InventoryBalanceERP', @@ -238,6 +254,54 @@ const routes = [ title:"质检报表", } }, + { + path: '/dailyReconciliation', + name: 'dailyReconciliation', + component: dailyReconciliation, + meta:{ + title:"系统库存每日对账表", + } + }, + { + path: '/returnBeforeListing', + name: 'returnBeforeListing', + component: returnBeforeListing, + meta:{ + title:"上架前退货报表", + } + }, + { + path: '/returnAfterListing', + name: 'returnAfterListing', + component: returnAfterListing, + meta:{ + title:"上架后退货报表", + } + }, + { + path: '/putaway', + name: 'putaway', + component: putaway, + meta:{ + title:"采购上架报表", + } + }, + { + path: '/putInDetails', + name: 'putInDetails', + component: putInDetails, + meta:{ + title:"入库明细报表", + } + }, + { + path: '/putOutDetails', + name: 'putOutDetails', + component: putOutDetails, + meta:{ + title:"出库明细报表", + } + }, // { // path: '/InventoryBookDetail', // name: 'InventoryBookDetail', diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalance.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalance.vue new file mode 100644 index 000000000..f30ce3044 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalance.vue @@ -0,0 +1,54 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/dailyReconciliation.vue b/fe/UI.DY.AgGridReport/src/views/report/dailyReconciliation.vue new file mode 100644 index 000000000..f87a8d855 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/dailyReconciliation.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/inspection.vue b/fe/UI.DY.AgGridReport/src/views/report/inspection.vue index 8131c00fc..35c835fe4 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/inspection.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/inspection.vue @@ -1,24 +1,34 @@ \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/interfaceError.vue b/fe/UI.DY.AgGridReport/src/views/report/interfaceError.vue index 798314451..20f07590d 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/interfaceError.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/interfaceError.vue @@ -21,9 +21,13 @@ export default { data () { return { columnDefs: [ - { field: 'Number', maxWidth:110, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true },width:20 }, - { field: '类型', maxWidth:150,filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: 'ErrorMessage', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '编号', maxWidth:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true },width:20 }, + { field: '业务类型C', maxWidth:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '业务类型E', maxWidth:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '系统来源', maxWidth:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '类型', maxWidth:110, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '时间', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '错误信息', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ {type:'date',prop:'beginDate',label:'起始'}, diff --git a/fe/UI.DY.AgGridReport/src/views/report/putInDetails.vue b/fe/UI.DY.AgGridReport/src/views/report/putInDetails.vue new file mode 100644 index 000000000..ecec9a30e --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/putInDetails.vue @@ -0,0 +1,49 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/putOutDetails.vue b/fe/UI.DY.AgGridReport/src/views/report/putOutDetails.vue new file mode 100644 index 000000000..59d70d582 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/putOutDetails.vue @@ -0,0 +1,48 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/putaway.vue b/fe/UI.DY.AgGridReport/src/views/report/putaway.vue new file mode 100644 index 000000000..e5bab1da6 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/putaway.vue @@ -0,0 +1,52 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/returnAfterListing.vue b/fe/UI.DY.AgGridReport/src/views/report/returnAfterListing.vue new file mode 100644 index 000000000..3c975ab5e --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/returnAfterListing.vue @@ -0,0 +1,53 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/returnBeforeListing.vue b/fe/UI.DY.AgGridReport/src/views/report/returnBeforeListing.vue new file mode 100644 index 000000000..adb2b071f --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/returnBeforeListing.vue @@ -0,0 +1,53 @@ + + + \ No newline at end of file