From 83658f712c4f8961f99718018d814bee19386b0d Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 21 Jun 2024 17:48:39 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/data_forms.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/home/data_forms.vue b/src/views/home/data_forms.vue
index 2da8c3c..64be13e 100644
--- a/src/views/home/data_forms.vue
+++ b/src/views/home/data_forms.vue
@@ -81,6 +81,11 @@
             ￥{{ scope.row.cash }}
           </template>
         </el-table-column>
+        <el-table-column label="会员支付" prop="deposit">
+          <template v-slot="scope">
+            ￥{{ scope.row.deposit }}
+          </template>
+        </el-table-column>
         <el-table-column label="充值金额" prop="cash">
           <template v-slot="scope">
             ￥{{ scope.row.recharge }}

From cf5860abbcd07997621a4f9ad2f7785a9e0df4d8 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Sat, 22 Jun 2024 09:48:10 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/data_forms.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/home/data_forms.vue b/src/views/home/data_forms.vue
index 64be13e..6e01a8c 100644
--- a/src/views/home/data_forms.vue
+++ b/src/views/home/data_forms.vue
@@ -61,7 +61,7 @@
     <div class="head-container">
       <el-table :data="tableData.data" v-loading="tableData.loading" v-if="orderType == 1">
         <el-table-column label="日期" prop="tradeDay"></el-table-column>
-        <el-table-column label="总金额" prop="total">
+        <el-table-column label="销售额" prop="total">
           <template v-slot="scope">
             ￥{{ scope.row.total }}
           </template>
@@ -86,11 +86,11 @@
             ￥{{ scope.row.deposit }}
           </template>
         </el-table-column>
-        <el-table-column label="充值金额" prop="cash">
+        <!-- <el-table-column label="充值金额" prop="cash">
           <template v-slot="scope">
             ￥{{ scope.row.recharge }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="退款金额" prop="cash">
           <template v-slot="scope">
             ￥{{ scope.row.refund }}

From 72ed4be931e53460f914a6e4ddc869782dd4c979 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Sat, 22 Jun 2024 14:52:19 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/data_forms.vue        | 7 ++++++-
 src/views/invoicing/operation_in.vue | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/home/data_forms.vue b/src/views/home/data_forms.vue
index 6e01a8c..c43bc34 100644
--- a/src/views/home/data_forms.vue
+++ b/src/views/home/data_forms.vue
@@ -61,9 +61,14 @@
     <div class="head-container">
       <el-table :data="tableData.data" v-loading="tableData.loading" v-if="orderType == 1">
         <el-table-column label="日期" prop="tradeDay"></el-table-column>
+        <el-table-column label="营业额" prop="total">
+          <template v-slot="scope">
+            ￥{{ scope.row.total  }}
+          </template>
+        </el-table-column>
         <el-table-column label="销售额" prop="total">
           <template v-slot="scope">
-            ￥{{ scope.row.total }}
+            ￥{{ scope.row.total + scope.row.refund }}
           </template>
         </el-table-column>
         <el-table-column label="微信小程序支付" prop="wxLite">
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 39b7204..5f1f9af 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -32,7 +32,7 @@
                 </el-row>
                 <el-row v-if="shopTypes[shopTypesActive].value == 'purveyor'">
                     <el-col :span="8">
-                        <el-form-item label="应收金额">
+                        <el-form-item label="应付金额">
                             <el-input v-model="queryForm.totalAmount" placeholder="请输入应收金额"
                                 style="width: 220px;"></el-input>
                         </el-form-item>

From e5718694228677ce042f44dc6a261bf22245475b Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Sat, 22 Jun 2024 18:25:48 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/invoicing.js                          |  18 +-
 .../invoicing/components/addSupplier.vue      |   8 +-
 src/views/invoicing/supplier_manage.vue       | 162 ++++++++++++++++++
 .../supplier_manage/purchase_detail.vue       |  85 +++++++--
 src/views/order_manage/order_list.vue         |   4 +-
 5 files changed, 255 insertions(+), 22 deletions(-)
 create mode 100644 src/views/invoicing/supplier_manage.vue

diff --git a/src/api/invoicing.js b/src/api/invoicing.js
index b381534..9c48ac0 100644
--- a/src/api/invoicing.js
+++ b/src/api/invoicing.js
@@ -59,7 +59,14 @@ export function tbShopPurveyorGet(params) {
     params
   });
 }
-
+// 供应商列表1
+export function tbShopPurveyorGets(params) {
+  return request({
+    url: `/api/tbShopPurveyorTransact`,
+    method: "get",
+    params
+  });
+}
 /**
  * 增加供应商
  * @returns
@@ -95,7 +102,14 @@ export function tbShopPurveyorTransactInfo(data) {
     data
   });
 }
-
+// 付款
+export function paidAmount(data) {
+  return request({
+    url: `/api/tbShopPurveyorTransact/payTransact`,
+    method: "post",
+    data
+  });
+}
 /**
  * 进货账目汇总（单一供应商）
  * @returns
diff --git a/src/views/invoicing/components/addSupplier.vue b/src/views/invoicing/components/addSupplier.vue
index 8955efb..b492edd 100644
--- a/src/views/invoicing/components/addSupplier.vue
+++ b/src/views/invoicing/components/addSupplier.vue
@@ -10,9 +10,9 @@
             <el-form-item label="地址">
                 <el-input type="textarea" v-model="form.address" placeholder="请输入地址"></el-input>
             </el-form-item>
-            <el-form-item label="标签">
+            <!-- <el-form-item label="标签">
                 <el-input v-model="form.tip" placeholder="请输入标签"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="备注">
                 <el-input type="textarea" v-model="form.remark" placeholder="请输入备注"></el-input>
             </el-form-item>
@@ -35,7 +35,7 @@ export default {
                 purveyorName: '',
                 purveyorTelephone: '',
                 address: '',
-                tip: '',
+                // tip: '',
                 remark: '',
             },
             rules: {
@@ -85,7 +85,7 @@ export default {
             this.form.purveyorName = ''
             this.form.purveyorTelephone = ''
             this.form.address = ''
-            this.form.tip = ''
+            // this.form.tip = ''
             this.form.remark = ''
         }
     }
diff --git a/src/views/invoicing/supplier_manage.vue b/src/views/invoicing/supplier_manage.vue
new file mode 100644
index 0000000..02c7dbd
--- /dev/null
+++ b/src/views/invoicing/supplier_manage.vue
@@ -0,0 +1,162 @@
+<template>
+    <div class="app-container">
+        <div class="head-container">
+            <div class="filter_wrap">
+                <el-input v-model="query.name" size="small" clearable placeholder="供应商"
+                    @keyup.enter.native="getTableData" style="width: 200px;" />
+                <el-select v-model="query.type" placeholder="选择类型">
+                    <el-option label="进货" value="purveyor"></el-option>
+                    <el-option label="退货" value="reject"></el-option>
+                </el-select>
+                <el-button type="primary" @click="getTableData">查询</el-button>
+                <el-button @click="resetHandle">重置</el-button>
+            </div>
+        </div>
+        <div class="head-container">
+            <el-button type="primary" icon="el-icon-plus" @click="$refs.addSupplier.show()">添加供应商</el-button>
+        </div>
+        <div class="head-container">
+            <el-table :data="tableData.list" v-loading="tableData.loading">
+                <el-table-column label="供应商" prop="purveyorName"></el-table-column>
+                <el-table-column label="联系电话" prop="purveyorTelephone"></el-table-column>
+                <el-table-column label="地址" prop="address"></el-table-column>
+                <!-- <el-table-column label="标签" prop="tip"></el-table-column> -->
+                <el-table-column label="备注" prop="remark"></el-table-column>
+                <el-table-column label="剩余付款金额" prop="waitAmount">
+                    <template v-slot="scope">
+                        <span class="num" v-if="scope.row.waitAmount > 0">￥{{ scope.row.waitAmount }}</span>
+                        <span v-else>-</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="待付款笔数" prop="waitCount">
+                    <template v-slot="scope">
+                        <template v-if="scope.row.waitCount > 0">
+                            有<span class="count">{{ scope.row.waitCount }}笔</span>未付
+                        </template>
+                        <template v-else>-</template>
+                    </template>
+                </el-table-column>
+                <el-table-column label="状态" prop="type">
+                    <template v-slot="scope">
+                        <el-tag :type="scope.row.type == 0 ? 'warning' : 'success'">
+                            {{ scope.row.type == 0 ? '待支付' : '已完结' }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="上笔进货日期" prop="lastTransactAt">
+                    <template v-slot="scope">
+                        {{ scope.row.lastTransactAt && dayjs(scope.row.lastTransactAt).format('YYYY-MM-DD HH:mm:ss') }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="250">
+                    <template v-slot="scope">
+                        <el-button type="text" size="mini" round icon="el-icon-edit"
+                            @click="$refs.addSupplier.show(scope.row)">编辑</el-button>
+                        <el-popconfirm title="确定删除吗？" @confirm="delHandle([scope.row.id])">
+                            <el-button type="text" size="mini" round icon="el-icon-delete" slot="reference">
+                                删除
+                            </el-button>
+                        </el-popconfirm>
+                        <router-link :to="{ name: 'purchase_detail', query: { purveyorId: scope.row.id } }">
+                            <el-button type="text" size="mini">查看详情</el-button>
+                        </router-link>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+            @current-change="paginationChange" @size-change="pagesizeChange"
+            layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        <addSupplier ref="addSupplier" @success="getTableData" />
+    </div>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+import { tbShopPurveyorGets, tbShopPurveyor } from '@/api/invoicing'
+import addSupplier from './components/addSupplier'
+export default {
+    components: {
+        addSupplier
+    },
+    data() {
+        return {
+            dayjs,
+            query: {
+                name: '',
+                type:""
+            },
+            tableData: {
+                page: 0,
+                size: 10,
+                total: 0,
+                sort: 'id',
+                loading: false,
+                list: []
+            }
+        }
+    },
+    mounted() {
+        this.getTableData()
+    },
+    methods: {
+        // 删除
+        async delHandle(ids) {
+            try {
+                await tbShopPurveyor(ids, 'delete')
+                this.$notify({
+                    title: '成功',
+                    message: `删除成功`,
+                    type: 'success'
+                });
+                this.getTableData()
+            } catch (error) {
+                console.log(error)
+            }
+        },
+        async getTableData() {
+            this.tableData.loading = true
+            try {
+                const res = await tbShopPurveyorGets({
+                    page: this.tableData.page,
+                    size: this.tableData.size,
+                    sort: this.tableData.sort,
+                    purveyorName: this.query.name,
+                    type: this.query.type,
+                    shopId: localStorage.getItem('shopId')
+                })
+                this.tableData.loading = false
+                this.tableData.list = res.content
+                this.tableData.total = res.totalElements
+            } catch (error) {
+                console.log(error);
+            }
+        },
+        // 重置查询
+        resetHandle() {
+            this.query.name = ''
+            this.tableData.page = 0;
+            this.getTableData()
+        },
+        pagesizeChange(e) {
+            this.tableData.size = e
+            this.getTableData()
+        },
+        // 分页回调
+        paginationChange(e) {
+            this.tableData.page = e - 1
+            this.getTableData()
+        }
+    }
+}
+</script>
+<style scoped lang="scss">
+.num {
+    color: #F56C6C;
+    font-weight: bold;
+}
+
+.count {
+    color: #409EFF;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/invoicing/supplier_manage/purchase_detail.vue b/src/views/invoicing/supplier_manage/purchase_detail.vue
index 369b486..139b7fa 100644
--- a/src/views/invoicing/supplier_manage/purchase_detail.vue
+++ b/src/views/invoicing/supplier_manage/purchase_detail.vue
@@ -13,9 +13,13 @@
         </div>
         <div class="head-container">
             <div class="filter_wrap">
-                <el-select v-model="query.type" placeholder="付款状态">
+                <el-select v-model="query.status" placeholder="付款状态">
                     <el-option label="待支付" value="0"></el-option>
-                    <el-option label="已完结" value="1"></el-option>
+                    <el-option label="已付款" value="1"></el-option>
+                </el-select>
+                <el-select v-model="query.type" placeholder="选择类型">
+                    <el-option label="进货" value="purveyor"></el-option>
+                    <el-option label="退货" value="reject"></el-option>
                 </el-select>
                 <el-button type="primary" @click="getTableData">查询</el-button>
                 <el-button @click="resetHandle">重置</el-button>
@@ -83,7 +87,7 @@
                 </el-table-column>
                 <el-table-column label="类型" prop="type">
                     <template v-slot="scope">
-                        进货单
+                        {{ scope.row.type == 'purveyor' ? '进货单' : '退货单' }}
                     </template>
                 </el-table-column>
                 <el-table-column label="总金额" prop="totalAmount">
@@ -91,6 +95,13 @@
                         ￥{{ scope.row.totalAmount }}
                     </template>
                 </el-table-column>
+                <el-table-column label="已付款金额" prop="totalAmount">
+                    <template v-slot="scope">
+                        <span style="color: #47B505;">
+                            ￥{{ scope.row.paidAmount }}
+                        </span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="待付款金额" prop="waitAmount">
                     <template v-slot="scope">
                         <span class="num" v-if="scope.row.waitAmount > 0">￥{{ scope.row.waitAmount }}</span>
@@ -110,27 +121,43 @@
                         {{ scope.row.paidAt && dayjs(scope.row.paidAt).format('YYYY-MM-DD HH:mm:ss') }}
                     </template>
                 </el-table-column>
-                <!-- <el-table-column label="操作" width="80">
+                <el-table-column label="操作" width="80" align="center">
                     <template v-slot="scope">
-                        <router-link :to="{ name: 'purchase_detail', query: { purveyorId: scope.row.purveyorId } }">
+                        <!-- <router-link :to="{ name: 'purchase_detail', query: { purveyorId: scope.row.purveyorId } }">
                             <el-button type="text" size="mini">查看详情</el-button>
-                        </router-link>
+                        </router-link> -->
+                        <el-button type="text" size="mini" round @click="Uppop(scope.row.id)">付款</el-button>
                     </template>
-                </el-table-column> -->
+                </el-table-column>
             </el-table>
         </div>
         <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
             @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        <!-- 付款弹窗组件 -->
+        <el-dialog title="" :visible.sync="dialogTableVisible" width="350px">
+            <el-form>
+                <el-form-item label="付款金额" label-width="80px">
+                    <el-input v-model="montey" type="number" autocomplete="off"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="dialogTableVisible = false">取 消</el-button>
+                <el-button type="primary" @click="sumbit()">确 定</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
 import dayjs from 'dayjs'
-import { tbShopPurveyorTransactInfo, dictDetail, tbShopPurveyorTransactSum } from '@/api/invoicing'
+import { tbShopPurveyorTransactInfo, paidAmount, dictDetail, tbShopPurveyorTransactSum } from '@/api/invoicing'
 export default {
     data() {
         return {
+            // 付款当前的id
+            idinfo: "",
             dayjs,
+            dialogTableVisible: false,
             timeList: [
                 {
                     label: '全部',
@@ -179,9 +206,11 @@ export default {
                     label: '作废'
                 }
             ],
+            montey: null,
             selectCount: 0,
             query: {
                 type: '',
+                status: '',
                 time: 'all',
                 createdAt: []
             },
@@ -198,9 +227,29 @@ export default {
     },
     mounted() {
         this.getTableData()
-        this.tbShopPurveyorTransactSum()
     },
     methods: {
+        Uppop(id) {
+            this.dialogTableVisible = true
+            this.idinfo = id
+        },
+        async sumbit() {
+            try {
+                const res = await paidAmount({
+                    id: this.idinfo,
+                    paidAmount: this.montey,
+                })
+
+                this.$message({ type: 'success', message: '付款成功!' });
+                setTimeout(() => {
+                    this.dialogTableVisible = false
+                    this.getTableData()
+                }, 1500);
+
+            } catch (error) {
+                console.log(error);
+            }
+        },
         async getTableData() {
             this.tableData.loading = true
             try {
@@ -209,13 +258,14 @@ export default {
                     size: this.tableData.size,
                     sort: this.tableData.sort,
                     purveyorId: this.$route.query.purveyorId,
-                    status: this.query.type,
-                    type: 'purveyor',
-                    createdAt: this.query.createdAt
+                    status: this.query.status,
+                    type: this.query.type,
+                    createdAt: this.query.createdAt,
                 })
                 this.tableData.loading = false
                 this.tableData.list = res.content
                 this.tableData.total = res.totalElements
+                this.tbShopPurveyorTransactSum()
             } catch (error) {
                 console.log(error);
             }
@@ -225,6 +275,8 @@ export default {
             this.query.time = 'all'
             this.query.createdAt = []
             this.tableData.page = 0;
+            this.query.type = ''
+            this.query.status = ''
             this.getTableData()
         },
         // 分页回调
@@ -266,7 +318,7 @@ export default {
             this.selectCount = selection.length
         },
         async tbShopPurveyorTransactSum() {
-            this.info = await tbShopPurveyorTransactSum({ purveyorId: this.$route.query.purveyorId, type: 'purveyor' })
+            this.info = await tbShopPurveyorTransactSum({ purveyorId: this.$route.query.purveyorId, type: this.query.type })
         }
     }
 }
@@ -354,4 +406,9 @@ export default {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
+<!-- <style>
+ /deep/ .el-dialog__body{
+    padding-right: 20px!important;
+}
+</style> -->
\ No newline at end of file
diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue
index d7f3a82..de42361 100644
--- a/src/views/order_manage/order_list.vue
+++ b/src/views/order_manage/order_list.vue
@@ -75,7 +75,7 @@
     </div>
     <div class="head-container">
       <div class="collect_wrap">
-        <div class="item">
+        <!-- <div class="item">
           <div class="icon_wrap" style="--bg-color:#C978EE">
             <i class="icon el-icon-s-goods"></i>
           </div>
@@ -83,7 +83,7 @@
             <div class="m">￥{{ payCountTotal }}</div>
             <div class="t">总金额</div>
           </div>
-        </div>
+        </div> -->
         <div class="item" v-for="item in payCountList" :key="item.payType">
           <div class="icon_wrap" style="--bg-color:#fff">
             <el-image class="img" :src="item.icon"></el-image>

From d51dd3382d7c7e6c76a17a27fc2aba6ffb6ba01f Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 24 Jun 2024 17:23:26 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/invoicing.js                |  26 +++++-
 src/views/invoicing/goods_stoks.vue | 118 ++++++++++++++++++++++++----
 2 files changed, 125 insertions(+), 19 deletions(-)

diff --git a/src/api/invoicing.js b/src/api/invoicing.js
index 9c48ac0..58b107b 100644
--- a/src/api/invoicing.js
+++ b/src/api/invoicing.js
@@ -163,19 +163,26 @@ export function tbProductStockOperateOutAndOn(data) {
  */
 export function stock(params) {
   return request({
-    url: `/api/stock`,
+    url: `/api/stock/v2`,
+    method: "get",
+    params
+  });
+}
+// 库存列表子集列表
+export function stocks(params) {
+  return request({
+    url: `/api/stock/sku`,
     method: "get",
     params
   });
 }
-
 /**
  * 导出数据
  * @returns
  */
 export function stockdownload(data) {
   return request({
-    url: "/api/stock/download",
+    url: "/api/stock/download/v2",
     method: "post",
     data: {
       shopId: localStorage.getItem("shopId"),
@@ -194,7 +201,7 @@ export function stockdoImport(file) {
   formData.append("file", file);
   formData.append("shopId", localStorage.getItem("shopId"));
   return request({
-    url: "/api/stock/doImport",
+    url: "/api/stock/doImport/v2",
     method: "post",
     data: formData,
     Headers: {
@@ -217,3 +224,14 @@ export function stockStateChange(params) {
     }
   });
 }
+// 共享库存
+export function stockStateChanges(params) {
+  return request({
+    url: `/api/stock/productStatus`,
+    method: "put",
+    data: {
+      shopId: localStorage.getItem("shopId"),
+      ...params
+    }
+  });
+}
\ No newline at end of file
diff --git a/src/views/invoicing/goods_stoks.vue b/src/views/invoicing/goods_stoks.vue
index 8e1a365..157a4a6 100644
--- a/src/views/invoicing/goods_stoks.vue
+++ b/src/views/invoicing/goods_stoks.vue
@@ -23,8 +23,9 @@
             </div>
         </div>
         <div class="head-container">
-            <el-table :data="tableData.list" v-loading="tableData.loading">
-                <el-table-column label="商品信息">
+            <el-table :data="tableData.list" v-loading="tableData.loading" row-key="id" lazy :load="load"
+                :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+                <el-table-column label="商品信息" width="200px">
                     <template v-slot="scope">
                         <div class="shop_info">
                             <el-image :src="scope.row.img" class="cover">
@@ -43,22 +44,35 @@
                 </el-table-column>
                 <el-table-column label="规格" prop="number">
                     <template v-slot="scope">
-                        {{scope.row.specSnap }}
+                        {{ scope.row.specSnap }}
                     </template>
                 </el-table-column>
                 <el-table-column label="库存" prop="number">
                     <template v-slot="scope">
-                        {{ `${scope.row.number} ${scope.row.unitName}` }}
+                        {{ `${scope.row.stockNumber} ${scope.row.unitName}` }}
                     </template>
                 </el-table-column>
- 
+
                 <el-table-column label="库存开关">
                     <template v-slot="scope">
                         <el-switch v-model="scope.row.isStock" :active-value="1" :inactive-value="0"
+                            v-if="scope.row.hasChildren || scope.row.hasChildren == false"
                             @change="showChange($event, scope.row)"></el-switch>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="100">
+                <el-table-column label="共享库存">
+                    <template v-slot="scope">
+                        <el-switch v-model="scope.row.isDistribute" :active-value="1" :inactive-value="0"
+                            v-if="scope.row.hasChildren || scope.row.hasChildren == false"
+                            @change="showChanges($event, scope.row, 'proId', 'distribute')"></el-switch>
+                    </template>
+                </el-table-column> <el-table-column label="售罄">
+                    <template v-slot="scope">
+                        <el-switch v-model="scope.row.isPauseSale" :active-value="1" :inactive-value="0"
+                            @change="showChangess($event, scope.row)"></el-switch>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="220">
                     <template v-slot="scope">
                         <el-button type="text" size="mini"
                             @click="$refs.invoicingDetail.show(scope.row)">库存记录</el-button>
@@ -79,7 +93,7 @@
 </template>
 
 <script>
-import { stock, stockdownload, stockdoImport, stockStateChange } from '@/api/invoicing'
+import { stock, stockdownload, stockdoImport, stockStateChange, stockStateChanges, stocks } from '@/api/invoicing'
 import settings from '@/settings'
 import invoicingDetail from './components/invoicingDetail'
 import UploadExcel from '@/components/UploadExcel/'
@@ -113,6 +127,31 @@ export default {
         this.getTableData()
     },
     methods: {
+        async load(tree, treeNode, resolve) {
+            const res = await stocks({
+                productId: tree.proId,
+            })
+            let arr = res.map(ele => ele)
+            console.log(res, '调试1')
+            console.log(arr, '调试2')
+            setTimeout(() => {
+                resolve(arr)
+            }, 1000);
+            // resolve([
+            //     {
+            //         id: 31,
+            //         date: '2016-05-01',
+            //         name: '王小虎',
+            //         address: '上海市普陀区金沙江路 1519 弄'
+            //     }, {
+            //         id: 32,
+            //         date: '2016-05-01',
+            //         name: '王小虎',
+            //         address: '上海市普陀区金沙江路 1519 弄'
+            //     }
+            // ])
+
+        },
         async excelSuccessUpload(file) {
             console.log(file);
             try {
@@ -121,6 +160,7 @@ export default {
                 const res = await stockdoImport(file)
                 this.uploadLoading = false
                 this.$notify.success('导入成功')
+                this.tableData.list = []
                 this.getTableData()
             } catch (error) {
                 this.dialogVisible = false
@@ -146,15 +186,45 @@ export default {
         },
         // 状态切换
         async showChange(e, row) {
-            try {
-                await stockStateChange({
-                    proId: row.proId,
-                    isStock: row.isStock
+            await stockStateChanges({
+                "updateKey": 'stock',
+                "updateValue": row.isStock,
+                "targetId": row.proId,
+                shopId: localStorage.getItem('shopId')
+
+            })
+
+        },
+        // 共享库存
+        async showChanges(e, row, name, value) {
+            await stockStateChanges({
+                "updateKey": value,
+                "updateValue": row.isDistribute,
+                "targetId": row[name],
+                shopId: localStorage.getItem('shopId')
+
+            })
+        },
+        // 售罄
+        async showChangess(e, row) {
+            if (row.hasChildren || row.hasChildren == false) {
+                await stockStateChanges({
+                    "updateKey": 'pauseSale',
+                    "updateValue": row.isPauseSale,
+                    "targetId": row.proId,
+                    shopId: localStorage.getItem('shopId')
+
+                })
+            } else {
+                await stockStateChanges({
+                    "updateKey": 'pauseSaleSku',
+                    "updateValue": row.isPauseSale,
+                    "targetId": row.skuId,
+                    shopId: localStorage.getItem('shopId')
+
                 })
-                this.getTableData()
-            } catch (error) {
-                console.error(error);
             }
+
         },
         async getTableData() {
             this.tableData.loading = true
@@ -168,8 +238,18 @@ export default {
                     shopId: localStorage.getItem('shopId')
                 })
                 this.tableData.loading = false
-                this.tableData.list = res.content
                 this.tableData.total = res.totalElements
+                // 多规格数据处理
+                res.content.forEach(element => {
+                    if (element.type == '多规格' && element.isDistribute == 0) {
+                        element.hasChildren = true
+                    } else {
+                        element.hasChildren = false
+
+                    }
+                });
+                this.tableData.list = res.content
+
             } catch (error) {
                 console.log(error);
             }
@@ -177,6 +257,7 @@ export default {
         // 分页回调
         paginationChange(e) {
             this.tableData.page = e - 1
+            this.tableData.list = []
             this.getTableData()
         },
         // 重置查询
@@ -185,6 +266,7 @@ export default {
             this.query.num = ''
             this.query.isStock = ''
             this.tableData.page = 0;
+            this.tableData.list = []
             this.getTableData()
         }
     }
@@ -222,4 +304,10 @@ export default {
         gap: 10px;
     }
 }
+</style>
+<style>
+.cell {
+    display: flex;
+    align-items: center;
+}
 </style>
\ No newline at end of file

From 14bf3f4ac8881b7b490bf88d005c094d0df99b63 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 26 Jun 2024 09:09:51 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/data_forms.vue                     |  9 +++++++--
 src/views/order_manage/components/orderDetail.vue |  2 +-
 src/views/order_manage/order_list.vue             | 14 ++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/home/data_forms.vue b/src/views/home/data_forms.vue
index c43bc34..86f3373 100644
--- a/src/views/home/data_forms.vue
+++ b/src/views/home/data_forms.vue
@@ -63,12 +63,12 @@
         <el-table-column label="日期" prop="tradeDay"></el-table-column>
         <el-table-column label="营业额" prop="total">
           <template v-slot="scope">
-            ￥{{ scope.row.total  }}
+            ￥{{ scope.row.total }}
           </template>
         </el-table-column>
         <el-table-column label="销售额" prop="total">
           <template v-slot="scope">
-            ￥{{ scope.row.total + scope.row.refund }}
+            ￥{{ scope.row.total | totalfilter(scope.row.refund) }}
           </template>
         </el-table-column>
         <el-table-column label="微信小程序支付" prop="wxLite">
@@ -106,6 +106,7 @@
         <el-table-column label="商品名称" prop="productName"></el-table-column>
         <el-table-column label="商品分类" prop="cateName"></el-table-column>
         <el-table-column label="商品描述" prop="productSkuName"></el-table-column>
+        <el-table-column label="单价" prop="price"></el-table-column>
         <el-table-column label="销量" prop="salesNum"></el-table-column>
         <el-table-column label="退单量" prop="refNum"></el-table-column>
         <el-table-column label="销售金额" prop="salesAmount">
@@ -161,6 +162,10 @@ export default {
   filters: {
     timeFilter(time) {
       return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
+    },
+    totalfilter(item,d) {
+      let num = item + d
+      return num.toFixed(2)
     }
   },
   mounted() {
diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue
index d61a119..117490d 100644
--- a/src/views/order_manage/components/orderDetail.vue
+++ b/src/views/order_manage/components/orderDetail.vue
@@ -142,7 +142,7 @@
                   </div>
                 </div>
               </div>
-              <div class="foot">退款：￥-{{ item.refundAmount }}</div>
+              <div class="foot">退款：￥-{{ item.orderAmount }}</div>
             </div>
           </div>
         </el-tab-pane>
diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue
index de42361..cd3afe0 100644
--- a/src/views/order_manage/order_list.vue
+++ b/src/views/order_manage/order_list.vue
@@ -123,10 +123,8 @@
                     {{ item.productName }}
                     <span
                       class="refund"
-                      v-if="
-                        item.status == 'refunding' || item.status == 'refund'
-                      "
-                      >(退 - {{ item.num }})</span
+                      v-if="item.refundNumber"
+                      >(退 - {{ item.refundNumber }})</span
                     >
                   </div>
                   <div class="sku">{{ item.productSkuName }}</div>
@@ -140,13 +138,13 @@
             <div>{{ scope.row.orderType | orderTypeFilter }}</div>
             <div
               class="refund"
-              v-if="
-                scope.row.status == 'refunding' || scope.row.status == 'refund'
+              v-if="  
+                scope.row.orderType == 'return'
               "
             >
-              退款：-￥{{ scope.row.refundAmount }}
+              退款：-￥{{ scope.row.orderAmount }}
             </div>
-            <div>￥{{ scope.row.orderAmount }}</div>
+            <div v-else>￥{{ scope.row.orderAmount }}</div>
           </template>
         </el-table-column>
         <el-table-column label="状态">

From ac96e0f3e081bbd1fe56f9c260f054c1287477e9 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 26 Jun 2024 11:11:59 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     |  4 ++--
 src/api/invoicing.js                 |  3 ++-
 src/components/shopList/index.vue    | 15 ++++++++++++++-
 src/views/invoicing/operation_in.vue |  8 +++++---
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index 7029818..363647d 100644
--- a/.env.development
+++ b/.env.development
@@ -3,9 +3,9 @@ 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  = 'http://192.168.2.147:8000'
 # VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
-VUE_APP_BASE_API  = 'https://cashieradmin.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/api/invoicing.js b/src/api/invoicing.js
index 58b107b..85d75e4 100644
--- a/src/api/invoicing.js
+++ b/src/api/invoicing.js
@@ -54,11 +54,12 @@ export function tbProductStockDetailSum(params) {
  */
 export function tbShopPurveyorGet(params) {
   return request({
-    url: `/api/tbShopPurveyor`,
+    url: `/api/tbProduct/admin`,
     method: "get",
     params
   });
 }
+
 // 供应商列表1
 export function tbShopPurveyorGets(params) {
   return request({
diff --git a/src/components/shopList/index.vue b/src/components/shopList/index.vue
index 232270e..e24f0ad 100644
--- a/src/components/shopList/index.vue
+++ b/src/components/shopList/index.vue
@@ -30,6 +30,19 @@
                         </div>
                     </template>
                 </el-table-column>
+                <el-table-column label="规格">
+                    <template v-slot="scope">
+                        {{ scope.row.typeEnum }}
+                    </template>
+                </el-table-column> <el-table-column label="是否售罄">
+                    <template v-slot="scope">
+                        {{ scope.row.isPauseSale == 1?'是':'否' }}
+                    </template>
+                </el-table-column> <el-table-column label="是否分销">
+                    <template v-slot="scope">
+                        {{ scope.row.isDistribute == 1?'是':'否' }}
+                    </template>
+                </el-table-column>
                 <el-table-column label="售价">
                     <template v-slot="scope">
                         ￥{{ scope.row.lowPrice }}
@@ -40,7 +53,7 @@
                         {{ scope.row.realSalesNumber }}/{{ scope.row.stockNumber }}
                     </template>
                 </el-table-column>
-                <el-table-column label="分类" prop="categoryName"></el-table-column>
+                <el-table-column label="分类名称" prop="categoryName"></el-table-column>
             </el-table>
         </div>
         <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 5f1f9af..206a408 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -89,8 +89,8 @@
                 </el-table-column>
                 <el-table-column label="进价">
                     <template v-slot="scope">
-                        <!-- <el-input-number v-model="scope.row.guidePrice" :min="0" controls-position="right"
-                            @change="e => scope.row.totalAmount = e * scope.row.number"></el-input-number> -->
+                        <el-input-number v-model="scope.row.guidePrice" :min="0" controls-position="right"
+                            @change="e => { scope.row.costPrice = e }"></el-input-number>
                         <div class="tips">成本价￥{{ scope.row.costPrice }}/{{ scope.row.unitName }}</div>
                     </template>
                 </el-table-column>
@@ -178,7 +178,7 @@ export default {
                 purveyorId: [
                     {
                         required: true,
-                        message: ' ',
+                        message: '请选择供应商',
                         trigger: 'change'
                     }
                 ],
@@ -202,6 +202,7 @@ export default {
         this.tbShopPurveyorGet()
     },
     methods: {
+      
         // 提交
         submitHandle() {
             this.$refs.queryForm.validate(async valid => {
@@ -209,6 +210,7 @@ export default {
                     try {
                         this.queryFormLoading = true
                         this.queryForm.list = this.tableData.list
+                        console.log(this.queryForm,'调试costPrice')
                         await tbProductStockOperateOutAndOn(this.queryForm)
                         this.queryFormLoading = false
                         this.showResult = true

From 0d42d145af8fee994f2023316c602fa56a9caaf0 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 26 Jun 2024 13:57:10 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     | 4 ++--
 .env.production                      | 4 ++--
 src/api/invoicing.js                 | 3 +--
 src/api/shop.js                      | 2 +-
 src/views/invoicing/operation_in.vue | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.env.development b/.env.development
index 363647d..ad2c296 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@ 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.147:8000'
-# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+# 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  = 'http://192.168.2.96:8000'
 VUE_APP_WS_API = 'ws://192.168.2.128:8000'
diff --git a/.env.production b/.env.production
index ffc2fc2..3b02e74 100644
--- a/.env.production
+++ b/.env.production
@@ -2,8 +2,8 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-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  = 'https://admintestpapi.sxczgkj.cn'
 # VUE_APP_BASE_API  = 'http://192.168.2.98:8000'
 # 如果接口是 http 形式， wss 需要改为 ws
 VUE_APP_WS_API = 'wss://123.56.110.252
diff --git a/src/api/invoicing.js b/src/api/invoicing.js
index 85d75e4..58b107b 100644
--- a/src/api/invoicing.js
+++ b/src/api/invoicing.js
@@ -54,12 +54,11 @@ export function tbProductStockDetailSum(params) {
  */
 export function tbShopPurveyorGet(params) {
   return request({
-    url: `/api/tbProduct/admin`,
+    url: `/api/tbShopPurveyor`,
     method: "get",
     params
   });
 }
-
 // 供应商列表1
 export function tbShopPurveyorGets(params) {
   return request({
diff --git a/src/api/shop.js b/src/api/shop.js
index 5891ae2..a5e27ff 100644
--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -6,7 +6,7 @@ import request from "@/utils/request";
  */
 export function tbProduct(params) {
   return request({
-    url: "/api/tbProduct",
+    url: "/api/tbProduct/list",
     method: "get",
     params
   });
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 206a408..2663d9d 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -89,7 +89,7 @@
                 </el-table-column>
                 <el-table-column label="进价">
                     <template v-slot="scope">
-                        <el-input-number v-model="scope.row.guidePrice" :min="0" controls-position="right"
+                        <el-input-number v-model="scope.row.costPrice" :min="0" controls-position="right"
                             @change="e => { scope.row.costPrice = e }"></el-input-number>
                         <div class="tips">成本价￥{{ scope.row.costPrice }}/{{ scope.row.unitName }}</div>
                     </template>