From a1d03a0e810219f8353748f6e55699bf2e1a77a6 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期一, 15 八月 2022 19:48:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
index 8d6e281..2f8c470 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
@@ -394,7 +394,6 @@
};
const showInspectTaskDialog = (type: string, value: { id: number; uuid: string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: [], regionNameList: [], RFIDList: []) => {
- debugger;
data.regionNameList = regionNameList;
data.RFIDList = RFIDList;
data.quotaList = JSON.parse(JSON.stringify(quotaList));
@@ -435,6 +434,10 @@
giveClassGroup();
data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
} else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
})
.catch((error) => {});
@@ -447,6 +450,10 @@
if (res.data.code === '200') {
data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
} else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
})
.catch((error) => {});
@@ -606,7 +613,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
--
Gitblit v1.9.2