From 57e2eeb66da1003518b6b6f7c4c6f00ceb86d430 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 3 Jul 2024 15:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                   |  6 ++++--
 src/views/invoicing/components/operatingDetail.vue | 11 +++++++++++
 src/views/invoicing/goods_stoks.vue                |  7 ++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index 7029818..f3b05e5 100644
--- a/.env.development
+++ b/.env.development
@@ -4,8 +4,10 @@ ENV = 'development'
 # VUE_APP_BASE_API  = 'http://192.168.2.17:8000'
 # VUE_APP_BASE_API  = 'http://192.168.2.42:8000'
 # VUE_APP_BASE_API  = 'http://192.168.2.133:8000'
-# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
-VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
+# 测试
+VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+# 线上
+# VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 # VUE_APP_BASE_API  = 'http://192.168.2.96:8000'
 VUE_APP_WS_API = 'ws://192.168.2.128:8000'
 
diff --git a/src/views/invoicing/components/operatingDetail.vue b/src/views/invoicing/components/operatingDetail.vue
index 0b09180..726a7db 100644
--- a/src/views/invoicing/components/operatingDetail.vue
+++ b/src/views/invoicing/components/operatingDetail.vue
@@ -13,6 +13,13 @@
                         {{ scope.row.number }} {{ scope.row.unitName }}
                     </template>
                 </el-table-column>
+                <el-table-column label="现有库存" prop="number">
+                    <template v-slot="scope">
+                        {{ returnNowHasNumbr( scope.row)}}
+                       
+                        <!-- {{ scope.row.stockNumber*1 + scope.row.number*1   }} {{ scope.row.unitName }} -->
+                    </template>
+                </el-table-column>
             </el-table>
         </div>
         <div class="head-container">
@@ -43,6 +50,10 @@ export default {
         }
     },
     methods: {
+        //返回现有库存数量
+        returnNowHasNumbr(row){
+            return  row.stockNumber*1 + row.number*1 +row.unitName
+        },
         show(id) {
             this.dialogVisible = true
             this.getTableData(id)
diff --git a/src/views/invoicing/goods_stoks.vue b/src/views/invoicing/goods_stoks.vue
index 8e1a365..2585bcd 100644
--- a/src/views/invoicing/goods_stoks.vue
+++ b/src/views/invoicing/goods_stoks.vue
@@ -67,7 +67,7 @@
             </el-table>
         </div>
         <div class="head-container">
-            <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+            <el-pagination @size-change="paginationSizeChange" :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
                 @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
         </div>
         <invoicingDetail ref="invoicingDetail" />
@@ -174,6 +174,11 @@ export default {
                 console.log(error);
             }
         },
+        // 每页条数改变是回调
+        paginationSizeChange(e){
+            console.log(e);
+            this.tableData.size = e
+        },
         // 分页回调
         paginationChange(e) {
             this.tableData.page = e - 1