From 96c922e67cc9bdd9b69dbccaa3d7206d037480bf Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 11 Jul 2025 13:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../returnManage/materialReturn/detail.vue    | 37 ++++++++++---------
 .../returnManage/materialReturn/edit.vue      |  8 ++--
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/views/foodManage/returnManage/materialReturn/detail.vue b/src/views/foodManage/returnManage/materialReturn/detail.vue
index f282ba32..67008fe1 100644
--- a/src/views/foodManage/returnManage/materialReturn/detail.vue
+++ b/src/views/foodManage/returnManage/materialReturn/detail.vue
@@ -26,13 +26,7 @@
                     <template slot="label">退货时间</template>
                     {{ baseInfo.refundTime }}
                 </el-descriptions-item> 
-                <el-descriptions-item>
-                    <template slot="label">审批状态</template>
-                    <span v-if="baseInfo.approveStatus==1">待审批</span>
-                    <span v-if="baseInfo.approveStatus==2">审批中</span>
-                    <span v-if="baseInfo.approveStatus==3">审批同意</span>
-                    <span v-if="baseInfo.approveStatus==4">审批拒绝</span>
-                </el-descriptions-item>  
+               
             </el-descriptions> 
         </div>
 
@@ -43,7 +37,7 @@
                 </div> 
             </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 v-loading="loading" :data="materialList" 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 label="序号" align="center" width="80" type="index" />
                     <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
@@ -57,18 +51,24 @@
                             <span v-if="scope.row.salesMode==2">称重</span>
                         </template> -->
                     </el-table-column> 
-                    <el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
+                    <el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true"> 
+                    </el-table-column> 
+                    <el-table-column label="当前可退数量" align="center" prop="purNum" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="小计(元)" align="center" prop="totalPrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                          <!-- <span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span> -->
+                            <span>{{ scope.row.refundNum*scope.row.unitPrice }}</span>
                         </template>
                     </el-table-column> 
-                    <el-table-column label="退货数量" align="center" prop="refundNum" :show-overflow-tooltip="true"></el-table-column> 
-                    <el-table-column label="小计(元)" align="center" prop="" :show-overflow-tooltip="true">
+                    <el-table-column label="退货数量" align="center" prop="refundNum" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <!-- <span>{{ scope.row.refundNum*scope.row.singlePrice }}</span> -->
+                            <el-input  v-model.number="scope.row.refundNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.refundNum=v.replace(/[^\d]/g,''))"/>
+                        </template>
+                    </el-table-column> 
+                    <el-table-column label="退货原因" align="center" prop="refundReason" :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <el-input  v-model="scope.row.refundReason" placeholder="请输入" maxlength="20" clearable/>
                         </template>
                     </el-table-column> 
-                    <el-table-column label="退货原因" align="center" prop="refundReason" :show-overflow-tooltip="true"></el-table-column>
                 </el-table>
             </div>
         </div>
@@ -82,7 +82,7 @@
 <script>
 import { getCanteenByAreaApi, } from "@/api/base/stall"; 
 import { supplierPageApi } from "@/api/foodManage/purchaseManage"; 
-import { getPurchaseOrderInfoApi } from "@/api/foodManage/purchaseManage";
+import { getReturnMaterialInfoApi } from "@/api/foodManage/returnManage";
 export default {
     name: "orderDetail",
     dicts: [],
@@ -129,7 +129,7 @@ export default {
                 return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
             }
         },
-        materialLis:[],  
+        materialList:[],  
         openDialog:false,
         materialTreeOptions:[], 
         // 查询参数
@@ -175,9 +175,12 @@ export default {
                 refundGoodsId:this.returnRowData.refundGoodsId
             }
             //查询查询食堂下拉结构
-            getPurchaseOrderInfoApi(param).then((response) => {
+            getReturnMaterialInfoApi(param).then((response) => {
                 this.baseInfo = this.returnRowData; 
                 this.materialList = response.rows; 
+                this.materialList.forEach(item=>{
+                    this.$set(item,"unitPrice",Number(item.unitPrice)/100) 
+                })  
             }); 
         },  
         // 多选框选中数据
diff --git a/src/views/foodManage/returnManage/materialReturn/edit.vue b/src/views/foodManage/returnManage/materialReturn/edit.vue
index 04578f3d..2601faad 100644
--- a/src/views/foodManage/returnManage/materialReturn/edit.vue
+++ b/src/views/foodManage/returnManage/materialReturn/edit.vue
@@ -201,13 +201,13 @@ export default {
                 { required: true, message: "供应商不能为空", trigger: "change" }
             ],
             refundTime: [
-                { required: true, message: "交货时间不能为空", trigger: "change" }
+                { required: true, message: "退货时间不能为空", trigger: "change" }
             ],
             refundWarehouseId: [
-                { required: true, message: "送货仓库不能为空", trigger: "change" }
+                { required: true, message: "退货仓库不能为空", trigger: "change" }
             ],
-            supplyAddress: [
-                { required: true, message: "详细地址不能为空", trigger: "change" }
+            refundContact: [
+                { required: true, message: "退货人不能为空", trigger: "change" }
             ]
         },
         treeAreaOptions:[],