From c988485ed856734ff3e2c5292dff4da7a5c81b30 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 26 六月 2025 10:41:36 +0800
Subject: [PATCH] 1.库存管理-弹框名称修改 2.巡检管理-任务下发删除
---
src/views/warehouseManagement/index.vue | 2 +-
src/api/inspectionManagement/index.js | 2 +-
src/views/inspectionManagement/index.vue | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/api/inspectionManagement/index.js b/src/api/inspectionManagement/index.js
index 16adbd9..a33c185 100644
--- a/src/api/inspectionManagement/index.js
+++ b/src/api/inspectionManagement/index.js
@@ -17,7 +17,7 @@
data: query
})
}
-// 宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
+// 宸℃浠诲姟琛ㄥ垹闄�
export function delInspectionTask(query) {
return request({
url: '/inspectionTask/delInspectionTask',
diff --git a/src/views/inspectionManagement/index.vue b/src/views/inspectionManagement/index.vue
index 18ecd14..fc91909 100644
--- a/src/views/inspectionManagement/index.vue
+++ b/src/views/inspectionManagement/index.vue
@@ -232,7 +232,11 @@
}
const deleteIds = selectedRows.value.map(item => item.id);
proxy.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
- return delQrCode(deleteIds)
+ if (tabName.value === "task") {
+ return delInspectionTask(deleteIds)
+ } else {
+ return delQrCode(deleteIds)
+ }
}).then(() => {
handleQuery()
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 49e5824..2dfca16 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -163,7 +163,7 @@
</template>
</el-dialog>
<!-- 鍚堝苟鏁版嵁寮规 -->
- <el-dialog title="鍚堝苟搴撳瓨" v-model="mergeVisible" width="800px">
+ <el-dialog :title="operationType.value === 'edit' ? '缂栬緫搴撳瓨' : '鍚堝苟搴撳瓨'" v-model="mergeVisible" width="800px">
<el-form :model="mergeForm" :rules="mergeRules" ref="mergeRef" label-width="100px">
<el-row>
<el-col :span="12">
--
Gitblit v1.9.3