From 6626ee3aac20e2d407e46749c46181af973ff876 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 19 Nov 2024 09:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=89=8D=E7=AB=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/purchase/goodsArrived/component/addTools.vue  | 2 +-
 .../material/purchase/goodsArrived/component/home.vue      | 7 ++++++-
 vue.config.js                                              | 6 +++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index 226816ac..598c772f 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -794,7 +794,7 @@ export default {
                         }
                     })
                     this.equipmentList.forEach((item, index) => {
-                        if (item.id == row.id) {
+                        if (item.typeId == row.typeId) {
                             this.equipmentList.splice(index, 1)
                         }
                     })
diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index 724f7982..26fd9777 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -187,7 +187,12 @@
                     <span v-if="scope.row.taskStatus==10">未完成</span>
                 </template> -->
       </el-table-column>
-
+      <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+                show-overflow-tooltip
+            />
       <el-table-column label="操作" align="center" width="250">
         <template slot-scope="scope">
           <el-button
diff --git a/vue.config.js b/vue.config.js
index 05ad4b79..142c3c0c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,11 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.2.72:18080`,
+        // target: `http://localhost:18080`,
+        target: `http://192.168.2.246:18080`,//马
+        // target: `http://192.168.0.110:18080`,//洪
+        // target: `http://192.168.0.234:18080`,//阮
+        // target: `http://192.168.137.1:18080`,//
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",