From 53d41acfab2da7f0933868c571a76548397f01a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 20 Apr 2021 22:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B9=E6=8D=AE=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=BC=96=E5=8F=B7=E6=9F=A5=E7=9C=8B=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/README.md                          | 17 ++------
 jshERP-web/package.json                       |  3 +-
 jshERP-web/src/api/api.js                     |  6 ++-
 .../src/views/bill/AllocationOutList.vue      |  2 +-
 jshERP-web/src/views/bill/AssembleList.vue    |  2 +-
 jshERP-web/src/views/bill/DisassembleList.vue |  2 +-
 jshERP-web/src/views/bill/OtherInList.vue     |  2 +-
 jshERP-web/src/views/bill/OtherOutList.vue    |  2 +-
 .../src/views/bill/PurchaseBackList.vue       |  2 +-
 jshERP-web/src/views/bill/PurchaseInList.vue  |  2 +-
 .../src/views/bill/PurchaseOrderList.vue      |  2 +-
 jshERP-web/src/views/bill/RetailBackList.vue  |  2 +-
 jshERP-web/src/views/bill/RetailOutList.vue   |  2 +-
 jshERP-web/src/views/bill/SaleBackList.vue    |  2 +-
 jshERP-web/src/views/bill/SaleOrderList.vue   |  2 +-
 jshERP-web/src/views/bill/SaleOutList.vue     |  2 +-
 .../src/views/bill/dialog/BillDetail.vue      | 26 ++++++------
 .../src/views/financial/AdvanceInList.vue     |  2 +-
 jshERP-web/src/views/financial/GiroList.vue   |  2 +-
 jshERP-web/src/views/financial/ItemInList.vue |  2 +-
 .../src/views/financial/ItemOutList.vue       |  2 +-
 .../src/views/financial/MoneyInList.vue       |  2 +-
 .../src/views/financial/MoneyOutList.vue      |  2 +-
 .../financial/dialog/FinancialDetail.vue      | 12 +++---
 jshERP-web/src/views/report/InDetail.vue      | 21 +++++++++-
 jshERP-web/src/views/report/OutDetail.vue     | 21 +++++++++-
 .../views/report/modules/AccountInOutList.vue | 41 +++++++++++++++++--
 jshERP-web/vue.config.js                      | 32 ---------------
 28 files changed, 124 insertions(+), 93 deletions(-)

diff --git a/jshERP-web/README.md b/jshERP-web/README.md
index 581ecb56..4066a3f8 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 f0945c9b..89f29f4f 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 db65799e..baa879f3 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 6e4671c3..4a570250 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue
index 6eb1a991..dd57b9b9 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue
index 28ef9b30..aa0c6b01 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue
index fa12653c..ea3050b2 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue
index f1d09cd5..1e21045e 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue
index ff994158..204aab5c 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index 900eaa55..72fee33f 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index 2ff351a7..d0d14d82 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue
index f3804b51..19a3e962 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue
index 7845de7f..960ee26a 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue
index 9cf1baae..8ef223ef 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index a710df12..17a54900 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index 9dbb2f67..a14b0a9f 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">
         <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" />
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index dfd3600d..8822a644 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">
       <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="客户">
diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue
index 54cc38e7..7859969b 100644
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -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" />
diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue
index c7fc723c..7b467923 100644
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -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" />
diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue
index b54521c3..6315ef14 100644
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -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" />
diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue
index e004d023..0ca71da5 100644
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -57,7 +57,7 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a @click="myHandleDetail(record, 'itemOut')">查看</a>
+          <a @click="myHandleDetail(record, '支出')">查看</a>
           <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue
index 84e0c776..f78d7682 100644
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -57,7 +57,7 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a @click="myHandleDetail(record, 'moneyIn')">查看</a>
+          <a @click="myHandleDetail(record, '收款')">查看</a>
           <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue
index 848f2533..23fc4ca7 100644
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -57,7 +57,7 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a @click="myHandleDetail(record, 'moneyOut')">查看</a>
+          <a @click="myHandleDetail(record, '付款')">查看</a>
           <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index 5268ef05..678cd37a 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -12,7 +12,7 @@
       style="top:5%;height: 100%;overflow-y: hidden">
       <a-form :form="form">
         <!--收预付款-->
-        <template v-if="financialType === 'advanceIn'">
+        <template v-if="financialType === '收预付款'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款会员">
@@ -54,7 +54,7 @@
           </a-row>
         </template>
         <!--转账-->
-        <template v-if="financialType === 'giro'">
+        <template v-if="financialType === '转账'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
@@ -106,7 +106,7 @@
           </a-row>
         </template>
         <!--收入-->
-        <template v-if="financialType === 'itemIn'">
+        <template v-if="financialType === '收入'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
@@ -162,7 +162,7 @@
           </a-row>
         </template>
         <!--支出-->
-        <template v-if="financialType === 'itemOut'">
+        <template v-if="financialType === '支出'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
@@ -218,7 +218,7 @@
           </a-row>
         </template>
         <!--收款-->
-        <template v-if="financialType === 'moneyIn'">
+        <template v-if="financialType === '收款'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单位">
@@ -270,7 +270,7 @@
           </a-row>
         </template>
         <!--付款-->
-        <template v-if="financialType === 'moneyOut'">
+        <template v-if="financialType === '付款'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款单位">
diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index 25b492b6..929761f5 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -61,21 +61,28 @@
       :pagination="ipagination"
       :loading="loading"
       @change="handleTableChange">
+      <span slot="numberCustomRender" slot-scope="text, record">
+        <a @click="myHandleDetail(record)">{{record.number}}</a>
+      </span>
     </a-table>
     <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
+  import BillDetail from '../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatMonth } from '@/utils/util';
   import {getAction} from '@/api/manage'
-  import {findBySelectSup} from '@/api/api'
+  import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   export default {
     name: "BuyInReport",
     mixins:[JeecgListMixin],
     components: {
+      BillDetail,
       JEllipsis
     },
     data () {
@@ -107,7 +114,10 @@
               return parseInt(index)+1;
             }
           },
-          {title: '单据编号', dataIndex: 'number', width: 140},
+          {
+            title: '单据编号', dataIndex: 'number', width: 140,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           {title: '名称', dataIndex: 'mname', width: 120},
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
@@ -172,6 +182,13 @@
             this.$message.info(res.data);
           }
         })
+      },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.number }).then((res) => {
+          if (res && res.code === 200) {
+            this.handleDetail(res.data, record.newType);
+          }
+        })
       }
     }
   }
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index 66544801..c87d7e5a 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -61,21 +61,28 @@
       :pagination="ipagination"
       :loading="loading"
       @change="handleTableChange">
+      <span slot="numberCustomRender" slot-scope="text, record">
+        <a @click="myHandleDetail(record)">{{record.number}}</a>
+      </span>
     </a-table>
     <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
+  import BillDetail from '../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatMonth } from '@/utils/util';
   import {getAction} from '@/api/manage'
-  import {findBySelectCus} from '@/api/api'
+  import {findBySelectCus, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   export default {
     name: "BuyInReport",
     mixins:[JeecgListMixin],
     components: {
+      BillDetail,
       JEllipsis
     },
     data () {
@@ -107,7 +114,10 @@
               return parseInt(index)+1;
             }
           },
-          {title: '单据编号', dataIndex: 'number', width: 140},
+          {
+            title: '单据编号', dataIndex: 'number', width: 140,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           {title: '名称', dataIndex: 'mname', width: 120},
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
@@ -172,6 +182,13 @@
             this.$message.info(res.data);
           }
         })
+      },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.number }).then((res) => {
+          if (res && res.code === 200) {
+            this.handleDetail(res.data, record.newType);
+          }
+        })
       }
     }
   }
diff --git a/jshERP-web/src/views/report/modules/AccountInOutList.vue b/jshERP-web/src/views/report/modules/AccountInOutList.vue
index 145a83a3..906bfd52 100644
--- a/jshERP-web/src/views/report/modules/AccountInOutList.vue
+++ b/jshERP-web/src/views/report/modules/AccountInOutList.vue
@@ -18,25 +18,38 @@
       :pagination="ipagination"
       :loading="loading"
       @change="handleTableChange">
+      <span slot="numberCustomRender" slot-scope="text, record">
+        <a @click="myHandleDetail(record)">{{record.number}}</a>
+      </span>
     </a-table>
     <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <bill-detail ref="billDetail"></bill-detail>
+    <financial-detail ref="financialDetail"></financial-detail>
   </a-modal>
 </template>
 <script>
+  import BillDetail from '../../bill/dialog/BillDetail'
+  import FinancialDetail from '../../financial/dialog/FinancialDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
-  import {getAction} from '@/api/manage'
+  import {findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api'
   export default {
     name: "AccountInOutList",
     mixins:[JeecgListMixin],
     components: {
-      JEllipsis
+      BillDetail,
+      FinancialDetail,
+      JEllipsis,
+      findBillDetailByNumber,
+      findFinancialDetailByNumber
     },
     data () {
       return {
         title:"操作",
         visible: false,
         disableMixinCreated: false,
+        toFromType: '',
         // 查询条件
         queryParam: {
           accountId:'',
@@ -55,7 +68,10 @@
               return parseInt(index)+1;
             }
           },
-          { title: '单据编号', dataIndex: 'number', width: 150},
+          {
+            title: '单据编号', dataIndex: 'number', width: 150,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           { title: '类型', dataIndex: 'type', width: 100},
           { title: '单位信息', dataIndex: 'supplierName', width: 150},
           { title: '金额', dataIndex: 'changeAmount', width: 80},
@@ -115,6 +131,25 @@
       },
       handleCancel () {
         this.close()
+      },
+      myHandleDetail(record) {
+        let that = this
+        this.toFromType = record.fromType
+        if(record.fromType === 'bill') {
+          findBillDetailByNumber({ number: record.number }).then((res) => {
+            if (res && res.code === 200) {
+              that.$refs.billDetail.show(res.data, record.type);
+              that.$refs.billDetail.title="详情";
+            }
+          })
+        } else if(record.fromType === 'financial') {
+          findFinancialDetailByNumber({ billNo: record.number }).then((res) => {
+            if (res && res.code === 200) {
+              that.$refs.financialDetail.show(res.data, record.type);
+              that.$refs.financialDetail.title="详情";
+            }
+          })
+        }
       }
     }
   }
diff --git a/jshERP-web/vue.config.js b/jshERP-web/vue.config.js
index fd4e3d88..e072c1e6 100644
--- a/jshERP-web/vue.config.js
+++ b/jshERP-web/vue.config.js
@@ -5,38 +5,8 @@ function resolve (dir) {
     return path.join(__dirname, dir)
 }
 
-let objectProject = {
-    index: {
-        entry: 'src/main.js', // page 的入口
-        template: 'public/index.html', // 模板来源
-        filename: 'index.html', // 在 dist/index.html 的输出
-        // 当使用 title 选项时，template 中的 title 标签需要是 <title><%= htmlWebpackPlugin.options.title %></title>
-        title: 'Index Page',
-        // 在这个页面中包含的块，默认情况下会包含,提取出来的通用 chunk 和 vendor chunk。
-        chunks: ['chunk-vendors', 'chunk-common', 'index']
-    }
-}
-let page = {}
-let projectname = process.argv[3] // 获取执行哪个文件
-if (process.env.NODE_ENV === 'development') {
-    page = objectProject
-} else {
-    page[projectname] = objectProject[projectname]
-}
-let publicPathStr, dirStr
-if (projectname === undefined || projectname === 'index') {
-    publicPathStr = '/'
-    dirStr = 'dist'
-} else {
-    publicPathStr = './'
-    dirStr = 'dist/plugin/' + projectname
-}
-
 // vue.config.js
 module.exports = {
-    outputDir: dirStr, // 标识是打包哪个文件
-    filenameHashing: true,
-    pages: page,
     /*
       Vue-cli3:
       Crashed when using Webpack `import()` #2463
@@ -44,8 +14,6 @@ module.exports = {
      */
     // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
     productionSourceMap: false,
-    // 静态文件的路径前缀
-    publicPath: publicPathStr,
     configureWebpack: config => {
     // 生产环境取消 console.log
         if (process.env.NODE_ENV === 'production') {