diff --git a/jshERP-web/README.md b/jshERP-web/README.md index 581ecb566..4066a3f88 100644 --- a/jshERP-web/README.md +++ b/jshERP-web/README.md @@ -6,16 +6,12 @@ jshERP-web Vue Overview ---- -基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 Ant Design Pro Vue 版 -Jeecg-boot 的前段UI框架,采用前后端分离方案,提供强大代码生成器的快速开发平台。 -前端页面代码和后端功能代码一键生成,不需要写任何代码,保持jeecg一贯的强大!! - - #### 前端技术 - 基础框架:[ant-design-vue](https://github.com/vueComponent/ant-design-vue) - Ant Design Of Vue 实现 - JavaScript框架:Vue +- Jeecg-boot 的前段UI框架 - Webpack - node - yarn @@ -37,17 +33,12 @@ yarn install - 开发模式运行 ``` -yarn run serve +yarn serve ``` -- 编译项目 +- 编译发布项目 ``` -yarn run build -``` - -- Lints and fixes files -``` -yarn run lint +yarn build ``` diff --git a/jshERP-web/package.json b/jshERP-web/package.json index f0945c9bb..89f29f4f2 100644 --- a/jshERP-web/package.json +++ b/jshERP-web/package.json @@ -5,8 +5,7 @@ "scripts": { "pre": "yarn --registry https://registry.npm.taobao.org || cnpm install || npm install --registry https://registry.npm.taobao.org ", "serve": "vue-cli-service serve", - "build-index": "vue-cli-service build index", - "lint": "vue-cli-service lint" + "build": "vue-cli-service build" }, "dependencies": { "@antv/data-set": "^0.11.2", diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js index db65799ef..baa879f31 100644 --- a/jshERP-web/src/api/api.js +++ b/jshERP-web/src/api/api.js @@ -157,8 +157,10 @@ const findBySelectRetail = (params)=>postAction("/supplier/findBySelect_retail", const findSupplierById = (params)=>getAction("/supplier/findById",params); //单据相关 const findDepotHeadTotalPay = (params)=>getAction("/depotHead/findTotalPay",params); +const findBillDetailByNumber = (params)=>getAction("/depotHead/getDetailByNumber",params); const findStockByDepotAndBarCode = (params)=>getAction("/depotItem/findStockByDepotAndBarCode",params); const findAccountHeadTotalPay = (params)=>getAction("/accountHead/findTotalPay",params); +const findFinancialDetailByNumber = (params)=>getAction("/accountHead/getDetailByNumber",params); export { getBuyAndSaleStatistics, @@ -265,8 +267,10 @@ export { findBySelectRetail, findSupplierById, findDepotHeadTotalPay, + findBillDetailByNumber, findStockByDepotAndBarCode, - findAccountHeadTotalPay + findAccountHeadTotalPay, + findFinancialDetailByNumber } diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index 6e4671c31..4a5702500 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index 6eb1a9919..dd57b9b9c 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index 28ef9b30b..aa0c6b01c 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index fa12653c0..ea3050b20 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index f1d09cd53..1e21045e4 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index ff994158b..204aab5c3 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 900eaa55a..72fee33fc 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 2ff351a73..d0d14d82f 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -64,7 +64,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index f3804b512..19a3e9627 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 7845de7f8..960ee26a7 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index 9cf1baae5..8ef223ef5 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index a710df12e..17a549001 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -64,7 +64,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 9dbb2f67b..a14b0a9f2 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -62,7 +62,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index dfd3600d9..8822a6446 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -12,7 +12,7 @@ style="top:5%;height: 100%;overflow-y: hidden"> -