From d117bd3064295428cc824a511dbe6f8c5b95fd2e 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, 13 Oct 2022 23:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=92=8C=E5=87=BA=E5=85=A5=E5=BA=93=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E6=8A=A5=E8=A1=A8=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/InDetail.vue       | 18 +++++++++---------
 .../src/views/report/InMaterialCount.vue       | 14 +++++++-------
 jshERP-web/src/views/report/OutDetail.vue      | 18 +++++++++---------
 .../src/views/report/OutMaterialCount.vue      | 14 +++++++-------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index 46000590..988d4db5 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -42,10 +42,10 @@
               </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"
+                  <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">
+                      <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                         {{ item.supplier }}
                       </a-select-option>
                     </a-select>
@@ -121,7 +121,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
+  import {findBySelectOrgan, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -160,7 +160,7 @@
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
-        supList: [],
+        organList: [],
         depotList: [],
         tabKey: "1",
         // 表头
@@ -185,13 +185,13 @@
           {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
           {title: '税率(%)', dataIndex: 'taxRate', width: 60},
           {title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, width: 60},
-          {title: '供应商', dataIndex: 'sname', width: 80, ellipsis:true},
+          {title: '往来单位', dataIndex: 'sname', width: 80, ellipsis:true},
           {title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true},
           {title: '入库日期', dataIndex: 'operTime', width: 70},
           {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true}
         ],
         url: {
-          list: "/depotHead/findInDetail",
+          list: "/depotHead/findInOutDetail",
         }
       }
     },
@@ -216,9 +216,9 @@
       },
       initSupplier() {
         let that = this;
-        findBySelectSup({}).then((res)=>{
+        findBySelectOrgan({}).then((res)=>{
           if(res) {
-            that.supList = res;
+            that.organList = res;
           }
         });
       },
diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue
index e1b0337c..65390612 100644
--- a/jshERP-web/src/views/report/InMaterialCount.vue
+++ b/jshERP-web/src/views/report/InMaterialCount.vue
@@ -8,10 +8,10 @@
           <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-select placeholder="选择供应商" v-model="queryParam.organId"
+                <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">
+                    <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                       {{ item.supplier }}
                     </a-select-option>
                   </a-select>
@@ -104,7 +104,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectSup} from '@/api/api'
+  import {findBySelectOrgan} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -140,7 +140,7 @@
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
-        supList: [],
+        organList: [],
         depotList: [],
         tabKey: "1",
         // 表头
@@ -186,9 +186,9 @@
       },
       initSupplier() {
         let that = this;
-        findBySelectSup({}).then((res)=>{
+        findBySelectOrgan({}).then((res)=>{
           if(res) {
-            that.supList = res;
+            that.organList = res;
           }
         });
       },
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index ad2c6977..20ac3104 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -42,10 +42,10 @@
               </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"
+                  <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">
+                      <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                         {{ item.supplier }}
                       </a-select-option>
                     </a-select>
@@ -121,7 +121,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectCus, findBillDetailByNumber} from '@/api/api'
+  import {findBySelectOrgan, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -160,7 +160,7 @@
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
-        supList: [],
+        organList: [],
         depotList: [],
         tabKey: "1",
         // 表头
@@ -185,13 +185,13 @@
           {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
           {title: '税率(%)', dataIndex: 'taxRate', width: 60},
           {title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, width: 60},
-          {title: '客户', dataIndex: 'sname', width: 80, ellipsis:true},
+          {title: '往来单位', dataIndex: 'sname', width: 80, ellipsis:true},
           {title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true},
           {title: '出库日期', dataIndex: 'operTime', width: 70},
           {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true}
         ],
         url: {
-          list: "/depotHead/findInDetail",
+          list: "/depotHead/findInOutDetail",
         }
       }
     },
@@ -216,9 +216,9 @@
       },
       initSupplier() {
         let that = this;
-        findBySelectCus({}).then((res)=>{
+        findBySelectOrgan({}).then((res)=>{
           if(res) {
-            that.supList = res;
+            that.organList = res;
           }
         });
       },
diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue
index b4c18b46..ca573ed3 100644
--- a/jshERP-web/src/views/report/OutMaterialCount.vue
+++ b/jshERP-web/src/views/report/OutMaterialCount.vue
@@ -8,10 +8,10 @@
           <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-select placeholder="选择客户" v-model="queryParam.organId"
+                <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">
+                    <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                       {{ item.supplier }}
                     </a-select-option>
                   </a-select>
@@ -104,7 +104,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectCus} from '@/api/api'
+  import {findBySelectOrgan} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -140,7 +140,7 @@
         dateFormat: 'YYYY-MM-DD',
         currentDay: moment().format('YYYY-MM-DD'),
         defaultTimeStr: '',
-        supList: [],
+        organList: [],
         depotList: [],
         tabKey: "1",
         // 表头
@@ -186,9 +186,9 @@
       },
       initSupplier() {
         let that = this;
-        findBySelectCus({}).then((res)=>{
+        findBySelectOrgan({}).then((res)=>{
           if(res) {
-            that.supList = res;
+            that.organList = res;
           }
         });
       },