From 61394340fed4e4e073dde3139274eb9ebf48c627 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Fri, 29 Nov 2024 16:56:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=90=8E=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=BB=B4=E4=BF=AE=E6=95=B0=E9=87=8F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=9C=89=E6=95=88=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/repair/testExamine.js                 |  2 +-
 .../basic/bmAssetAttributes/index.vue         |  3 +-
 .../repair/repairManage/component/edit.vue    |  6 +++
 .../material/repair/testedInBound/index.vue   | 43 +++++++++----------
 4 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/api/repair/testExamine.js b/src/api/repair/testExamine.js
index 90872f63..ae2f2775 100644
--- a/src/api/repair/testExamine.js
+++ b/src/api/repair/testExamine.js
@@ -20,7 +20,7 @@ export function getAuditInfo(query) {
 //修试审核二级-通过，驳回
 export function auditPass(data) {
   return request({
-    url: '/material/repair_audit_details',
+    url: '/material/repair_audit_details/innerAudit',
     method: 'put',
     data: data,
   })
diff --git a/src/views/material/basic/bmAssetAttributes/index.vue b/src/views/material/basic/bmAssetAttributes/index.vue
index 985e11b1..bf7c2b8a 100644
--- a/src/views/material/basic/bmAssetAttributes/index.vue
+++ b/src/views/material/basic/bmAssetAttributes/index.vue
@@ -381,10 +381,9 @@ export default {
       /** 导出按钮操作 */
       handleExport() {
           this.download(
-              'material/base/maPropInfo/export',
+              'material/bm_asset_attributes/export',
               {
                   ...this.queryParams,
-                  dataCondition: this.ids,
               },
               `资产属性_${new Date().getTime()}.xlsx`,
           )
diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue
index 38d6c650..6af84ace 100644
--- a/src/views/material/repair/repairManage/component/edit.vue
+++ b/src/views/material/repair/repairManage/component/edit.vue
@@ -2074,6 +2074,12 @@ export default {
       }else{
          this.flagSave = false;
       }
+      if(Number(this.formMiddle.repairNum)==0){
+        this.resetForm("formMiddle")
+      }
+      if(Number(this.formRight.scrapNum)==0){
+        this.resetForm("formRight")
+      }
     },
 
   },
diff --git a/src/views/material/repair/testedInBound/index.vue b/src/views/material/repair/testedInBound/index.vue
index af6c69da..6d9425f9 100644
--- a/src/views/material/repair/testedInBound/index.vue
+++ b/src/views/material/repair/testedInBound/index.vue
@@ -189,19 +189,19 @@
 
       <el-table :data="getInBoundInfo" width="600px" height="450" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center"  :selectable="selectable"/>
-        <el-table-column label="类型名称" align="center" prop="maTypeName" :show-overflow-tooltip="true"/>
+        <el-table-column label="类型名称" align="center" prop="typeName2" :show-overflow-tooltip="true"/>
         <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
-        <el-table-column label="数量" align="center" prop="num" :show-overflow-tooltip="true" />
-        <el-table-column label="编号" align="center" prop="code" :show-overflow-tooltip="true" />
-        <el-table-column label="提交人" align="center" prop="createBy" :show-overflow-tooltip="true" />
-        <el-table-column label="提交时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
-        <el-table-column label="状态" align="center" prop="taskStatus" >
-        <template slot-scope="scope">
+        <el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
+        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
+        <el-table-column label="提交人" align="center" prop="updateBy" :show-overflow-tooltip="true" />
+        <el-table-column label="提交时间" align="center" prop="updateTime" :show-overflow-tooltip="true" />
+        <el-table-column label="状态" align="center" prop="status" >
+        <!-- <template slot-scope="scope">
           <dict-tag
             :options="dict.type.repair_end_task_status"
             :value="scope.row.taskStatus"
           />
-        </template>
+        </template> -->
       </el-table-column>
         <el-table-column
           label="操作"
@@ -215,14 +215,14 @@
               size="mini"
               type="success"
               @click="InBoundSuccess(scope.row)"
-              v-if="scope.row.taskStatus == 0 "
+              v-if="scope.row.status != '已入库' "
             >
               通过
             </el-button>
             <el-button
               size="mini"
               type="danger"
-              v-if="scope.row.taskStatus == 0 "
+              v-if="scope.row.status != '已入库' "
               @click="InBoundFail(scope.row)"
             >
               不通过
@@ -318,12 +318,6 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
-      // this.testedList = [
-      //   {'repairNum':'X20241121001','taskStatus':0},
-      //   {'repairNum':'X20241121002','taskStatus':1}
-      // ]
-      // this.total = 2;
-      // this.loading = false;
     },
 
     /** 搜索按钮操作 */
@@ -360,14 +354,19 @@ export default {
     },
 
     //一级页面审核按钮
-    handleUpdate(){
+    handleUpdate(row){
       // this.getListView()
       this.title = "审核"
-      this.getInBoundInfo = [
-        {'typeName':'p1','taskStatus':0},
-        {'typeName':'p2','taskStatus':1}
-      ]
-      this.totalView = 2
+      getRepairedDetailList(row.id).then((response) => {
+        this.getInBoundInfo = response.rows;
+        this.totalView = response.total;
+        this.loading = false;
+      });
+      // this.getInBoundInfo = [
+      //   {'typeName':'p1','taskStatus':0},
+      //   {'typeName':'p2','taskStatus':1}
+      // ]
+      // this.totalView = 2
       this.showView = true;
     },