From b8328b804700cd91547f480670fd50e50b4396dc Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 11 Sep 2025 16:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foodManage/stockManage/inventoryCount/edit.vue |  2 +-
 .../stockManage/inventoryCount/index.vue           | 12 ++++++------
 .../foodManage/stockManage/warehouseIn/edit.vue    |  1 +
 .../foodManage/stockManage/warehouseOut/edit.vue   | 14 +++++++-------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/foodManage/stockManage/inventoryCount/edit.vue b/src/views/foodManage/stockManage/inventoryCount/edit.vue
index e2e31a32..b3f715e0 100644
--- a/src/views/foodManage/stockManage/inventoryCount/edit.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/edit.vue
@@ -90,7 +90,7 @@
                     </el-table-column> 
                     <el-table-column label="差异数" align="center" prop="" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.actualNum-scope.row.bookNum }}</span>
+                            <span>{{ (scope.row.actualNum-scope.row.bookNum).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
                      <!-- <el-table-column label="差异总额（元）" align="center" prop="" :show-overflow-tooltip="true" width="120">
diff --git a/src/views/foodManage/stockManage/inventoryCount/index.vue b/src/views/foodManage/stockManage/inventoryCount/index.vue
index 9dc3e5dc..352ddd85 100644
--- a/src/views/foodManage/stockManage/inventoryCount/index.vue
+++ b/src/views/foodManage/stockManage/inventoryCount/index.vue
@@ -65,14 +65,14 @@
         <el-table-column label="盘点单号" align="center" prop="checkCode" :show-overflow-tooltip="true" /> 
         <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="firstCheckUser" :show-overflow-tooltip="true" />
+        <el-table-column label="盘点员" align="center" prop="firstCheckUserName" :show-overflow-tooltip="true" />
         <el-table-column label="盘点开始时间" align="center" prop="firstCheckDate" :show-overflow-tooltip="true" width="150"/>  
         <el-table-column label="盘点结束时间" align="center" prop="secondCheckDate" :show-overflow-tooltip="true" width="150"/>  
-        <el-table-column label="差异总数" align="center" prop="" :show-overflow-tooltip="true" width="120"/>   
-        <el-table-column label="差异总额（元）" align="center" prop="" :show-overflow-tooltip="true" width="120">
-            <!-- <template slot-scope="scope">
-               <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
-            </template>   -->
+        <el-table-column label="差异总数" align="center" prop="differNum" :show-overflow-tooltip="true" width="120"/>   
+        <el-table-column label="差异总额（元）" align="center" prop="totalProfitLoss" :show-overflow-tooltip="true" width="120">
+            <template slot-scope="scope">
+               <span>{{ (scope.row.totalProfitLoss/100).toFixed(2) }}</span>
+            </template>  
         </el-table-column>
         <!-- <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150"/>   -->
diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index 82929b22..820f3710 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -265,6 +265,7 @@ export default {
             contractType:undefined,
             areaId:undefined,
             canteenId:undefined,  
+            intoDate:new Date()
         },
         // 表单校验
         baseRules: {
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index a6c802df..60ca41f1 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -69,11 +69,11 @@
                     <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"> 
                     </el-table-column> 
-                    <el-table-column label="金额(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
-                           <template slot-scope="scope"> 
+                    <!-- <el-table-column label="金额(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
+                        <template slot-scope="scope"> 
                             <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
                         </template>
-                    </el-table-column>   
+                    </el-table-column>    -->
                     <el-table-column label="入库时间" align="center" prop="createTime" :show-overflow-tooltip="true"/> 
                     <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
                     <el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
@@ -81,7 +81,7 @@
                             <el-input v-if="!baseInfo.fetchMaterialId" v-model="scope.row.fetchNum" placeholder="请输入" maxlength="8" clearable @change="patternValue(scope.row)"/>
                             <span v-else>{{ scope.row.fetchNum }}</span>
                         </template>
-                    </el-table-column>  
+                    </el-table-column>
                 </el-table>
             </div>
         </div>
@@ -135,11 +135,11 @@
                             <span v-if="scope.row.salesMode==2">称重</span>
                         </template> -->
                     </el-table-column> 
-                    <el-table-column label="单价" align="center" prop="unitPrice" :show-overflow-tooltip="true" >
+                    <!-- <el-table-column label="单价" align="center" prop="unitPrice" :show-overflow-tooltip="true" >
                         <template slot-scope="scope"> 
                             <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
                         </template>
-                    </el-table-column>  
+                    </el-table-column>   -->
                     <el-table-column label="货品库存" align="center" prop="materialNum" :show-overflow-tooltip="true" />  
                     
                 </el-table>
@@ -265,7 +265,7 @@ export default {
             disabledDate(v) {
                 return v.getTime() > (new Date().getTime() + 86400000);//  - 86400000是否包括当天
             }
-        }, 
+        },
         materialList:[],//货品信息-表格数据
         batchIds:[],//货品信息-表格数据-多选
         openDialog:false,