From 8381a79ab3ace78973669340e931c02f69b0ad9f Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Tue, 3 Dec 2024 19:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/outBound/component/homeOutBound.vue  |  2 +-
 src/views/material/ma/type/index.vue           | 12 ++++++------
 .../repair/repairManage/component/home.vue     | 18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/material/lease/outBound/component/homeOutBound.vue b/src/views/material/lease/outBound/component/homeOutBound.vue
index da3e4595..b4cfd1cb 100644
--- a/src/views/material/lease/outBound/component/homeOutBound.vue
+++ b/src/views/material/lease/outBound/component/homeOutBound.vue
@@ -186,7 +186,7 @@
             type="primary"
             @click="handleUpdate(scope.row)"
             v-if="scope.row.status != '2'"
-            v-hasPermi="['purchase:info:edit']"
+       
             >出库</el-button
           >
 
diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index 475cc87d..cfd3872d 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -974,9 +974,9 @@ export default {
         this.form.itemType = row.itemType;
         this.form.materialType = row.materialType;
         this.form.materialName = row.materialName;
-        if (response.data.keeperNickName) {
-          this.form.keeperUserId = response.data.keeperUserId;
-        }
+        // if (response.data.keeperNickName) {
+        //   this.form.keeperUserId = response.data.keeperUserId;
+        // }
         this.isLevel1Disabled = true;
         this.isLevel2Disabled = true;
         this.isLevel3Disabled = true;
@@ -996,9 +996,9 @@ export default {
         this.form.itemType = row.itemType;
         this.form.materialType = row.materialType;
         this.form.materialName = row.materialName;
-        if (response.data.keeperNickName) {
-          this.form.keeperUserId = response.data.keeperUserId;
-        }
+        // if (response.data.keeperNickName) {
+        //   this.form.keeperUserId = response.data.keeperUserId;
+        // }
         this.isLevel1Disabled = true;
         this.isLevel2Disabled = true;
         this.isLevel3Disabled = true;
diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue
index d3511539..9c1b2634 100644
--- a/src/views/material/repair/repairManage/component/home.vue
+++ b/src/views/material/repair/repairManage/component/home.vue
@@ -228,12 +228,12 @@
               </template>
             </el-table-column>
             <el-table-column label="单位" align="center" prop="unitName" />
-            <el-table-column label="报修数量" align="center" prop="repairNum" />
-            <el-table-column label="修复数量" align="center" prop="repairedNum" />
-            <el-table-column label="报废数量" align="center" prop="scrapNum" />
-            <el-table-column label="维修费小计" align="center" prop="totalCost" >
+            <el-table-column label="报修数量" align="center" prop="typeRepairNum" />
+            <el-table-column label="修复数量" align="center" prop="typeRepairedNum" />
+            <el-table-column label="报废数量" align="center" prop="typeScrapNum" />
+            <el-table-column label="维修费小计" align="center" prop="typeCost" >
               <template slot-scope="scope">
-                  <div >{{"¥"+" "+scope.row.totalCost}}</div>
+                  <div >{{"¥"+" "+Number(scope.row.typeCost)}}</div>
               </template>
             </el-table-column>
             <el-table-column label="报废图片" align="center" >
@@ -602,10 +602,10 @@ export default {
               let num3 = 0;  //报废数量
               let num4 = 0.0;  //维修费小计
             this.repairTicketDevice.forEach(item=>{
-              num1 = num1 + Number(item.repairNum)
-              num2 = num2 + Number(item.repairedNum)
-              num3 = num3 + Number(item.scrapNum)
-              num4 = num4 + item.totalCost
+              num1 = num1 + Number(item.typeRepairNum)
+              num2 = num2 + Number(item.typeRepairedNum)
+              num3 = num3 + Number(item.typeScrapNum)
+              num4 = num4 + item.typeCost
             })
             this.repairNum1 = num1
             this.repairNum2 = num2