From 234ac1508782bf74d1ec8fe35103f6b90bd924ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 17 Mar 2023 19:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9B=B6=E5=94=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/report/RetailOutReport.vue      | 183 ++++++++++++++++++
 jshERP-web/src/views/report/SaleOutReport.vue |   3 -
 2 files changed, 183 insertions(+), 3 deletions(-)
 create mode 100644 jshERP-web/src/views/report/RetailOutReport.vue

diff --git a/jshERP-web/src/views/report/RetailOutReport.vue b/jshERP-web/src/views/report/RetailOutReport.vue
new file mode 100644
index 000000000..a38c12a64
--- /dev/null
+++ b/jshERP-web/src/views/report/RetailOutReport.vue
@@ -0,0 +1,183 @@
+<!-- from 7 5 2 7 1 8 9 2 0 -->
+<template>
+  <a-row :gutter="24">
+    <a-col :md="24">
+      <a-card :style="cardStyle" :bordered="false">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-range-picker
+                    style="width: 100%"
+                    v-model="queryParam.createTimeRange"
+                    :default-value="defaultTimeStr"
+                    format="YYYY-MM-DD"
+                    :placeholder="['开始时间', '结束时间']"
+                    @change="onDateChange"
+                  />
+                </a-form-item>
+              </a-col>
+              <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'" icon="printer">打印</a-button>
+                  <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
+                </span>
+              </a-col>
+              <a-col :md="8" :sm="24">
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+        <!-- table区域-begin -->
+        <section ref="print" id="reportPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :components="handleDrag(columns)"
+            :pagination="false"
+            :scroll="scroll"
+            :loading="loading"
+            @change="handleTableChange">
+          </a-table>
+          <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
+            <a-col :md="24" :sm="24">
+              <a-pagination @change="paginationChange" @showSizeChange="paginationShowSizeChange"
+                size="small"
+                show-size-changer
+                :showQuickJumper="true"
+                :current="ipagination.current"
+                :page-size="ipagination.pageSize"
+                :page-size-options="ipagination.pageSizeOptions"
+                :total="ipagination.total"
+                :show-total="(total, range) => `共 ${total-Math.ceil(total/ipagination.pageSize)} 条`">
+                <template slot="buildOptionText" slot-scope="props">
+                  <span>{{ props.value-1 }}条/页</span>
+                </template>
+              </a-pagination>
+            </a-col>
+          </a-row>
+        </section>
+        <!-- table区域-end -->
+      </a-card>
+    </a-col>
+  </a-row>
+</template>
+<script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getNowFormatYear, getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import moment from 'moment'
+  import Vue from 'vue'
+  export default {
+    name: "RetailOutReport",
+    mixins:[JeecgListMixin],
+    components: {
+      JEllipsis
+    },
+    data () {
+      return {
+        labelCol: {
+          span: 5
+        },
+        wrapperCol: {
+          span: 18,
+          offset: 1
+        },
+        queryParam: {
+          materialParam:'',
+          beginTime: getNowFormatYear() + '-01-01',
+          endTime: moment().format('YYYY-MM-DD'),
+          mpList: getMpListShort(Vue.ls.get('materialPropertyList')),
+          roleType: Vue.ls.get('roleType'),
+        },
+        ipagination:{
+          pageSize: 11,
+          pageSizeOptions: ['11', '21', '31', '101', '201']
+        },
+        dateFormat: 'YYYY-MM-DD',
+        currentDay: moment().format('YYYY-MM-DD'),
+        defaultTimeStr: '',
+        tabKey: "1",
+        // 表头
+        columns: [
+          {
+            title: '#', dataIndex: 'rowIndex', width:60, align:"center",
+            customRender:function (t,r,index) {
+              return (t !== '合计') ? (parseInt(index) + 1) : t
+            }
+          },
+          {title: '条码', dataIndex: 'barCode', width: 160},
+          {title: '名称', dataIndex: 'materialName', width: 160, ellipsis:true},
+          {title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true},
+          {title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true},
+          {title: '扩展信息', dataIndex: 'materialOther', width: 150, ellipsis:true},
+          {title: '单位', dataIndex: 'materialUnit', width: 80, ellipsis:true},
+          {title: '零售数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 80},
+          {title: '零售金额', dataIndex: 'outSumPrice', sorter: (a, b) => a.outSumPrice - b.outSumPrice, width: 80},
+          {title: '退货数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 80},
+          {title: '退货金额', dataIndex: 'inSumPrice', sorter: (a, b) => a.inSumPrice - b.inSumPrice, width: 80},
+          {title: '实际零售金额', dataIndex: 'outInSumPrice', sorter: (a, b) => a.outInSumPrice - b.outInSumPrice, width: 100}
+        ],
+        url: {
+          list: "/depotItem/retailOut"
+        }
+      }
+    },
+    created () {
+      this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
+    },
+    mounted () {
+      this.scroll.x = 1620
+    },
+    methods: {
+      moment,
+      create(){
+      },
+      getQueryParams() {
+        let param = Object.assign({}, this.queryParam, this.isorter);
+        param.monthTime = this.queryParam.monthTime;
+        param.field = this.getQueryField();
+        param.currentPage = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize-1;
+        return param;
+      },
+      onDateChange: function (value, dateString) {
+        console.log(dateString[0],dateString[1]);
+        this.queryParam.beginTime=dateString[0];
+        this.queryParam.endTime=dateString[1];
+      },
+      searchQuery() {
+        if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
+          this.$message.warning('请选择单据日期！')
+        } else {
+          this.loadData(1);
+        }
+      },
+      exportExcel() {
+        let aoa = [['条码', '名称', '规格', '型号', '扩展信息', '单位', '零售数量', '零售金额', '退货数量', '退货金额', '实际零售金额']]
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let ds = this.dataSource[i]
+          let item = [ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.materialUnit, ds.outSum,
+            ds.outSumPrice, ds.inSum, ds.inSumPrice, ds.outInSumPrice]
+          aoa.push(item)
+        }
+        openDownloadDialog(sheet2blob(aoa), '零售统计')
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue
index 719c88c0d..340890027 100644
--- a/jshERP-web/src/views/report/SaleOutReport.vue
+++ b/jshERP-web/src/views/report/SaleOutReport.vue
@@ -32,9 +32,6 @@
                 </span>
               </a-col>
               <a-col :md="8" :sm="24">
-                <a-form-item>
-                  注：本报表包含零售和销售数据
-                </a-form-item>
               </a-col>
             </a-row>
           </a-form>