From b39d16f0dc959aae9eb3b4dc75994681aedc105f Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sun, 12 May 2024 10:27:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E4=BC=98=E5=8C=96-0512-=E5=A2=9E=E5=8A=A0=E7=A7=BB=E9=99=A4?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dev/deviceChangeOrder.vue | 8 +++++
src/views/dev/js/deviceChangeOrder.js | 43 ++++++++++-----------------
src/views/dev/js/deviceInfoFull.js | 4 +--
3 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/src/views/dev/deviceChangeOrder.vue b/src/views/dev/deviceChangeOrder.vue
index d8c6a3f3..82dc206d 100644
--- a/src/views/dev/deviceChangeOrder.vue
+++ b/src/views/dev/deviceChangeOrder.vue
@@ -195,6 +195,14 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/dev/js/deviceChangeOrder.js b/src/views/dev/js/deviceChangeOrder.js
index 21b7633d..7bb0c3ce 100644
--- a/src/views/dev/js/deviceChangeOrder.js
+++ b/src/views/dev/js/deviceChangeOrder.js
@@ -36,6 +36,7 @@ let createData = {
type: deviceChangeType.CHANGE.key,
toDeptCode: null,
deptCode: null,
+ destroyType: null,
name: null,
remark: null,
items: []
@@ -148,7 +149,7 @@ export default {
} else if (this.type == deviceChangeType.CHANGE) {
this.createTitle = "设备变更";
} else if (this.type == deviceChangeType.DESTROY) {
- this.createTitle = "设备报废";
+ this.createTitle = "设备移除";
}
this.getList()
@@ -183,31 +184,6 @@ export default {
});
},
saveCache() {
- // let data = window.localStorage.getItem(this.cacheKey)
- // if (data == null) {
- // data = {
- // createActive: this.createActive,
- // createData: this.createData,
- // itemList: this.itemList
- // }
- // window.localStorage.setItem(this.cacheKey, JSON.stringify(data))
- // this.showCreateDialog = false
- // } else {
- // this.$confirm("检测到已经挂起了一单，如继续挂起将会覆盖之前的单，是否继续", "提示", {
- // confirmButtonText: "继续",
- // cancelButtonText: "取消",
- // type: "warning",
- // }).then(() => {
- // data = {
- // createActive: this.createActive,
- // createData: this.createData,
- // itemList: this.itemList
- // }
- // window.localStorage.setItem(this.cacheKey, JSON.stringify(data))
- // this.showCreateDialog = false
- // })
- // }
-
this.createData.items = this.itemList
let loading = this.$loading({
@@ -248,7 +224,20 @@ export default {
})
return
}
- } else {
+ } else if (this.createData.type == deviceChangeType.CHANGE.key){
+ let index = this.itemList.findIndex(i => !i.deviceCode && !i.productId);
+ if (index != -1) {
+ this.$confirm(`请先移除空行,第${index + 1}行`, "提示", {
+ confirmButtonText: "确定",
+ type: "error",
+ })
+ return
+ }
+ }else if (this.createData.type == deviceChangeType.DESTROY.key){
+ if (this.createData.destroyType == null){
+ this.$message.warning("请选择移除类型后在立即提交")
+ return
+ }
let index = this.itemList.findIndex(i => !i.deviceCode && !i.productId);
if (index != -1) {
this.$confirm(`请先移除空行,第${index + 1}行`, "提示", {
diff --git a/src/views/dev/js/deviceInfoFull.js b/src/views/dev/js/deviceInfoFull.js
index 60ba8c9c..12547407 100644
--- a/src/views/dev/js/deviceInfoFull.js
+++ b/src/views/dev/js/deviceInfoFull.js
@@ -1,4 +1,4 @@
-import {deviceAllPage, deviceLogs, detailPage, genDeviceQR,detailByDeptCodePage} from "@/api/dev/deviceInfoApi";
+import {deviceDetailInfo,deviceAllPage, deviceLogs, detailPage, genDeviceQR,detailByDeptCodePage} from "@/api/dev/deviceInfoApi";
import {deviceChangeStatus, deviceChangeType, deviceStatus} from "@/utils/enum";
import {downloadBase64Image} from "@/utils";
import deptDeviceDetail from "@/views/dev/DeptDeviceDetail.vue";
@@ -144,7 +144,7 @@ export default {
this.loading = false
return
}
- detailByDeptCodePage(this.query).then(res => {
+ deviceDetailInfo(this.query).then(res => {
this.loading = false
if (res.code != 20000) {
this.$message.error(res.message)