From e9324c42ce74bb179dd5fc8a25ef97f9079b5ac5 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 16 Jan 2025 18:34:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=BB=B4=E4=BF=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=E6=A2=B3=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/repair/repair.js                      |   8 -
 src/api/repair/scrapManage.js                 |  22 +-
 src/api/repair/testExamine.js                 |  10 +
 .../receive/receiveManageAdd.vue              |   4 +-
 .../claimAndRefund/return/returnApplyAdd.vue  |   2 +-
 .../return/returnApplyAddByCq.vue             |   2 +-
 .../material/back/component/addReturn.vue     |  66 +++--
 .../material/back/component/queryReturn.vue   |   2 +-
 src/views/material/basic/bmUnit/people.vue    |   2 +-
 src/views/material/basic/unitType/index.vue   |   2 +-
 src/views/material/ma/device/index.vue        |   2 +-
 src/views/material/ma/supplier/index.vue      |   2 +-
 .../part/partLease/component/homeApply.vue    |  34 +--
 .../partLease/component/queryToolsApply.vue   |  12 +-
 .../repair/repairManage/component/edit.vue    |   4 +-
 .../scrapManage/component/addToolsApply.vue   |  97 +++++---
 .../scrapManage/component/homeApply.vue       |  71 +++---
 .../scrapManage/component/queryToolsApply.vue | 226 +++++++++++-------
 .../material/repair/scrapManage/index.vue     |   4 +
 .../testExamine/component/addToolsApply.vue   |  78 ++++--
 .../testExamine/component/homeApply.vue       |   2 +-
 .../testExamine/component/queryToolsApply.vue |  10 +-
 vue.config.js                                 |   4 +-
 23 files changed, 421 insertions(+), 245 deletions(-)

diff --git a/src/api/repair/repair.js b/src/api/repair/repair.js
index b233434b..2952ad6e 100644
--- a/src/api/repair/repair.js
+++ b/src/api/repair/repair.js
@@ -83,15 +83,7 @@ export function auditPass(data) {
   })
 }
 
-//外层修试审核通过
-export function outerAudit(data) {
-  return request({
-    url: '/material/repair_audit_details/outerAudit',
-    method: 'post',
-    data: data,
 
-  })
-}
 
 //获取维修任务单信息
 export function getRepairDocumentInfo(taskId) {
diff --git a/src/api/repair/scrapManage.js b/src/api/repair/scrapManage.js
index 7c36f2b7..e60dfaf3 100644
--- a/src/api/repair/scrapManage.js
+++ b/src/api/repair/scrapManage.js
@@ -17,9 +17,25 @@ export function getScrapDetailListApi(query) {
     })
 }
 
-
-
-
+//内层审核批量通过
+export function batchPassApi(data) {
+  return request({
+    url: '/material/scrap_apply_details/approve',
+    method: 'post',
+    data: data,
+
+  })
+}
+
+//内层审核批量通过
+export function batchRejectApi(data) {
+  return request({
+    url: '/material/scrap_apply_details/reject',
+    method: 'post',
+    data: data,
+
+  })
+}
 
 
 
diff --git a/src/api/repair/testExamine.js b/src/api/repair/testExamine.js
index 6140a383..d631cb5d 100644
--- a/src/api/repair/testExamine.js
+++ b/src/api/repair/testExamine.js
@@ -17,6 +17,16 @@ export function getAuditInfo(query) {
   })
 }
 
+//外层修试审核通过
+export function outerAudit(data) {
+  return request({
+    url: '/material/repair_audit_details/outerAudit',
+    method: 'post',
+    data: data,
+
+  })
+}
+
 //修试审核二级-通过，驳回
 export function auditPass(data) {
   return request({
diff --git a/src/views/claimAndRefund/receive/receiveManageAdd.vue b/src/views/claimAndRefund/receive/receiveManageAdd.vue
index bcff6525..9955d611 100644
--- a/src/views/claimAndRefund/receive/receiveManageAdd.vue
+++ b/src/views/claimAndRefund/receive/receiveManageAdd.vue
@@ -62,7 +62,7 @@
                     <el-input
                         v-model="queryParams.roleName"
                         placeholder="请输入备注"
-                        clearable
+                        clearable maxlength="100"
                         type="textarea"
                         style="width: 240px"
                         @keyup.enter.native="handleQuery"
@@ -252,7 +252,7 @@
                 <el-form-item label="备注">
                     <el-input
                         v-model="form.remark"
-                        type="textarea"
+                        type="textarea" maxlength="100"
                         placeholder="请输入内容"
                     ></el-input>
                 </el-form-item>
diff --git a/src/views/claimAndRefund/return/returnApplyAdd.vue b/src/views/claimAndRefund/return/returnApplyAdd.vue
index 541bab28..af7a69f5 100644
--- a/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -96,7 +96,7 @@
                     placeholder="请输入备注"
                     clearable
                     rows="1"
-                    type="textarea"
+                    type="textarea" maxlength="100"
                     style="width: 240px"
                     @keyup.enter.native="handleQuery"
                 />
diff --git a/src/views/claimAndRefund/return/returnApplyAddByCq.vue b/src/views/claimAndRefund/return/returnApplyAddByCq.vue
index 25809f4e..9e9b829f 100644
--- a/src/views/claimAndRefund/return/returnApplyAddByCq.vue
+++ b/src/views/claimAndRefund/return/returnApplyAddByCq.vue
@@ -94,7 +94,7 @@
                         placeholder="请输入备注"
                         clearable
                         rows="1"
-                        type="textarea"
+                        type="textarea" maxlength="100"
                         style="width: 240px"
                         @keyup.enter.native="handleQuery"
                     />
diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index 3cace772..8945ce2d 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -85,17 +85,22 @@
                         style="width: 240px"
                         :maxlength="11"
                     />
-                </el-form-item>
-                <el-form-item label="物品类型" prop="deviceType">
-                    <el-row :gutter="10">
-                        <el-col :span="15">
+                </el-form-item> 
+            </el-row> 
+                <!-- <el-form-item label="物品类型" prop="deviceType"> -->
+            <el-row :gutter="24" style="display: flex;align-items: center;">
+                        <el-col :span="1.5" style="text-align: center;margin-left: 20px;">
+                            <span style="color: red;">*</span>
+                            <span style="font-size: 14px;font-weight: 600;color: #606266;">物品类型</span>
+                        </el-col>
+                        <el-col :span="6">
                             <el-select
                                 ref="typeSelect"
                                 v-model="tempDeviceType"
                                 multiple
                                 filterable
                                 placeholder="请输入物品类型"
-                                style="width: 500px"
+                                style="width: 400px"
                                 @change="handleTypeChange"
                                 clearable
                                 collapse-tags
@@ -118,7 +123,7 @@
                                 </el-option>
                             </el-select>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :span="5">
                             <el-input
                                 ref="searchInput"
                                 v-model="searchKeyword"
@@ -137,7 +142,7 @@
                                 </template>
                             </el-input>
                         </el-col>
-                    </el-row>
+                   
                     <!-- <el-cascader
                         :key="propsKey"
                         v-model="deviceType"
@@ -152,20 +157,19 @@
                         popper-class="popper-select"
                         @change="deviceTypeChange"
                     ></el-cascader> -->
-                </el-form-item>
+                <!-- </el-form-item> -->
 
                 <el-form-item label="备注" prop="roleName">
                     <el-input
                         v-model="queryParams.remark"
                         placeholder="请输入备注"
                         clearable
-                        rows="1"
+                        rows="2" maxlength="100"
                         type="textarea"
                         style="width: 240px"
                     />
                 </el-form-item>
             </el-row>
-            <el-row></el-row>
         </el-form>
 
         <el-row :gutter="10" class="mb8">
@@ -272,7 +276,7 @@
                             size="mini"
                             type="text"
                             @click="picturePreview(scope.row)"
-                            v-if="scope.row.bmFileInfos && scope.row.bmFileInfos.length > 0"
+                            v-if="scope.row.bmFileInfos && scope.row.bmFileInfos.length > 0"fileName
                         >
                             查看
                         </el-button>
@@ -332,7 +336,7 @@
                     prop="maCode"
                     align="center"
                     :show-overflow-tooltip="true"
-                ></el-table-column>
+                ></el-table-column> 
                 <el-table-column label="设备状态" prop="maStatus" align="center" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <dict-tag :options="dict.type.ma_machine_status" :value="scope.row.maStatus" />
@@ -356,9 +360,9 @@
                         />
                     </template>
                 </el-table-column>
-                <el-table-column label="附件" align="center" width="100">
+                <el-table-column label="附件" align="center" width="120" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
-                        <div style="display: flex; align-items: center; justify-content: center">
+                        <div style="display: flex; align-items: center; justify-content: space-between">
                             <el-upload
                                 ref="upload"
                                 :limit="3"
@@ -371,17 +375,20 @@
                             >
                                 <el-button size="mini" type="text" @click="beforeFileUpload(scope.row)">上传</el-button>
                             </el-upload>
-                            <el-button
-                                size="mini"
-                                type="text"
-                                @click="picturePreview(scope.row)"
-                                v-if="scope.row.bmFileInfos && scope.row.bmFileInfos.length > 0"
-                            >
-                                查看
+                            <el-button size="mini" type="text" @click="picturePreview(scope.row)"
+                                v-if="scope.row.bmFileInfos && scope.row.bmFileInfos.length > 0">
+                               查看
                             </el-button>
                         </div>
                     </template>
+                    
                 </el-table-column>
+                <!-- <el-table-column 
+                    label="文件名称"
+                    prop="fileName"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                ></el-table-column> -->
                 <!-- <el-table-column label="操作" align="center"   width="120px">
                     <template slot-scope="scope">
                         <el-button size="mini" type="danger"
@@ -1161,8 +1168,21 @@ export default {
                     name: response.data.name,
                     url: response.data.url
                 }
-                let index = this.machineList.findIndex(v => v.maCode == this.fileData.maCode)
-                this.machineList[index].bmFileInfos = [obj]
+                this.machineList.map((item, index2) => {
+                    if (item.maCode == this.fileData.maCode) {
+                        this.$set(item, 'bmFileInfos', [obj]) 
+                        this.$set(item, 'fileName', response.data.name)
+                    }
+                })
+                // let index = this.machineList.findIndex(v => v.maCode == this.fileData.maCode)
+                // console.log(index)
+                // this.machineList[index].bmFileInfos = [obj];
+                // this.machineList[index].fileName = response.data.name;
+                // this.machineList[index].showBtn = true;
+                // this.machineList[index].apDetection = '1';
+                // setTimeout(()=>{
+                //     this.$forceUpdate()
+                // },1000)
                 console.log(this.machineList)
             }
         },
diff --git a/src/views/material/back/component/queryReturn.vue b/src/views/material/back/component/queryReturn.vue
index d3b60b2d..578c07e0 100644
--- a/src/views/material/back/component/queryReturn.vue
+++ b/src/views/material/back/component/queryReturn.vue
@@ -80,7 +80,7 @@
                         placeholder="请输入备注"
                         clearable
                         rows="1" :disabled="isView"
-                        type="textarea"
+                        type="textarea" maxlength="100"
                         style="width: 240px" 
                     />
                 </el-form-item>
diff --git a/src/views/material/basic/bmUnit/people.vue b/src/views/material/basic/bmUnit/people.vue
index d0833229..194093a0 100644
--- a/src/views/material/basic/bmUnit/people.vue
+++ b/src/views/material/basic/bmUnit/people.vue
@@ -328,7 +328,7 @@
             <el-form-item label="备注">
               <el-input
                 v-model="form.remark"
-                type="textarea"
+                type="textarea" maxlength="100"
                 placeholder="请输入内容"
               ></el-input>
             </el-form-item>
diff --git a/src/views/material/basic/unitType/index.vue b/src/views/material/basic/unitType/index.vue
index 85efe76a..f4338a51 100644
--- a/src/views/material/basic/unitType/index.vue
+++ b/src/views/material/basic/unitType/index.vue
@@ -182,7 +182,7 @@
         <el-form-item label="备注" prop="remark">
           <el-input
             v-model="form.remark"
-            type="textarea"
+            type="textarea" maxlength="100"
             placeholder="请输入内容"
           ></el-input>
         </el-form-item>
diff --git a/src/views/material/ma/device/index.vue b/src/views/material/ma/device/index.vue
index c74614ad..d333d8f4 100644
--- a/src/views/material/ma/device/index.vue
+++ b/src/views/material/ma/device/index.vue
@@ -297,7 +297,7 @@
                   :rows="5"
                   placeholder="请输入备注"
                   v-model="form.remark"
-                  maxlength="50"
+                  maxlength="100"
                   show-word-limit
                   >
                 </el-input>
diff --git a/src/views/material/ma/supplier/index.vue b/src/views/material/ma/supplier/index.vue
index 6d3cde8d..d7500b01 100644
--- a/src/views/material/ma/supplier/index.vue
+++ b/src/views/material/ma/supplier/index.vue
@@ -153,7 +153,7 @@
                <el-form-item label="主要联系范围" prop="businessScope">
                 <el-input
                   type="textarea"
-                  :rows="6"
+                  :rows="6" maxlength="100"
                   placeholder="输入内容"
                   v-model="form.businessScope"
                   show-word-limit
diff --git a/src/views/material/part/partLease/component/homeApply.vue b/src/views/material/part/partLease/component/homeApply.vue
index 5ff35a38..579477cc 100644
--- a/src/views/material/part/partLease/component/homeApply.vue
+++ b/src/views/material/part/partLease/component/homeApply.vue
@@ -218,9 +218,9 @@
 import {
   getListTestExamineApply,
 } from "@/api/repair/testExamine";
-import {
-  outerAudit,
-} from "@/api/repair/repair";
+// import {
+//   outerAudit,
+// } from "@/api/repair/repair";
 import router from "@/router";
 export default {
   name: "Home",
@@ -353,13 +353,13 @@ export default {
           confirmButtonText: "确定",
         });
       } else {
-        outerAudit(this.passTemp).then((response) => {
-          if (response.code == 200) {
-            this.$modal.msgSuccess("通过成功");
-            router.go(0); // 刷新页面
-          }
-          this.getTaskInfo();
-        });
+        // outerAudit(this.passTemp).then((response) => {
+        //   if (response.code == 200) {
+        //     this.$modal.msgSuccess("通过成功");
+        //     router.go(0); // 刷新页面
+        //   }
+        //   this.getTaskInfo();
+        // });
       }
     },
     /** 驳回按钮操作 */
@@ -370,13 +370,13 @@ export default {
           confirmButtonText: "确定",
         });
       } else {
-        outerAudit(this.failTemp).then((response) => {
-          if (response.code == 200) {
-            this.$modal.msgSuccess("驳回成功");
-            router.go(0); // 刷新页面
-          }
-          this.getTaskInfo();
-        });
+        // outerAudit(this.failTemp).then((response) => {
+        //   if (response.code == 200) {
+        //     this.$modal.msgSuccess("驳回成功");
+        //     router.go(0); // 刷新页面
+        //   }
+        //   this.getTaskInfo();
+        // });
       }
     },
 
diff --git a/src/views/material/part/partLease/component/queryToolsApply.vue b/src/views/material/part/partLease/component/queryToolsApply.vue
index 69894465..317d0f2c 100644
--- a/src/views/material/part/partLease/component/queryToolsApply.vue
+++ b/src/views/material/part/partLease/component/queryToolsApply.vue
@@ -259,13 +259,13 @@ export default {
     },
     //获取任务详情-列表数据
     getTaskInfo() {
-      this.loading = true;
-      getAuditInfo({ taskId: this.taskId }).then((response) => {
-        this.maForm = this.paramTemp;
-        this.equipmentList = response.rows;
-        this.total = response.total;
+      // this.loading = true;
+      // getAuditInfo({ taskId: this.taskId }).then((response) => {
+      //   this.maForm = this.paramTemp;
+      //   this.equipmentList = response.rows;
+      //   this.total = response.total;
         this.loading = false;
-      });
+      // });
     },
     //单个通过
     handlePass(row) {
diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue
index 02bc9e92..652ce344 100644
--- a/src/views/material/repair/repairManage/component/edit.vue
+++ b/src/views/material/repair/repairManage/component/edit.vue
@@ -898,7 +898,7 @@
                   placeholder="请输入待报废数量"
                   maxlength="20"
                   type="number"
-                  style="width: 220px"
+                  style="width: 210px"
                   min="0"
                   @input="waitRepairCount"
                 />
@@ -1322,6 +1322,7 @@ export default {
           confirmButtonText: "确定",
         });
       }else{
+        console.log(this.idsTemp)
         auditPass(this.idsTemp).then(async(response) => {
           if (response.code == 200) {
           let param = {
@@ -1863,6 +1864,7 @@ export default {
     openScrapDialog(row) {
       this.scrapRowData = row;
       this.scrapForm = {};
+      this.fileList = [];
       this.openScrap = true;
     },
     // 待报废弹窗文件上传成功处理-编码弹窗上传
diff --git a/src/views/material/repair/scrapManage/component/addToolsApply.vue b/src/views/material/repair/scrapManage/component/addToolsApply.vue
index 9f331c98..000d203a 100644
--- a/src/views/material/repair/scrapManage/component/addToolsApply.vue
+++ b/src/views/material/repair/scrapManage/component/addToolsApply.vue
@@ -41,7 +41,7 @@
       </el-form-item>
     </el-form>
 
-    <!-- <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -64,19 +64,19 @@
           >驳回</el-button
         >
       </el-col>
-    </el-row> -->
+    </el-row>
     <el-table
       v-loading="loading"
       :data="equipmentList"
       row-key="id"
       @selection-change="handleSelectionChange"
     >
-      <!-- <el-table-column
+      <el-table-column
         type="selection"
         width="55"
         align="center"
         :selectable="selectable"
-      /> -->
+      />
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column
         label="类型名称"
@@ -87,7 +87,7 @@
       <el-table-column
         label="规格型号"
         align="center"
-        prop="type"
+        prop="typeModelName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -97,13 +97,20 @@
         :show-overflow-tooltip="true"
       >
       </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
         label="退料数量"
         align="center"
         prop="repairNum"
         :show-overflow-tooltip="true"
       >
-      </el-table-column> -->
+      </el-table-column>
+      <el-table-column
+        label="已修数量"
+        align="center"
+        prop="repairedNum"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
       <el-table-column
         label="报废数量"
         align="center"
@@ -111,15 +118,32 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="管理模式"
+        label="设备编码"
         align="center"
-        prop="alNum"
+        prop="code"
         :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="费用合计"
+        align="center"
+        prop="totalCost"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="报废原因"
+        align="center"
+        prop="scrapReason"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="附件"
+        align="center"
+        prop="fileList" width="300"
       >
-        <template slot-scope="scope">
-            <!-- 0编码1数量 -->
-              <div v-if="scope.row.manageType==0">编码管理</div>
-              <div v-if="scope.row.manageType==1">数量管理</div>
+        <template slot-scope="scope"> 
+          <img v-for="(item,index) in scope.row.fileList" :key="index" width="100px" height="100px" :src="item.url"  />
+              <!-- <div v-if="scope.row.manageType==0">编码管理</div>
+              <div v-if="scope.row.manageType==1">数量管理</div> -->
         </template>
       </el-table-column>
       <el-table-column
@@ -141,7 +165,7 @@
           <!-- <div v-else style="color: red;"></div> -->
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="300">
+      <!-- <el-table-column label="操作" align="center" width="300">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -161,7 +185,7 @@
           </el-button>
           <div v-if="scope.row.status != '0'">-</div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <!-- <pagination
       v-show="total > 0"
@@ -175,7 +199,7 @@
 
 <script>
 // import { getAuditInfo,  } from "@/api/repair/testExamine";
-import { getScrapDetailListApi } from "@/api/repair/scrapManage";
+import { getScrapDetailListApi,batchRejectApi, batchPassApi } from "@/api/repair/scrapManage";
 import { getToken } from "@/utils/auth";
 export default {
   name: "AddTools",
@@ -201,6 +225,12 @@ export default {
         return "";
       },
     },
+    agreementId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
     param: {
       type: Object,
       default: () => {
@@ -307,14 +337,13 @@ export default {
       this.failTemp = [];
       this.ids = selection.map((item) => item.id);
       selection.forEach((item) => {
-        this.passTemp.push({ id: item.id, status: "1",specificationType: item.specificationType,machineTypeName:item.machineTypeName,
-        unitName:item.unitName,repairNum:item.repairNum,repairedNum:item.repairedNum,typeId:item.typeId,taskId:item.taskId,
-        auditId:row.id,repairId:row.repairId,maId:row.maId, });
+        this.passTemp.push({ id: item.id});
       });
+      console.log(this.agreementId)
       selection.forEach((item) => {
-        this.failTemp.push({ id: item.id, status: "2",specificationType: item.specificationType,machineTypeName:item.machineTypeName,
-        unitName:item.unitName,repairNum:item.repairNum,repairedNum:item.repairedNum,typeId:item.typeId,taskId:item.taskId,
-        auditId:row.id,repairId:row.repairId,maId:row.maId, });
+        let obj=item;
+        obj.agreementId=this.agreementId
+        this.failTemp.push(obj);
       });
       this.single = selection.length != 1;
       this.multiple = !selection.length;
@@ -328,12 +357,12 @@ export default {
         });
         return;
       } else {
-        // auditPass(this.passTemp).then((response) => {
-        //   if (response.code == 200) {
-        //     this.$modal.msgSuccess("通过成功");
-        //   }
-        //   this.getTaskInfo();
-        // });
+        batchPassApi({'scrapApplyDetailsList':this.passTemp}).then((response) => {
+          if (response.code == 200) {
+            this.$modal.msgSuccess("通过成功");
+          }
+          this.getTaskInfo();
+        });
       }
     },
     //多个驳回
@@ -345,12 +374,12 @@ export default {
         });
         return;
       } else {
-        // auditPass(this.failTemp).then((response) => {
-        //   if (response.code == 200) {
-        //     this.$modal.msgSuccess("驳回成功");
-        //   }
-        //   this.getTaskInfo();
-        // });
+        batchRejectApi({'scrapApplyDetailsList':this.failTemp}).then((response) => {
+          if (response.code == 200) {
+            this.$modal.msgSuccess("驳回成功");
+          }
+          this.getTaskInfo();
+        });
       }
     },
   },
diff --git a/src/views/material/repair/scrapManage/component/homeApply.vue b/src/views/material/repair/scrapManage/component/homeApply.vue
index e85e3f98..d9bfb1dc 100644
--- a/src/views/material/repair/scrapManage/component/homeApply.vue
+++ b/src/views/material/repair/scrapManage/component/homeApply.vue
@@ -64,7 +64,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -83,7 +83,7 @@
           @click="handleFailAll"
           >驳回
         </el-button>
-      </el-col> -->
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="warning"
@@ -135,18 +135,19 @@
         prop="scrapCode"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
-        label="物资类型"
-        align="center"
-        prop="type"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column
         label="维修单号"
         align="center"
         prop="repairCode"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="物资类型"
+        align="center"
+        prop="type"
+        :show-overflow-tooltip="true"
+      />
+      
       <el-table-column
         label="提交人"
         align="center"
@@ -160,29 +161,34 @@
         :show-overflow-tooltip="true"
       >
       </el-table-column>
-
-      <!-- <el-table-column
-        label="状态"
+      <el-table-column
+        label="审核人"
         align="center"
-        prop="taskStatus"
+        prop="auditByName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="审核时间"
+        align="center"
+        prop="auditTime"
         :show-overflow-tooltip="true"
       >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.repair_task_status"
-            :value="scope.row.taskStatus"
-          />
-        </template>
-      </el-table-column> -->
+      </el-table-column>
 
       <el-table-column
+        label="状态"
+        align="center"
+        prop="taskStatusName"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column> 
+      <!-- <el-table-column
         label="备注"
         align="center"
         width="150"
         prop="remark"
         :show-overflow-tooltip="true"
-      />
-
+      />  -->
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="scope">
           <el-button
@@ -197,7 +203,7 @@
             style="margin-bottom: 10px"
             type="primary"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status != '2'"
+            v-if="scope.row.taskStatus == '0'"
             >审核
           </el-button>
 
@@ -224,11 +230,8 @@
 
 <script>
 import {
-  getScrapApplyListApi,
-} from "@/api/repair/scrapManage";
-import {
-  outerAudit,
-} from "@/api/repair/repair";
+  getScrapApplyListApi,batchRejectApi, batchPassApi
+} from "@/api/repair/scrapManage";  
 export default {
   name: "Home",
   dicts: ['repair_task_status'],
@@ -273,10 +276,10 @@ export default {
       this.failTemp = [];
       this.ids = selection.map((item) => item.taskId);
       selection.forEach((item) => {
-        this.passTemp.push({ status: "1",taskId:item.taskId, });
+        this.passTemp.push({ agreementId:item.agreementId,taskId:item.taskId });
       });
       selection.forEach((item) => {
-        this.failTemp.push({  status: "2",taskId:item.taskId, });
+        this.failTemp.push({  agreementId:item.agreementId,taskId:item.taskId, });
       });
       this.single = selection.length != 1;
       this.multiple = !selection.length;
@@ -327,11 +330,12 @@ export default {
         });
         return;
       } else {
-        outerAudit(this.passTemp).then((response) => {
+        batchPassApi({'scrapTaskListVoList':this.passTemp}).then((response) => {
           if (response.code == 200) {
             this.$modal.msgSuccess("通过成功");
           }
-          this.getTaskInfo();
+          this.queryParams.pageNum = 1;
+          this.getList();
         });
       }
     },
@@ -344,11 +348,12 @@ export default {
         });
         return;
       } else {
-        outerAudit(this.failTemp).then((response) => {
+        batchRejectApi({'scrapTaskListVoList':this.failTemp}).then((response) => {
           if (response.code == 200) {
             this.$modal.msgSuccess("驳回成功");
           }
-          this.getTaskInfo();
+          this.queryParams.pageNum = 1;
+          this.getList();
         });
       }
     },
diff --git a/src/views/material/repair/scrapManage/component/queryToolsApply.vue b/src/views/material/repair/scrapManage/component/queryToolsApply.vue
index 3350da4f..63945b04 100644
--- a/src/views/material/repair/scrapManage/component/queryToolsApply.vue
+++ b/src/views/material/repair/scrapManage/component/queryToolsApply.vue
@@ -7,9 +7,9 @@
       :inline="true"
       label-width="120px"
     >
-      <el-form-item label="退料单位" prop="unitName">
+      <el-form-item label="退料单位" prop="backUnit">
         <el-input
-          v-model="maForm.unitName"
+          v-model="maForm.backUnit"
           placeholder="请输入退料单位"
           clearable
           maxlength="50"
@@ -18,10 +18,10 @@
           disabled
         />
       </el-form-item>
-      <el-form-item label="工程名称" prop="projectName">
+      <el-form-item label="退料单位" prop="backPro">
         <el-input
-          v-model="maForm.projectName"
-          placeholder="请输入工程名称"
+          v-model="maForm.backPro"
+          placeholder="请输入退料单位"
           clearable
           maxlength="50"
           style="width: 240px"
@@ -29,10 +29,9 @@
           disabled
         />
       </el-form-item>
-      <el-form-item label="维修单号" prop="repairNum">
+      <el-form-item label="报废单号" prop="scrapCode">
         <el-input
-          v-model="maForm.repairNum"
-          placeholder="请输入维修单号"
+          v-model="maForm.scrapCode" 
           clearable
           maxlength="50"
           style="width: 240px"
@@ -42,22 +41,53 @@
       </el-form-item>
     </el-form>
 
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-check"
+          size="mini"
+          :disabled="multiple"
+          @click="handlePassAll"
+          >通过</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-close"
+          size="mini"
+          :disabled="multiple"
+          @click="handleFailAll"
+          >驳回</el-button
+        >
+      </el-col>
+    </el-row> -->
     <el-table
       v-loading="loading"
       :data="equipmentList"
       row-key="id"
+      @selection-change="handleSelectionChange"
     >
+      <!-- <el-table-column
+        type="selection"
+        width="55"
+        align="center"
+        :selectable="selectable"
+      /> -->
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column
         label="类型名称"
         align="center"
-        prop="specificationType"
+        prop="typeName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="规格型号"
         align="center"
-        prop="machineTypeName"
+        prop="typeModelName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -79,31 +109,43 @@
         align="center"
         prop="repairedNum"
         :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="待修数量"
-        align="center"
-        prop="waitNum"
-        :show-overflow-tooltip="true"
       >
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.repairNum - scope.row.repairedNum }}
-          </div>
-        </template>
       </el-table-column>
       <el-table-column
-        label="管理模式"
+        label="报废数量"
         align="center"
-        prop="alNum"
+        prop="scrapNum"
         :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="code"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="费用合计"
+        align="center"
+        prop="totalCost"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="报废原因"
+        align="center"
+        prop="scrapReason"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="附件"
+        align="center"
+        prop="fileList" width="300"
       >
-        <template slot-scope="scope">
-            <!-- 0编码1数量 -->
-              <div v-if="scope.row.manageType==0">编码管理</div>
-              <div v-if="scope.row.manageType==1">数量管理</div>
+        <template slot-scope="scope"> 
+          <img v-for="(item,index) in scope.row.fileList" :key="index" width="100px" height="100px" :src="item.url"  />
+              <!-- <div v-if="scope.row.manageType==0">编码管理</div>
+              <div v-if="scope.row.manageType==1">数量管理</div> -->
         </template>
-      </el-table-column> 
+      </el-table-column>
       <el-table-column
         label="审核状态"
         align="center"
@@ -128,7 +170,7 @@
           <el-button
             size="mini"
             style="margin-bottom: 10px"
-            type="primary"
+            type="success"
             v-if="scope.row.status == '0'"
             @click="handlePass(scope.row)"
             >通过
@@ -145,26 +187,27 @@
         </template>
       </el-table-column> -->
     </el-table>
-    <pagination
+    <!-- <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="maForm.pageNum"
       :limit.sync="maForm.pageSize"
       @pagination="getTaskInfo"
-    />
+    /> -->
   </div>
 </template>
 
 <script>
-import { getAuditInfo, auditPass } from "@/api/repair/testExamine";
+// import { getAuditInfo,  } from "@/api/repair/testExamine";
+import { getScrapDetailListApi,batchRejectApi, batchPassApi } from "@/api/repair/scrapManage";
 import { getToken } from "@/utils/auth";
 export default {
-  name: "QueryTools",
+  name: "AddTools",
   components: {
     // UploadImg,
   },
   props: {
-    isView: {
+    isEdit: {
       type: Boolean,
       default: () => {
         return false;
@@ -182,6 +225,12 @@ export default {
         return "";
       },
     },
+    agreementId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
     param: {
       type: Object,
       default: () => {
@@ -214,12 +263,10 @@ export default {
       // 是否显示弹出层
       open: false,
       rowData: {},
-      maForm: {
-        pageNum: 1,
-        pageSize: 10,
-        unitName: undefined,
-        projectName: undefined,
-        repairNum: undefined,
+      maForm: { 
+        backUnit: undefined,
+        backPro: undefined,
+        scrapCode: undefined,
       },
     };
   },
@@ -227,9 +274,55 @@ export default {
   mounted() {
     this.taskId = this.queryTaskId;
     this.paramTemp = this.param;
+    this.maForm = this.paramTemp;
     this.getTaskInfo();
   },
-  methods: {
+  methods: { 
+    //获取任务详情-列表数据
+    getTaskInfo() {
+      this.loading = true;
+      getScrapDetailListApi({ taskId: this.taskId }).then((response) => {
+        this.maForm = this.paramTemp;
+        this.equipmentList = response.data;
+        // this.total = response.total;
+        this.loading = false;
+      });
+    },
+    //单个通过
+    handlePass(row) {
+      const param = [];
+      param.push({ id: row.id, status: "1",specificationType: row.specificationType,machineTypeName:row.machineTypeName,
+        unitName:row.unitName,repairNum:row.repairNum,repairedNum:row.repairedNum,typeId:row.typeId,taskId:row.taskId,
+        auditId:row.id,repairId:row.repairId,maId:row.maId, });
+      this.$modal
+        .confirm("是否确认通过所选择的数据项？")
+        .then(function () {
+          // return auditPass(param);
+        })
+        .then(() => {
+          // this.getTaskInfo();
+          // this.$modal.msgSuccess("通过成功");
+        })
+        .catch(() => {});
+    },
+    //单个驳回
+    handleFail(row) {
+      const param = [];
+      param.push({ id: row.id, status: "2",specificationType: row.specificationType,machineTypeName:row.machineTypeName,
+        unitName:row.unitName,repairNum:row.repairNum,repairedNum:row.repairedNum,typeId:row.typeId,taskId:row.taskId,
+        auditId:row.id,repairId:row.repairId,maId:row.maId,
+       });
+      this.$modal
+        .confirm("是否确认驳回所选择的数据项？")
+        .then(function () {
+          // return auditPass(param);
+        })
+        .then(() => {
+          // this.getTaskInfo();
+          // this.$modal.msgSuccess("驳回成功");
+        })
+        .catch(() => {});
+    },
     //是否可用勾选框
     selectable(row) {
       if (row.status == "0") {
@@ -244,54 +337,17 @@ export default {
       this.failTemp = [];
       this.ids = selection.map((item) => item.id);
       selection.forEach((item) => {
-        this.passTemp.push({ id: item.id, status: "1" });
+        this.passTemp.push({ id: item.id});
       });
+      console.log(this.agreementId)
       selection.forEach((item) => {
-        this.failTemp.push({ id: item.id, status: "2" });
+        let obj=item;
+        obj.agreementId=this.agreementId
+        this.failTemp.push(obj);
       });
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
-    //获取任务详情-列表数据
-    getTaskInfo() {
-      this.loading = true;
-      getAuditInfo({ taskId: this.taskId }).then((response) => {
-        this.maForm = this.paramTemp;
-        this.equipmentList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    //单个通过
-    handlePass(row) {
-      const param = [];
-      param.push({ id: row.id, status: "1" });
-      this.$modal
-        .confirm("是否确认通过所选择的数据项？")
-        .then(function () {
-          return auditPass(param);
-        })
-        .then(() => {
-          this.getTaskInfo();
-          this.$modal.msgSuccess("通过成功");
-        })
-        .catch(() => {});
-    },
-    //单个驳回
-    handleFail(row) {
-      const param = [];
-      param.push({ id: row.id, status: "2" });
-      this.$modal
-        .confirm("是否确认驳回所选择的数据项？")
-        .then(function () {
-          return auditPass(param);
-        })
-        .then(() => {
-          this.getTaskInfo();
-          this.$modal.msgSuccess("驳回成功");
-        })
-        .catch(() => {});
-    },
     //多个通过
     handlePassAll() {
       if (this.ids.length == 0) {
@@ -301,7 +357,7 @@ export default {
         });
         return;
       } else {
-        auditPass(this.passTemp).then((response) => {
+        batchPassApi({'scrapApplyDetailsList':this.passTemp}).then((response) => {
           if (response.code == 200) {
             this.$modal.msgSuccess("通过成功");
           }
@@ -318,7 +374,7 @@ export default {
         });
         return;
       } else {
-        auditPass(this.failTemp).then((response) => {
+        batchRejectApi({'scrapApplyDetailsList':this.failTemp}).then((response) => {
           if (response.code == 200) {
             this.$modal.msgSuccess("驳回成功");
           }
diff --git a/src/views/material/repair/scrapManage/index.vue b/src/views/material/repair/scrapManage/index.vue
index 9a3a3c88..f1a2f7e8 100644
--- a/src/views/material/repair/scrapManage/index.vue
+++ b/src/views/material/repair/scrapManage/index.vue
@@ -13,6 +13,7 @@
       :editId="editId"
       :queryTaskId="queryTaskId"
       :queryId="queryId"
+      :agreementId="agreementId"
       :param="param"
       :isView="isView"
       :codingTaskId="codingTaskId"
@@ -43,6 +44,7 @@ export default {
       editId: "",
       queryId: "",
       queryTaskId: "",
+      agreementId: "",
       param: {},
       isView: false,
       codingTaskId: "",
@@ -55,6 +57,7 @@ export default {
       this.pageContent = "报废审核";
       this.queryTaskId = taskId;
       this.queryId = id;
+      this.agreementId = row.agreementId;
       this.param = row;
       this.isShowComponent = "AddTools";
     }, 
@@ -63,6 +66,7 @@ export default {
       this.pageContent = "详情信息";
       this.queryTaskId = taskId;
       this.queryId = id;
+      this.agreementId = row.agreementId;
       this.param = row;
       this.isShowComponent = "QueryTools";
     },
diff --git a/src/views/material/repair/testExamine/component/addToolsApply.vue b/src/views/material/repair/testExamine/component/addToolsApply.vue
index 2b8050cd..cb2de152 100644
--- a/src/views/material/repair/testExamine/component/addToolsApply.vue
+++ b/src/views/material/repair/testExamine/component/addToolsApply.vue
@@ -64,6 +64,16 @@
           >驳回</el-button
         >
       </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-check"
+          size="mini" 
+          @click="handleSubmit"
+          >提交</el-button
+        >
+      </el-col> -->
     </el-row>
     <el-table
       v-loading="loading"
@@ -97,6 +107,13 @@
         :show-overflow-tooltip="true"
       >
       </el-table-column>
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="maCode"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
       <el-table-column
         label="退料数量"
         align="center"
@@ -110,6 +127,12 @@
         prop="repairedNum"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="报废数量"
+        align="center"
+        prop="scrapNum"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="待修数量"
         align="center"
@@ -118,7 +141,7 @@
       >
         <template slot-scope="scope">
           <div>
-            {{ scope.row.repairNum - scope.row.repairedNum }}
+            {{ scope.row.repairNum - scope.row.repairedNum - scope.row.scrapNum }}
           </div>
         </template>
       </el-table-column>
@@ -153,7 +176,7 @@
           <!-- <div v-else style="color: red;"></div> -->
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="300">
+      <!-- <el-table-column label="操作" align="center" width="300">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -173,20 +196,20 @@
           </el-button>
           <div v-if="scope.row.status != '0'">-</div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
-    <pagination
+    <!-- <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="maForm.pageNum"
       :limit.sync="maForm.pageSize"
       @pagination="getTaskInfo"
-    />
+    /> -->
   </div>
 </template>
 
 <script>
-import { getAuditInfo, auditPass } from "@/api/repair/testExamine";
+import { getAuditInfo, auditPass,outerAudit } from "@/api/repair/testExamine";
 import { getToken } from "@/utils/auth";
 export default {
   name: "AddTools",
@@ -226,7 +249,7 @@ export default {
       taskId: "",
       // 遮罩层
       loading: true,
-      total: 0,
+      // total: 0,
       //租赁单位
       uniteList: [],
       //租赁工程
@@ -275,34 +298,53 @@ export default {
       this.ids = selection.map((item) => item.id);
       selection.forEach((item) => {
         this.passTemp.push({ id: item.id, status: "1",specificationType: item.specificationType,machineTypeName:item.machineTypeName,
-        unitName:item.unitName,repairNum:item.repairNum,repairedNum:item.repairedNum,typeId:item.typeId,taskId:item.taskId,
-        auditId:item.id,repairId:item.repairId,maId:item.maId, });
+        unitName:item.unitName,repairNum:item.repairNum,repairedNum:item.repairedNum,scrapNum:item.scrapNum,typeId:item.typeId,taskId:item.taskId,
+        auditId:item.id,repairId:item.repairId,maId:item.maId,maCode:item.maCode });
       });
       selection.forEach((item) => {
         this.failTemp.push({ id: item.id, status: "2",specificationType: item.specificationType,machineTypeName:item.machineTypeName,
-        unitName:item.unitName,repairNum:item.repairNum,repairedNum:item.repairedNum,typeId:item.typeId,taskId:item.taskId,
-        auditId:item.id,repairId:item.repairId,maId:item.maId, });
+        unitName:item.unitName,repairNum:item.repairNum,repairedNum:item.repairedNum,scrapNum:item.scrapNum,typeId:item.typeId,taskId:item.taskId,
+        auditId:item.id,repairId:item.repairId,maId:item.maId,maCode:item.maCode });
       });
+      console.log(this.failTemp)
       this.single = selection.length != 1;
       this.multiple = !selection.length;
-      console.log(this.multiple)
+     
     },
     //获取任务详情-列表数据
     getTaskInfo() {
       this.loading = true;
       getAuditInfo({ taskId: this.taskId }).then((response) => {
         this.maForm = this.paramTemp;
-        this.equipmentList = response.rows;
-        this.total = response.total;
+        this.equipmentList = response.data;
+        // this.total = response.total;
         this.loading = false;
       });
     },
+    /** 通过按钮操作 */
+    handleSubmit() { 
+      let param = [{
+        taskId:this.taskId,
+        status: "1"
+      }]
+      this.$modal
+        .confirm("是否确认提交入库？")
+        .then(function () {
+          return outerAudit(param);
+        })
+        .then(() => {
+          this.getTaskInfo();
+          this.$modal.msgSuccess("操作成功");
+        })
+        .catch(() => {});
+      
+    },
     //单个通过
     handlePass(row) {
       const param = [];
       param.push({ id: row.id, status: "1",specificationType: row.specificationType,machineTypeName:row.machineTypeName,
-        unitName:row.unitName,repairNum:row.repairNum,repairedNum:row.repairedNum,typeId:row.typeId,taskId:row.taskId,
-        auditId:row.id,repairId:row.repairId,maId:row.maId, });
+        unitName:row.unitName,repairNum:row.repairNum,repairedNum:row.repairedNum,scrapNum:row.scrapNum,typeId:row.typeId,taskId:row.taskId,
+        auditId:row.id,repairId:row.repairId,maId:row.maId,maCode:row.maCode });
       this.$modal
         .confirm("是否确认通过所选择的数据项？")
         .then(function () {
@@ -318,8 +360,8 @@ export default {
     handleFail(row) {
       const param = [];
       param.push({ id: row.id, status: "2",specificationType: row.specificationType,machineTypeName:row.machineTypeName,
-        unitName:row.unitName,repairNum:row.repairNum,repairedNum:row.repairedNum,typeId:row.typeId,taskId:row.taskId,
-        auditId:row.id,repairId:row.repairId,maId:row.maId,
+        unitName:row.unitName,repairNum:row.repairNum,repairedNum:row.repairedNum,scrapNum:row.scrapNum,typeId:row.typeId,taskId:row.taskId,
+        auditId:row.id,repairId:row.repairId,maId:row.maId,maCode:row.maCode
        });
       this.$modal
         .confirm("是否确认驳回所选择的数据项？")
diff --git a/src/views/material/repair/testExamine/component/homeApply.vue b/src/views/material/repair/testExamine/component/homeApply.vue
index 45d61cc9..16c5947b 100644
--- a/src/views/material/repair/testExamine/component/homeApply.vue
+++ b/src/views/material/repair/testExamine/component/homeApply.vue
@@ -242,7 +242,7 @@ import {
 } from "@/api/repair/testExamine";
 import {
   outerAudit,
-} from "@/api/repair/repair";
+} from "@/api/repair/testExamine";
 import router from "@/router";
 export default {
   name: "Home",
diff --git a/src/views/material/repair/testExamine/component/queryToolsApply.vue b/src/views/material/repair/testExamine/component/queryToolsApply.vue
index 69894465..f964b487 100644
--- a/src/views/material/repair/testExamine/component/queryToolsApply.vue
+++ b/src/views/material/repair/testExamine/component/queryToolsApply.vue
@@ -150,13 +150,13 @@
         </template>
       </el-table-column> -->
     </el-table>
-    <pagination
+    <!-- <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="maForm.pageNum"
       :limit.sync="maForm.pageSize"
       @pagination="getTaskInfo"
-    />
+    /> -->
   </div>
 </template>
 
@@ -201,7 +201,7 @@ export default {
       taskId: "",
       // 遮罩层
       loading: true,
-      total: 0,
+      // total: 0,
       //租赁单位
       uniteList: [],
       //租赁工程
@@ -262,8 +262,8 @@ export default {
       this.loading = true;
       getAuditInfo({ taskId: this.taskId }).then((response) => {
         this.maForm = this.paramTemp;
-        this.equipmentList = response.rows;
-        this.total = response.total;
+        this.equipmentList = response.data;
+        // this.total = response.total;
         this.loading = false;
       });
     },
diff --git a/vue.config.js b/vue.config.js
index 47b1e9ac..a95b2bf3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,8 +36,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:18080`,
-        // target: `http://192.168.2.246:18080`,//马 
-        target: `http://192.168.0.244:18580`,//测试 
+        target: `http://192.168.2.246:18080`,//马 
+        // target: `http://192.168.0.244:18580`,//测试 
         // target: `http://192.168.2.223:18080`,//山
         // target: `http://192.168.0.110:18080`,//洪
         // target: `http://192.168.0.234:18080`,//阮