报表增加打印功能；单据退货可以从原单直接关联数据

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>

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>

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>

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>

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>

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>

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"

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>

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>

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>

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>

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>