From 24f30cce3f72d54ee2ebc594a29bbe78abcdfb6f Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 7 Nov 2024 15:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=96=B0=E5=A2=9E=E8=81=94?=
 =?UTF-8?q?=E8=B0=834?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/purchase/goodsArrived.js              | 70 +++----------------
 .../material/purchase/goodsAccept/index.vue   |  4 +-
 .../goodsArrived/component/addTools.vue       | 21 +++++-
 .../purchase/goodsArrived/component/home.vue  | 15 ++--
 4 files changed, 40 insertions(+), 70 deletions(-)

diff --git a/src/api/purchase/goodsArrived.js b/src/api/purchase/goodsArrived.js
index 96c89b8f..68db1f49 100644
--- a/src/api/purchase/goodsArrived.js
+++ b/src/api/purchase/goodsArrived.js
@@ -36,6 +36,14 @@ export function updatePurchaseCheckInfo(data) {
   })
 }
 
+// 新购到货--删除
+export function purchaseCheckInfoRemove(ids) {
+  return request({
+      url: '/material/purchase_check_info/' + ids,
+      method: 'delete',
+  })
+}
+
 //通知人员列表
 export function getNoticePeople(query) {
   return request({
@@ -45,8 +53,6 @@ export function getNoticePeople(query) {
   })
 }
 
-
-
 // 人员管理--新增
 export function addNoticeUser(data) {
   return request({
@@ -56,7 +62,7 @@ export function addNoticeUser(data) {
   })
 }
 
- 
+ // 人员通知-通知
 export function bmNoticeInfo(data) {
   return request({
       url: '/material/purchase_notice_person/batchSendSms',
@@ -81,7 +87,7 @@ export function delPeople(ids) {
   })
 }
 
-//获取机具类型树2
+//获取机具类型树
 export function equipmentTypeTree(query) {
   return request({
       url: '/material/ma_type/equipmentType',
@@ -90,7 +96,6 @@ export function equipmentTypeTree(query) {
   })
 }
 
-
 // 上传报告附件
 export function uploadPurchaseFile(data) {
   return request({
@@ -100,58 +105,5 @@ export function uploadPurchaseFile(data) {
   })
 }
 
- 
-export function getHouseDetail(id) {
-  return request({
-      url: '/material/wh_house_info/'+ id,
-      method: 'get',
-  })
-}
-
-
- 
-export function queryKeeperNameApi(query) {
-  return request({
-    url: '/material/ma_type/selectMaTypeListByTypeId',
-    method: 'get',
-    params: query
-  })
-}
-
-
-
- 
-export function delHouse(id) {
-  return request({
-      url: '/material/wh_house_info/' + id,
-      method: 'delete',
-  })
-}
-
- 
-export function editHouse(data) {
-  return request({
-      url: '/material/wh_house_info',
-      method: 'put',
-      data: data,
-  })
-}
-
- 
-export function addHouse(data) {
-  return request({
-      url: '/material/wh_house_info',
-      method: 'post',
-      data: data,
-  })
-}
-
- 
-export function getProjectList(query) {
-  return request({
-    url: '/material/base/bmProjectInfo/projectInfoAll',
-    method: 'get',
-    params: query
-  })
-}
+  
 
diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue
index 09e700e4..80c26643 100644
--- a/src/views/material/purchase/goodsAccept/index.vue
+++ b/src/views/material/purchase/goodsAccept/index.vue
@@ -73,7 +73,7 @@
         <el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="80"/>
         <el-table-column label="采购价格（元不含税）" align="center" prop="purchasePrice" width="98"/>
         <el-table-column label="税率" align="center" prop="taxRate" />
-        <el-table-column label="操作人" align="center" prop="createUserName" />
+        <el-table-column label="操作人" align="center" prop="createBy" />
         <el-table-column label="操作时间" align="center" prop="createTime" />
         <el-table-column label="状态" align="center" prop="taskStatus">
             <template slot-scope="scope">
@@ -88,7 +88,7 @@
                 <span v-if="scope.row.taskStatus==8">驳回待入库</span>
                 <span v-if="scope.row.taskStatus==9">入库进行中</span>
                 <span v-if="scope.row.taskStatus==10">未完成</span>
-                <span v-else>/</span>
+                <!-- <span v-else>/</span> -->
 
 
 
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index 0b660b01..19bb4e7a 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -533,7 +533,6 @@ export default {
                         }
                     }
                 }
-
                 const newDataListNew = [...this.equipmentList, ...tempList]
                 const map = new Map()
                 for (let item of newDataListNew) {
@@ -769,6 +768,26 @@ export default {
                 }
             }
         },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            // console.log(row.id)
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(() => {
+                    this.deviceType.forEach((e, index) => {
+                        if (e[3] === row.typeId) {
+                            this.deviceType.splice(index, 1)
+                            this.propsKey++
+                        }
+                    })
+                    this.equipmentList.forEach((item, index) => {
+                        if (item.id == row.id) {
+                            this.equipmentList.splice(index, 1)
+                        }
+                    })
+                })
+                .catch(() => {})
+        },
     },
 }
 </script>
diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index 4c567e7d..a53852d2 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -153,7 +153,7 @@
             <el-table-column
                 label="物资厂家"
                 align="center"
-                prop="remark"
+                prop="supplier"
                 :show-overflow-tooltip="true"
             />
 
@@ -161,7 +161,7 @@
             <el-table-column
                 label="操作人"
                 align="center"
-                prop="updateBy"
+                prop="createBy"
                 :show-overflow-tooltip="true"
             />
 
@@ -169,7 +169,7 @@
             <el-table-column
                 label="操作时间"
                 align="center" width="160"
-                prop="updateTime"
+                prop="createTime"
                 :show-overflow-tooltip="true"
             />
 
@@ -207,7 +207,7 @@
                     <el-button
                         size="mini"
                         type="danger" 
-                        @click="handleDelete(scope.row)"
+                        @click="handleDeletePurchase(scope.row)"
                         v-hasPermi="['purchase:info:remove']"
                         >删除</el-button
                     >
@@ -828,13 +828,12 @@ export default {
         },
 
         /** 删除按钮操作 */
-        handleDelete(row) {
-            // console.log(row)
-            const taskIds = row.taskId || this.ids
+        handleDeletePurchase(row) {
+            // console.log(row) 
             this.$modal
                 .confirm('是否确认删除所选择的数据项？')
                 .then(function () {
-                    return purchaseCheckInfoRemove(taskIds)
+                    return purchaseCheckInfoRemove(row.id)
                 })
                 .then(() => {
                     this.getList()