From d40d76d5b931b7094e843ac9ec552567f225721d Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 25 Jul 2025 16:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/foodManage/dashboard/PanelGroup.vue    |  6 +++---
 src/views/foodManage/index.vue                   | 16 ++++++++--------
 .../stockReport/inoutDetails/index.vue           |  6 +++---
 vue.config.js                                    |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/foodManage/dashboard/PanelGroup.vue b/src/views/foodManage/dashboard/PanelGroup.vue
index 45eeb57d..ab64365f 100644
--- a/src/views/foodManage/dashboard/PanelGroup.vue
+++ b/src/views/foodManage/dashboard/PanelGroup.vue
@@ -9,15 +9,15 @@
           <count-to :start-val="0" :end-val="item.num" :duration="2000" class="card-panel-num" />
         </div>
         <div>
-          <div style="display: flex;justify-content: space-between;width: 70%;" v-if="Number(item.rate)>=0">
+          <div style="display: flex;width: 100%;" v-if="Number(item.rate)>=0">
             <div style="font-size: 0.75rem;color: #07B78A;">
-              同比上次  +{{item.rate}}％
+              同比上次  +{{ item.rate }}％
             </div>
             <div>
               <img src="@/assets/images/up.png" style="width: 18px;height: 18px;">
             </div>
           </div>
-          <div style="display: flex;justify-content: space-between;width: 70%;" v-if="Number(item.rate)<0">
+          <div style="display: flex;width: 100%;" v-if="Number(item.rate)<0">
             <div style="font-size: 0.75rem;color: #d81e06;">
               同比上次  {{item.rate}}％
             </div>
diff --git a/src/views/foodManage/index.vue b/src/views/foodManage/index.vue
index 0c6f0c38..986a90c9 100644
--- a/src/views/foodManage/index.vue
+++ b/src/views/foodManage/index.vue
@@ -181,41 +181,41 @@ export default {
           this.topAreaOptions = [
             {
               "num": response.data.totalOrderAmount.thisNum,
-              "rate": response.data.totalOrderAmount.percent,
+              "rate": response.data.totalOrderAmount.percent+'',
               "name": "采购订单总额（元）"
             },{
               "num": response.data.totalOrderNum.thisNum,
-              "rate": response.data.totalOrderNum.percent,
+              "rate": response.data.totalOrderNum.percent+'',
               "name": "采购订单数量（个）"
             },
             {
               "num": response.data.unFinshOrderNum.thisNum,
-              "rate": response.data.unFinshOrderNum.percent,
+              "rate": response.data.unFinshOrderNum.percent+'',
               "name": "未验收完成采购订单数（个）"
             },
             {
               "num": response.data.totalOrderGoodsNum.thisNum,
-              "rate": response.data.totalOrderGoodsNum.percent,
+              "rate": response.data.totalOrderGoodsNum.percent+'',
               "name": "采购订单货品总数"
             },
             {
               "num": response.data.storeNum.thisNum,
-              "rate": response.data.storeNum.percent,
+              "rate": response.data.storeNum.percent+'',
               "name": "入库货品数量"
             },
             {
               "num": response.data.outboundNum.thisNum,
-              "rate": response.data.outboundNum.percent,
+              "rate": response.data.outboundNum.percent+'',
               "name": "出库货品数量"
             },
             {
               "num": response.data.storeAmount.thisNum,
-              "rate": response.data.storeAmount.percent,
+              "rate": response.data.storeAmount.percent+'',
               "name": "入库总金额（元）"
             },
             {
               "num": response.data.outboundAmount.thisNum,
-              "rate": response.data.outboundAmount.percent,
+              "rate": response.data.outboundAmount.percent+'',
               "name": "出库总金额（元）"
             }
           ]; 
diff --git a/src/views/foodManage/stockReport/inoutDetails/index.vue b/src/views/foodManage/stockReport/inoutDetails/index.vue
index c3220a34..82da2010 100644
--- a/src/views/foodManage/stockReport/inoutDetails/index.vue
+++ b/src/views/foodManage/stockReport/inoutDetails/index.vue
@@ -33,7 +33,7 @@
                 <el-row :gutter="10" class="mb8"> 
                     <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
                 </el-row> 
-                <el-table v-loading="loading" :data="tableListData" height="800"> 
+                <el-table v-loading="loading" :data="tableListData"> 
                     <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
                         <template slot-scope="scope">
                         <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
@@ -46,7 +46,7 @@
                     <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="发生时间" align="center" prop="outDate" :show-overflow-tooltip="true" /> 
-                    <el-table-column label="发生人员" align="center" prop="userId" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="发生人员" align="center" prop="fetchUserName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="数据来源" align="center" prop="" :show-overflow-tooltip="true" /> 
                     <el-table-column label="出入库类型" align="center" prop="outType" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
@@ -112,7 +112,7 @@
                 <el-row :gutter="10" class="mb8"> 
                     <right-toolbar :showSearch.sync="showSearch" @queryTable="getList2"></right-toolbar>
                 </el-row> 
-                <el-table v-loading="loading" :data="tableListData2" height="800">
+                <el-table v-loading="loading" :data="tableListData2">
                     <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
                         <template slot-scope="scope">
                         <span>{{(queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index + 1}}</span>
diff --git a/vue.config.js b/vue.config.js
index d7c3df52..3ceb2128 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,8 +36,8 @@ module.exports = {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
                 // target: `http://192.168.2.75:48380`,//旭
-                target: `http://192.168.0.244:48380`,//测试
-                // target: `http://192.168.0.176:48380`,//刘鑫
+                // target: `http://192.168.0.244:48380`,//测试
+                target: `http://192.168.0.176:48380`,//刘鑫
                 // target: `http://192.168.0.44:48380`,//测试
                 // target: `http://192.168.0.176:48380`,//
                 changeOrigin: true,