From b08b55457da6d7567b0f8ab7f828db1abd3bbed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 24 Jun 2021 19:48:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=8A=9F=E8=83=BD=EF=BC=9B=E5=8D=95=E6=8D=AE=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=8F=AF=E4=BB=A5=E4=BB=8E=E5=8E=9F=E5=8D=95=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/dialog/BillDetail.vue      |  18 +-
 .../src/views/bill/dialog/LinkBillList.vue    |   7 +-
 .../views/bill/modules/PurchaseBackModal.vue  |  54 +++-
 .../views/bill/modules/PurchaseInModal.vue    |   2 +-
 .../views/bill/modules/RetailBackModal.vue    | 239 +++++++++++-------
 .../src/views/bill/modules/SaleBackModal.vue  |  54 +++-
 .../src/views/bill/modules/SaleOutModal.vue   |   2 +-
 jshERP-web/src/views/report/AccountReport.vue |   7 +-
 jshERP-web/src/views/report/BuyInReport.vue   |  25 +-
 .../src/views/report/CustomerAccount.vue      |  35 +--
 jshERP-web/src/views/report/InDetail.vue      |  31 ++-
 .../src/views/report/InMaterialCount.vue      |  25 +-
 .../src/views/report/InOutStockReport.vue     |  25 +-
 jshERP-web/src/views/report/MaterialStock.vue |   4 +-
 jshERP-web/src/views/report/OutDetail.vue     |  31 ++-
 .../src/views/report/OutMaterialCount.vue     |  25 +-
 jshERP-web/src/views/report/SaleOutReport.vue |  25 +-
 .../src/views/report/StockWarningReport.vue   |  25 +-
 jshERP-web/src/views/report/VendorAccount.vue |  35 +--
 19 files changed, 436 insertions(+), 233 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 24b4aa1e4..bb5716ea0 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -241,7 +241,11 @@
                     {{model.number}}
                   </a-form-item>
                 </a-col>
-                <a-col :span="6"></a-col>
+                <a-col :span="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+                    {{model.linkNumber}}
+                  </a-form-item>
+                </a-col>
               </a-row>
               <a-table
                 ref="table"
@@ -447,7 +451,11 @@
                     {{model.number}}
                   </a-form-item>
                 </a-col>
-                <a-col :span="6"></a-col>
+                <a-col :span="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+                    {{model.linkNumber}}
+                  </a-form-item>
+                </a-col>
               </a-row>
               <a-row class="form-row" :gutter="24">
                 <a-col :lg="18" :md="12" :sm="24">
@@ -587,7 +595,11 @@
                     {{model.number}}
                   </a-form-item>
                 </a-col>
-                <a-col :span="6"></a-col>
+                <a-col :span="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+                    {{model.linkNumber}}
+                  </a-form-item>
+                </a-col>
               </a-row>
               <a-table
                 ref="table"
diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index 863a62a6f..53106747f 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -42,9 +42,9 @@
         queryParam: {
           number: "",
           searchMaterial: "",
-          type: "其它",
+          type: "",
           subType: "",
-          status: "1"
+          status: ""
         },
         // 表头
         columns: [
@@ -84,8 +84,9 @@
     created() {
     },
     methods: {
-      show(subType, organType) {
+      show(type, subType, organType, status) {
         this.queryParam.subType = subType
+        this.queryParam.status = status
         this.columns[1].title = organType
         this.model = Object.assign({}, {});
         this.visible = true;
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index fdc85328e..d5a276bc3 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -35,7 +35,11 @@
                 <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
               </a-form-item>
             </a-col>
-            <a-col :lg="6" :md="12" :sm="24"></a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+                <a-input-search placeholder="请选择关联单据" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
+              </a-form-item>
+            </a-col>
           </a-row>
           <j-editable-table
             :ref="refKeys[0]"
@@ -109,15 +113,18 @@
       </a-spin>
     </j-modal>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
+    <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
   </a-card>
 </template>
 <script>
   import pick from 'lodash.pick'
   import ManyAccountModal from '../dialog/ManyAccountModal'
+  import LinkBillList from '../dialog/LinkBillList'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort, changeListFmtMinus} from "@/utils/util"
+  import { getAction } from '@/api/manage'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -125,6 +132,7 @@
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
       ManyAccountModal,
+      LinkBillList,
       JDate
     },
     data () {
@@ -258,6 +266,50 @@
         this.$nextTick(() => {
           this.form.setFieldsValue({'changeAmount':allPrice})
         });
+      },
+      onSearchLinkNumber() {
+        this.$refs.linkBillList.show('出库', '采购', '供应商', "0")
+        this.$refs.linkBillList.title = "选择采购出库"
+      },
+      linkBillListOk(selectBillRows) {
+        if(selectBillRows && selectBillRows.length>0) {
+          let record = selectBillRows[0]
+          this.$nextTick(() => {
+            this.form.setFieldsValue({
+              'organId': record.organId,
+              'linkNumber': record.number,
+              'remark': record.remark,
+              'discountLastMoney': record.totalPrice,
+              'changeAmount': record.totalPrice
+            })
+          });
+          // 加载子表数据
+          let params = {
+            headerId: record.id,
+            mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
+          }
+          this.requestSubTableDataEx(this.url.detailList, params, this.materialTable);
+        }
+      },
+      /** 查询某个tab的数据,给明细里面的价税合计赋值 */
+      requestSubTableDataEx(url, params, tab, success) {
+        tab.loading = true
+        getAction(url, params).then(res => {
+          if(res && res.code === 200){
+            let list = res.data.rows
+            let listEx = []
+            for(let j=0; j<list.length; j++){
+              let info = list[j];
+              info.taxMoney = 0
+              info.taxLastMoney = info.allPrice
+              listEx.push(info)
+            }
+            tab.dataSource = listEx
+            typeof success === 'function' ? success(res) : ''
+          }
+        }).finally(() => {
+          tab.loading = false
+        })
       }
     }
   }
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 2b43976cf..5a2a53720 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -276,7 +276,7 @@
         });
       },
       onSearchLinkNumber() {
-        this.$refs.linkBillList.show('采购订单', '供应商')
+        this.$refs.linkBillList.show('其它', '采购订单', '供应商', "1")
         this.$refs.linkBillList.title = "选择采购订单"
       },
       linkBillListOk(selectBillRows) {
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index c3c3bd16c..225c0bbe8 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -1,109 +1,119 @@
 <template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    :maskClosable="false"
-    :keyboard="false"
-    :forceRender="true"
-    switchFullscreen
-    @ok="handleOk"
-    @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
-              <a-select placeholder="选择会员卡号" v-decorator="[ 'organId' ]" :dropdownMatchSelectWidth="false">
-                <a-select-option v-for="(item,index) in retailList" :key="index" :value="item.id">
-                  {{ item.supplier }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-              <j-date v-decorator="['operTime']" :show-time="true"/>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24"></a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="18" :md="12" :sm="24">
-            <j-editable-table
-              :ref="refKeys[0]"
-              :loading="materialTable.loading"
-              :columns="materialTable.columns"
-              :dataSource="materialTable.dataSource"
-              :maxHeight="300"
-              :rowNumber="false"
-              :rowSelection="true"
-              :actionButton="true"
-              @valueChange="onValueChange"
-              @added="onAdded"
-              @deleted="onDeleted" />
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-row class="form-row" :gutter="24">
-              <a-col :lg="24" :md="6" :sm="6"><br/><br/></a-col>
-              <a-col :lg="24" :md="6" :sm="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
-                  <a-input v-decorator.trim="[ 'changeAmount' ]" :style="{color:'purple'}" :readOnly="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :lg="24" :md="6" :sm="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
-                  <a-input v-decorator.trim="[ 'getAmount' ]" :style="{color:'red'}" defaultValue="0" @keyup="onKeyUpGetAmount"/>
-                </a-form-item>
-              </a-col>
-              <a-col :lg="24" :md="6" :sm="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
-                  <a-input v-decorator.trim="[ 'backAmount' ]" :style="{color:'green'}" :readOnly="true" defaultValue="0"/>
-                </a-form-item>
-              </a-col>
-              <a-col :lg="24" :md="6" :sm="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
-                  <a-select placeholder="选择付款账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
-                    <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
-                      {{ item.name }}
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="24" :md="24" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </a-spin>
-  </j-modal>
+  <a-card :bordered="false">
+    <j-modal
+      :title="title"
+      :width="width"
+      :visible="visible"
+      :confirmLoading="confirmLoading"
+      :maskClosable="false"
+      :keyboard="false"
+      :forceRender="true"
+      switchFullscreen
+      @ok="handleOk"
+      @cancel="handleCancel"
+      wrapClassName="ant-modal-cust-warp"
+      style="top:5%;height: 100%;overflow-y: hidden">
+      <a-spin :spinning="confirmLoading">
+        <a-form :form="form">
+          <a-row class="form-row" :gutter="24">
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
+                <a-select placeholder="选择会员卡号" v-decorator="[ 'organId' ]" :dropdownMatchSelectWidth="false">
+                  <a-select-option v-for="(item,index) in retailList" :key="index" :value="item.id">
+                    {{ item.supplier }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                <j-date v-decorator="['operTime']" :show-time="true"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+                <a-input-search placeholder="请选择关联单据" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row class="form-row" :gutter="24">
+            <a-col :lg="18" :md="12" :sm="24">
+              <j-editable-table
+                :ref="refKeys[0]"
+                :loading="materialTable.loading"
+                :columns="materialTable.columns"
+                :dataSource="materialTable.dataSource"
+                :maxHeight="300"
+                :rowNumber="false"
+                :rowSelection="true"
+                :actionButton="true"
+                @valueChange="onValueChange"
+                @added="onAdded"
+                @deleted="onDeleted" />
+            </a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-row class="form-row" :gutter="24">
+                <a-col :lg="24" :md="6" :sm="6"><br/><br/></a-col>
+                <a-col :lg="24" :md="6" :sm="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
+                    <a-input v-decorator.trim="[ 'changeAmount' ]" :style="{color:'purple'}" :readOnly="true"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="24" :md="6" :sm="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
+                    <a-input v-decorator.trim="[ 'getAmount' ]" :style="{color:'red'}" defaultValue="0" @keyup="onKeyUpGetAmount"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="24" :md="6" :sm="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="找零">
+                    <a-input v-decorator.trim="[ 'backAmount' ]" :style="{color:'green'}" :readOnly="true" defaultValue="0"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="24" :md="6" :sm="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
+                    <a-select placeholder="选择付款账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
+                      <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+          </a-row>
+          <a-row class="form-row" :gutter="24">
+            <a-col :lg="24" :md="24" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
+                <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </a-spin>
+    </j-modal>
+    <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
+  </a-card>
 </template>
 <script>
   import pick from 'lodash.pick'
+  import LinkBillList from '../dialog/LinkBillList'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
+  import { getAction } from '@/api/manage'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "RetailBackModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      LinkBillList,
       JDate
     },
     data () {
@@ -231,6 +241,51 @@
         this.$nextTick(() => {
           this.form.setFieldsValue({'backAmount':backAmount})
         });
+      },
+      onSearchLinkNumber() {
+        this.$refs.linkBillList.show('出库', '零售', '会员', "0")
+        this.$refs.linkBillList.title = "选择零售出库"
+      },
+      linkBillListOk(selectBillRows) {
+        if(selectBillRows && selectBillRows.length>0) {
+          let record = selectBillRows[0]
+          this.$nextTick(() => {
+            this.form.setFieldsValue({
+              'organId': record.organId,
+              'linkNumber': record.number,
+              'remark': record.remark,
+              'getAmount': record.totalPrice,
+              'changeAmount': record.totalPrice,
+              'backAmount': 0
+            })
+          });
+          // 加载子表数据
+          let params = {
+            headerId: record.id,
+            mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
+          }
+          this.requestSubTableDataEx(this.url.detailList, params, this.materialTable);
+        }
+      },
+      /** 查询某个tab的数据,给明细里面的价税合计赋值 */
+      requestSubTableDataEx(url, params, tab, success) {
+        tab.loading = true
+        getAction(url, params).then(res => {
+          if(res && res.code === 200){
+            let list = res.data.rows
+            let listEx = []
+            for(let j=0; j<list.length; j++){
+              let info = list[j];
+              info.taxMoney = 0
+              info.taxLastMoney = info.allPrice
+              listEx.push(info)
+            }
+            tab.dataSource = listEx
+            typeof success === 'function' ? success(res) : ''
+          }
+        }).finally(() => {
+          tab.loading = false
+        })
       }
     }
   }
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 3bcf182a8..3f6c08bb0 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -35,7 +35,11 @@
                 <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
               </a-form-item>
             </a-col>
-            <a-col :lg="6" :md="12" :sm="24"></a-col>
+            <a-col :lg="6" :md="12" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
+                <a-input-search placeholder="请选择关联单据" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
+              </a-form-item>
+            </a-col>
           </a-row>
           <j-editable-table
             :ref="refKeys[0]"
@@ -112,15 +116,18 @@
       </a-spin>
     </j-modal>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
+    <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
   </a-card>
 </template>
 <script>
   import pick from 'lodash.pick'
   import ManyAccountModal from '../dialog/ManyAccountModal'
+  import LinkBillList from '../dialog/LinkBillList'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort, changeListFmtMinus } from "@/utils/util"
+  import { getAction } from '@/api/manage'
   import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
@@ -129,6 +136,7 @@
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
       ManyAccountModal,
+      LinkBillList,
       JDate,
       JSelectMultiple
     },
@@ -272,6 +280,50 @@
         this.$nextTick(() => {
           this.form.setFieldsValue({'changeAmount':allPrice})
         });
+      },
+      onSearchLinkNumber() {
+        this.$refs.linkBillList.show('出库', '销售', '客户', "0")
+        this.$refs.linkBillList.title = "选择销售出库"
+      },
+      linkBillListOk(selectBillRows) {
+        if(selectBillRows && selectBillRows.length>0) {
+          let record = selectBillRows[0]
+          this.$nextTick(() => {
+            this.form.setFieldsValue({
+              'organId': record.organId,
+              'linkNumber': record.number,
+              'remark': record.remark,
+              'discountLastMoney': record.totalPrice,
+              'changeAmount': record.totalPrice
+            })
+          });
+          // 加载子表数据
+          let params = {
+            headerId: record.id,
+            mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
+          }
+          this.requestSubTableDataEx(this.url.detailList, params, this.materialTable);
+        }
+      },
+      /** 查询某个tab的数据,给明细里面的价税合计赋值 */
+      requestSubTableDataEx(url, params, tab, success) {
+        tab.loading = true
+        getAction(url, params).then(res => {
+          if(res && res.code === 200){
+            let list = res.data.rows
+            let listEx = []
+            for(let j=0; j<list.length; j++){
+              let info = list[j];
+              info.taxMoney = 0
+              info.taxLastMoney = info.allPrice
+              listEx.push(info)
+            }
+            tab.dataSource = listEx
+            typeof success === 'function' ? success(res) : ''
+          }
+        }).finally(() => {
+          tab.loading = false
+        })
       }
     }
   }
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 82721e5e0..b0a1729ee 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -281,7 +281,7 @@
         });
       },
       onSearchLinkNumber() {
-        this.$refs.linkBillList.show("销售订单", '客户')
+        this.$refs.linkBillList.show('其它', '销售订单', '客户', "1")
         this.$refs.linkBillList.title = "选择销售订单"
       },
       linkBillListOk(selectBillRows) {
diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue
index 8c4147759..7c292b824 100644
--- a/jshERP-web/src/views/report/AccountReport.vue
+++ b/jshERP-web/src/views/report/AccountReport.vue
@@ -16,9 +16,10 @@
                   <a-input placeholder="请输入编号" v-model="queryParam.serialNo"></a-input>
                 </a-form-item>
               </a-col>
-              <a-col :md="2" :sm="24" >
+              <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
               <a-col :md="3" :sm="24" >
@@ -35,7 +36,7 @@
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <div>
+        <section ref="print" id="reportPrint">
           <a-table
             bordered
             ref="table"
@@ -50,7 +51,7 @@
                 <a @click="showAccountInOutList(record)">流水</a>
               </span>
           </a-table>
-        </div>
+        </section>
         <!-- table区域-end -->
         <account-in-out-list ref="accountInOutList" @ok="modalFormOk"></account-in-out-list>
       </a-card>
diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue
index e0e1e9d06..ae0ddd78a 100644
--- a/jshERP-web/src/views/report/BuyInReport.vue
+++ b/jshERP-web/src/views/report/BuyInReport.vue
@@ -19,23 +19,26 @@
               <a-col :md="6" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
             </a-row>
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+          </a-table>
+        </section>
         <!-- table区域-end -->
       </a-card>
     </a-col>
diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue
index d54948ce2..81694d171 100644
--- a/jshERP-web/src/views/report/CustomerAccount.vue
+++ b/jshERP-web/src/views/report/CustomerAccount.vue
@@ -18,7 +18,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-range-picker
-                    style="width: 210px"
+                    style="width: 250px"
                     v-model="queryParam.createTimeRange"
                     :default-value="defaultTimeStr"
                     format="YYYY-MM-DD"
@@ -27,9 +27,10 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :md="2" :sm="24">
+              <a-col :md="4" :sm="24">
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
               <a-col :md="8" :sm="24">
@@ -41,20 +42,22 @@
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-          <span slot="numberCustomRender" slot-scope="text, record">
-            <a @click="myHandleDetail(record)">{{record.number}}</a>
-          </span>
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+            <span slot="numberCustomRender" slot-scope="text, record">
+              <a @click="myHandleDetail(record)">{{record.number}}</a>
+            </span>
+          </a-table>
+        </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <bill-detail ref="modalBillDetail"></bill-detail>
diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index d947e07b7..e864df192 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -47,26 +47,29 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
             </a-row>
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-          <span slot="numberCustomRender" slot-scope="text, record">
-            <a @click="myHandleDetail(record)">{{record.number}}</a>
-          </span>
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+            <span slot="numberCustomRender" slot-scope="text, record">
+              <a @click="myHandleDetail(record)">{{record.number}}</a>
+            </span>
+          </a-table>
+        </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <bill-detail ref="modalDetail"></bill-detail>
diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue
index 409917e31..77d0a59aa 100644
--- a/jshERP-web/src/views/report/InMaterialCount.vue
+++ b/jshERP-web/src/views/report/InMaterialCount.vue
@@ -47,23 +47,26 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
             </a-row>
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+          </a-table>
+        </section>
         <!-- table区域-end -->
       </a-card>
     </a-col>
diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index 7fdd907c7..308252980 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -32,6 +32,7 @@
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" type="primary" icon="download" @click="handleExportXls('库存状况')">导出</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
               <a-col :md="4" :sm="24" >
@@ -43,17 +44,19 @@
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+          </a-table>
+        </section>
         <!-- table区域-end -->
       </a-card>
     </a-col>
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index b520374f2..f6dc27c0a 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -33,7 +33,7 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" v-print="'#materialStockPrint'" type="primary" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
               <a-col :md="4" :sm="24" >
@@ -50,7 +50,7 @@
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <section ref="print" id="materialStockPrint">
+        <section ref="print" id="reportPrint">
           <a-table
             bordered
             ref="table"
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index 5910a462a..8a8bc6a38 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -47,26 +47,29 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
             </a-row>
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-          <span slot="numberCustomRender" slot-scope="text, record">
-            <a @click="myHandleDetail(record)">{{record.number}}</a>
-          </span>
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+            <span slot="numberCustomRender" slot-scope="text, record">
+              <a @click="myHandleDetail(record)">{{record.number}}</a>
+            </span>
+          </a-table>
+        </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <bill-detail ref="modalDetail"></bill-detail>
diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue
index 776082706..b4b2f0532 100644
--- a/jshERP-web/src/views/report/OutMaterialCount.vue
+++ b/jshERP-web/src/views/report/OutMaterialCount.vue
@@ -47,23 +47,26 @@
               <a-col :md="4" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
             </a-row>
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+          </a-table>
+        </section>
         <!-- table区域-end -->
       </a-card>
     </a-col>
diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue
index 7199a4ed4..446acb682 100644
--- a/jshERP-web/src/views/report/SaleOutReport.vue
+++ b/jshERP-web/src/views/report/SaleOutReport.vue
@@ -19,23 +19,26 @@
               <a-col :md="3" :sm="24" >
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
             </a-row>
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+          </a-table>
+        </section>
         <!-- table区域-end -->
       </a-card>
     </a-col>
diff --git a/jshERP-web/src/views/report/StockWarningReport.vue b/jshERP-web/src/views/report/StockWarningReport.vue
index 6d3350ce7..e929ea4f3 100644
--- a/jshERP-web/src/views/report/StockWarningReport.vue
+++ b/jshERP-web/src/views/report/StockWarningReport.vue
@@ -27,23 +27,26 @@
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" type="primary" icon="download" @click="handleExportXls('库存预警')">导出</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
             </a-row>
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+          </a-table>
+        </section>
         <!-- table区域-end -->
       </a-card>
     </a-col>
diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue
index 57d62d44c..ec532f1f2 100644
--- a/jshERP-web/src/views/report/VendorAccount.vue
+++ b/jshERP-web/src/views/report/VendorAccount.vue
@@ -18,7 +18,7 @@
               <a-col :md="6" :sm="10">
                 <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-range-picker
-                    style="width: 210px"
+                    style="width: 250px"
                     v-model="queryParam.createTimeRange"
                     :default-value="defaultTimeStr"
                     format="YYYY-MM-DD"
@@ -27,9 +27,10 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :md="2" :sm="24">
+              <a-col :md="4" :sm="24">
                 <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#reportPrint'" type="primary" icon="printer">打印</a-button>
                 </span>
               </a-col>
               <a-col :md="8" :sm="24">
@@ -41,20 +42,22 @@
           </a-form>
         </div>
         <!-- table区域-begin -->
-        <a-table
-          bordered
-          ref="table"
-          size="middle"
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          @change="handleTableChange">
-          <span slot="numberCustomRender" slot-scope="text, record">
-            <a @click="myHandleDetail(record)">{{record.number}}</a>
-          </span>
-        </a-table>
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+            <span slot="numberCustomRender" slot-scope="text, record">
+              <a @click="myHandleDetail(record)">{{record.number}}</a>
+            </span>
+          </a-table>
+        </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <bill-detail ref="modalBillDetail"></bill-detail>