Merge remote-tracking branch 'origin/project2024-3-5' into project2024-3-5

# Conflicts:
#	src/views/equipment/inventoryManagement/index.vue

src/api/magnagement.js

@@ -108,6 +108,7 @@ export function add(data) {
     }
   })
 }
+// 批量添加
 export function addBatch(data) {
   return request({
     url: '/wbwarehouse-test/add-test',
@@ -118,6 +119,13 @@ export function addBatch(data) {
     }
   })
 }
+//根据id删除库存
+export function deleteWareHouse(id) {
+  return request({
+    url: '/wbwarehouse-test/deleteWareHouse/' + id,
+    method: 'delete'
+  })
+}
 // 再利用
 export function recycle(data) {
   return request({

src/views/equipment/inventoryManagement/index.vue

@@ -91,7 +91,7 @@
             <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="110px">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="handleDetail(scope.row)">
               详情
@@ -102,6 +102,13 @@
               type="text"
               @click="handleUpdate(scope.row)"
             >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -246,7 +253,7 @@ import {
   exportWarehouse,
   importExcel,
   uploadFalseFile,
-  importTemplate
+  importTemplate, deleteWareHouse
 } from '@/api/magnagement'
 import { resetForm } from '@/utils/common'
 
@@ -476,7 +483,22 @@ export default {
         }
       })
     },
-    /* 弹窗*/
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.businessId
+      this.$confirm('是否确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        return deleteWareHouse(id).then(res => {
+          if (res.code === 200) {
+            this.$message.success('操作成功')
+            this.getList()
+          }
+        })
+      })
+    },
 
     /** 导出按钮操作 */
     handleExport() {

src/views/equipment/inventoryRecord/index.vue

@@ -489,6 +489,7 @@ export default {
     /** TODO:查询工序库的出入库记录列表 */
     getList() {
       this.loading = true
+      console.log(this.queryParams)
       listLog(this.queryParams).then(response => {
         this.inventoryRecordList = response.rows
         this.total = response.total