From 32f4c28d7ae0bc0940f94af15e48261858b79056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 10 Apr 2023 23:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=87=87=E8=B4=AD=E3=80=81=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E3=80=81=E9=9B=B6=E5=94=AE=E7=BB=9F=E8=AE=A1=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E3=80=81?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/BuyInReport.vue   | 22 ++++++++++++++++++
 .../src/views/report/RetailOutReport.vue      | 22 ++++++++++++++++++
 jshERP-web/src/views/report/SaleOutReport.vue | 23 +++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue
index 883b6feb..4a74ca50 100644
--- a/jshERP-web/src/views/report/BuyInReport.vue
+++ b/jshERP-web/src/views/report/BuyInReport.vue
@@ -41,6 +41,16 @@
                 </a-form-item>
               </a-col>
               <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择供应商" v-model="queryParam.organId"
+                              :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
+                      <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
+                        {{ item.supplier }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select
@@ -101,6 +111,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
+  import {findBySelectSup} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -123,6 +134,7 @@
           materialParam:'',
           beginTime: getNowFormatYear() + '-01-01',
           endTime: moment().format('YYYY-MM-DD'),
+          organId: '',
           depotId: '',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList')),
           roleType: Vue.ls.get('roleType'),
@@ -134,6 +146,7 @@
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
+        supList: [],
         depotList: [],
         realityPriceTotal: '',
         tabKey: "1",
@@ -163,6 +176,7 @@
       }
     },
     created () {
+      this.initSupplier()
       this.getDepotData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
@@ -204,6 +218,14 @@
           this.loading = false;
         })
       },
+      initSupplier() {
+        let that = this;
+        findBySelectSup({}).then((res)=>{
+          if(res) {
+            that.supList = res
+          }
+        });
+      },
       getDepotData() {
         getAction('/depot/findDepotByCurrentUser').then((res)=>{
           if(res.code === 200){
diff --git a/jshERP-web/src/views/report/RetailOutReport.vue b/jshERP-web/src/views/report/RetailOutReport.vue
index 5d9aabcf..9b1ce561 100644
--- a/jshERP-web/src/views/report/RetailOutReport.vue
+++ b/jshERP-web/src/views/report/RetailOutReport.vue
@@ -41,6 +41,16 @@
                 </a-form-item>
               </a-col>
               <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="会员卡号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择会员卡号" v-model="queryParam.organId"
+                              :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
+                      <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 :md="6" :sm="24">
                   <a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select
@@ -101,6 +111,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
+  import {findBySelectRetail} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -123,6 +134,7 @@
           materialParam:'',
           beginTime: getNowFormatYear() + '-01-01',
           endTime: moment().format('YYYY-MM-DD'),
+          organId: '',
           depotId: '',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList')),
           roleType: Vue.ls.get('roleType'),
@@ -134,6 +146,7 @@
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
+        retailList: [],
         depotList: [],
         realityPriceTotal: '',
         tabKey: "1",
@@ -163,6 +176,7 @@
       }
     },
     created () {
+      this.initRetail()
       this.getDepotData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
@@ -206,6 +220,14 @@
           this.loading = false;
         })
       },
+      initRetail() {
+        let that = this;
+        findBySelectRetail({}).then((res)=>{
+          if(res) {
+            that.retailList = res
+          }
+        });
+      },
       getDepotData() {
         getAction('/depot/findDepotByCurrentUser').then((res)=>{
           if(res.code === 200){
diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue
index 614bd714..d97c0368 100644
--- a/jshERP-web/src/views/report/SaleOutReport.vue
+++ b/jshERP-web/src/views/report/SaleOutReport.vue
@@ -41,6 +41,16 @@
                 </a-form-item>
               </a-col>
               <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择客户" v-model="queryParam.organId"
+                              :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
+                      <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
+                        {{ item.supplier }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select
@@ -101,6 +111,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
+  import {findBySelectCus} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -123,6 +134,8 @@
           materialParam:'',
           beginTime: getNowFormatYear() + '-01-01',
           endTime: moment().format('YYYY-MM-DD'),
+          organId: '',
+          depotId: '',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList')),
           roleType: Vue.ls.get('roleType'),
         },
@@ -133,6 +146,7 @@
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
+        cusList: [],
         depotList: [],
         realityPriceTotal: '',
         tabKey: "1",
@@ -162,6 +176,7 @@
       }
     },
     created () {
+      this.initCustomer()
       this.getDepotData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
@@ -205,6 +220,14 @@
           this.loading = false;
         })
       },
+      initCustomer() {
+        let that = this;
+        findBySelectCus({}).then((res)=>{
+          if(res) {
+            that.cusList = res
+          }
+        });
+      },
       getDepotData() {
         getAction('/depot/findDepotByCurrentUser').then((res)=>{
           if(res.code === 200){