From 44aecc47333d587b52ba755bbdcdba54ad19aee9 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 9 Jul 2025 14:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockManage/totalStock/index.vue          | 10 +++++--
 .../stockManage/warehouseIn/detail.vue        |  4 +--
 .../stockManage/warehouseOut/detail.vue       |  4 +--
 .../stockManage/warehouseOut/edit.vue         | 29 +++++++------------
 .../stockManage/warehouseOut/index.vue        |  4 +--
 5 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/views/foodManage/stockManage/totalStock/index.vue b/src/views/foodManage/stockManage/totalStock/index.vue
index f4a65291..55c918a8 100644
--- a/src/views/foodManage/stockManage/totalStock/index.vue
+++ b/src/views/foodManage/stockManage/totalStock/index.vue
@@ -64,7 +64,7 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="货品编码" align="center" prop="" :show-overflow-tooltip="true" />
+      <el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
       <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true"/>
       <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
       <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="120"/>
@@ -73,7 +73,11 @@
       <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/> 
       <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true" width="120"/>
-      <el-table-column label="库存金额" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="库存金额" align="center" prop="totalPrice" :show-overflow-tooltip="true" width="120">
+        <template slot-scope="scope">
+          <span>{{ (scope.row.totalPrice/100).toFixed(2) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.inventoryStatus==1">正常</span>
@@ -81,7 +85,7 @@
           <span v-if="scope.row.inventoryStatus==3">超额</span>
         </template>
       </el-table-column>
-      <el-table-column label="总库存数" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="总库存数" align="center" prop="totalNum" :show-overflow-tooltip="true" width="120"/>
     </el-table>
 
     <pagination
diff --git a/src/views/foodManage/stockManage/warehouseIn/detail.vue b/src/views/foodManage/stockManage/warehouseIn/detail.vue
index 18023dc4..270f4ed1 100644
--- a/src/views/foodManage/stockManage/warehouseIn/detail.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/detail.vue
@@ -44,7 +44,7 @@
             </div>
             <div style="width: 100%;height: 400px;overflow-y: auto;">
                 <el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+                    <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
                     <el-table-column label="序号" align="center" width="80" type="index" />
                     <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
                     <el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" /> 
@@ -68,7 +68,7 @@
                     <el-table-column label="入库数量" align="center" prop="purNum" :show-overflow-tooltip="true"></el-table-column> 
                     <el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.purNum*scope.row.unitPrice }}</span>
+                            <span>{{ scope.row.purNum*scope.row.unitPrice/100 }}</span>
                         </template>
                     </el-table-column> 
                      
diff --git a/src/views/foodManage/stockManage/warehouseOut/detail.vue b/src/views/foodManage/stockManage/warehouseOut/detail.vue
index 900dd130..28d5e155 100644
--- a/src/views/foodManage/stockManage/warehouseOut/detail.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/detail.vue
@@ -172,12 +172,12 @@ export default {
         getContractInfo(){
             console.log(this.pageJson) 
             let param = {
-                orderGoodsId:this.pageJson.orderGoodsId
+                outId:this.pageJson.outId
             }
             //查询查询食堂下拉结构
             getWarehouseOutInfoApi(param).then((response) => {
                 this.baseInfo = response.data;
-                this.materialLis = this.baseInfo.orderGoodsDetailList;  
+                this.materialLis = this.baseInfo.imsOutInventoryDetailVOList;  
             }); 
         },  
         // 多选框选中数据
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index 4e6af3e0..fa7e73d1 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -234,13 +234,13 @@ export default {
         getContractInfo(){
             console.log(this.pageJson) 
             let param = {
-                orderGoodsId:this.pageJson.orderGoodsId
+                outId:this.pageJson.outId
             }
             //查询查询食堂下拉结构
             getWarehouseOutInfoApi(param).then((response) => {
                 this.baseInfo = response.data; 
-                this.materialList = this.baseInfo.imsOutInventoryDetailAddList; 
-                // this.materialList.forEach(item=>{
+                this.materialList = this.baseInfo.imsOutInventoryDetailVOList; 
+                // this.materialList.forEach(item=>{ 
                 //     this.$set(item,"unitPrice",Number(item.unitPrice)/100) 
                 // }) 
                 drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => {
@@ -343,8 +343,7 @@ export default {
         handleSelectionChange2(selection) {
             this.batchChosenMaterial = selection;
             this.batchChosenMaterial.forEach(item=>{
-                this.$set(item,"fetchNum",0) 
-                // this.$set(item,"unitPrice",item.unitPrice/100) 
+                this.$set(item,"fetchNum",0)  
             })
         },
         confirmChosen(){
@@ -373,11 +372,8 @@ export default {
                             if(item.fetchNum==0){
                                 this.noMaterial = true
                             }else{
-                                let obj = Object.assign({}, item)
-                                // obj.unitPrice = Number(obj.unitPrice)*100 
-                                // obj.totalPrice =  (Number(obj.unitPrice)*Number(obj.fetchNum)) 
-                                // param.totalAmount = param.totalAmount+obj.totalPrice; 
-                                // param.totalNum = param.totalNum+Number(obj.fetchNum)
+                                let obj = Object.assign({}, item)   
+                                param.totalNum = param.totalNum+Number(obj.fetchNum)
                                 param.imsOutInventoryDetailAddList.push(obj)
                             } 
                         }) 
@@ -394,7 +390,7 @@ export default {
                             this.$modal.msgError("请添加货品！");
                         }else{
                             this.loadingBtn=true;
-                            if (this.baseInfo.orderGoodsId != undefined) {
+                            if (this.baseInfo.outId != undefined) {
                                 editWarehouseOutApi(param).then((response) => {
                                     this.$modal.msgSuccess("修改成功");
                                     this.loadingBtn=false
@@ -433,12 +429,9 @@ export default {
                             if(item.fetchNum==0){
                                 this.noMaterial = true
                             }else{
-                                let obj = Object.assign({}, item)
-                                // obj.unitPrice = Number(obj.unitPrice)*100 
-                                // obj.totalPrice =  (Number(obj.unitPrice)*Number(obj.fetchNum)) 
-                                // param.totalAmount = param.totalAmount+obj.totalPrice; 
-                                // param.totalNum = param.totalNum+Number(obj.fetchNum)
-                                param.imsOutInventoryDetailAddList.push(obj)
+                                let obj = Object.assign({}, item) 
+                                param.totalNum = param.totalNum+Number(obj.fetchNum)
+                                param.imsOutInventoryDetailAddList.push(obj) 
                             } 
                         }) 
                     } 
@@ -454,7 +447,7 @@ export default {
                             this.$modal.msgError("请添加货品！");
                         }else{
                             this.loadingBtn=true;
-                            if (this.baseInfo.orderGoodsId != undefined) {
+                            if (this.baseInfo.outId != undefined) {
                                 editWarehouseOutApi(param).then((response) => {
                                     this.$modal.msgSuccess("修改成功");
                                     this.loadingBtn=false
diff --git a/src/views/foodManage/stockManage/warehouseOut/index.vue b/src/views/foodManage/stockManage/warehouseOut/index.vue
index ed2384cb..38796517 100644
--- a/src/views/foodManage/stockManage/warehouseOut/index.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/index.vue
@@ -107,9 +107,9 @@
             </template>  
         </el-table-column> -->
 
-        <el-table-column label="总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
+        <el-table-column label="总金额(元)" align="center" prop="totalAmount" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
-               <span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
+               <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
             </template>  
         </el-table-column>
         <el-table-column label="总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/>