Skip to content
GitLab
Commit 53d41acf authored by 季圣华's avatar 季圣华
Browse files

优化根据单据编号查看单据明细的功能

parent 52985ab4
Hide whitespace changes
Inline Side-by-side
jshERP-web/README.md
View file @ 53d41acf
......@@ -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 run build
yarn serve
```
- Lints and fixes files
- 编译发布项目
```
yarn run lint
yarn build
```
......
jshERP-web/package.json
View file @ 53d41acf
......@@ -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",
......
jshERP-web/src/api/api.js
View file @ 53d41acf
......@@ -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
}
......
jshERP-web/src/views/bill/AllocationOutList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'allocationOut')">查看</a>
<a @click="myHandleDetail(record, '调拨出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/AssembleList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'assemble')">查看</a>
<a @click="myHandleDetail(record, '组装单')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/DisassembleList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'disassemble')">查看</a>
<a @click="myHandleDetail(record, '拆卸单')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/OtherInList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'otherIn')">查看</a>
<a @click="myHandleDetail(record, '其它入库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/OtherOutList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'otherOut')">查看</a>
<a @click="myHandleDetail(record, '其它出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/PurchaseBackList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'purchaseBack')">查看</a>
<a @click="myHandleDetail(record, '采购退货出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/PurchaseInList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'purchaseIn')">查看</a>
<a @click="myHandleDetail(record, '采购入库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/PurchaseOrderList.vue
View file @ 53d41acf
......@@ -64,7 +64,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'purchaseOrder')">查看</a>
<a @click="myHandleDetail(record, '采购订单')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/RetailBackList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'retailBack')">查看</a>
<a @click="myHandleDetail(record, '零售退货入库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/RetailOutList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'retailOut')">查看</a>
<a @click="myHandleDetail(record, '零售出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/SaleBackList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'saleBack')">查看</a>
<a @click="myHandleDetail(record, '销售退货入库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/SaleOrderList.vue
View file @ 53d41acf
......@@ -64,7 +64,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'saleOrder')">查看</a>
<a @click="myHandleDetail(record, '销售订单')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/SaleOutList.vue
View file @ 53d41acf
......@@ -62,7 +62,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'saleOut')">查看</a>
<a @click="myHandleDetail(record, '销售出库')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/bill/dialog/BillDetail.vue
View file @ 53d41acf
......@@ -12,7 +12,7 @@
style="top:5%;height: 100%;overflow-y: hidden">
<a-form :form="form">
<!--调拨出库-->
<template v-if="billType === 'allocationOut'">
<template v-if="billType === '调拨出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
......@@ -48,7 +48,7 @@
</a-row>
</template>
<!--组装单-->
<template v-else-if="billType === 'assemble'">
<template v-else-if="billType === '组装单'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
......@@ -81,7 +81,7 @@
</a-row>
</template>
<!--拆卸单-->
<template v-else-if="billType === 'disassemble'">
<template v-else-if="billType === '拆卸单'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
......@@ -114,7 +114,7 @@
</a-row>
</template>
<!--其它入库-->
<template v-else-if="billType === 'otherIn'">
<template v-else-if="billType === '其它入库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
......@@ -152,7 +152,7 @@
</a-row>
</template>
<!--其它出库-->
<template v-else-if="billType === 'otherOut'">
<template v-else-if="billType === '其它出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
......@@ -190,7 +190,7 @@
</a-row>
</template>
<!--采购退货-->
<template v-else-if="billType === 'purchaseBack'">
<template v-else-if="billType === '采购退货出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
......@@ -269,7 +269,7 @@
</a-row>
</template>
<!--采购入库-->
<template v-else-if="billType === 'purchaseIn'">
<template v-else-if="billType === '采购入库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
......@@ -348,7 +348,7 @@
</a-row>
</template>
<!--采购订单-->
<template v-else-if="billType === 'purchaseOrder'">
<template v-else-if="billType === '采购订单'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
......@@ -386,7 +386,7 @@
</a-row>
</template>
<!--零售退货-->
<template v-else-if="billType === 'retailBack'">
<template v-else-if="billType === '零售退货入库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
......@@ -453,7 +453,7 @@
</a-row>
</template>
<!--零售出库-->
<template v-else-if="billType === 'retailOut'">
<template v-else-if="billType === '零售出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
......@@ -524,7 +524,7 @@
</a-row>
</template>
<!--销售退货-->
<template v-else-if="billType === 'saleBack'">
<template v-else-if="billType === '销售退货入库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
......@@ -610,7 +610,7 @@
</a-row>
</template>
<!--销售订单-->
<template v-else-if="billType === 'saleOrder'">
<template v-else-if="billType === '销售订单'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
......@@ -652,7 +652,7 @@
</a-row>
</template>
<!--销售出库-->
<template v-else-if="billType === 'saleOut'">
<template v-else-if="billType === '销售出库'">
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
......
jshERP-web/src/views/financial/AdvanceInList.vue
View file @ 53d41acf
......@@ -57,7 +57,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'advanceIn')">查看</a>
<a @click="myHandleDetail(record, '收预付款')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/financial/GiroList.vue
View file @ 53d41acf
......@@ -57,7 +57,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'giro')">查看</a>
<a @click="myHandleDetail(record, '转账')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
jshERP-web/src/views/financial/ItemInList.vue
View file @ 53d41acf
......@@ -57,7 +57,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, 'itemIn')">查看</a>
<a @click="myHandleDetail(record, '收入')">查看</a>
<a-divider type="vertical" />
<a @click="myHandleEdit(record)">编辑</a>
<a-divider type="vertical" />
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment