@@ -241,6 +242,39 @@ export default {
this.propagandaopen = false
this.lookitem = {}
},
+ // 忽略
+ ignore() {
+ let manageRouteNodeIds = []
+ this.nodelist.map(e => {
+ manageRouteNodeIds = [...manageRouteNodeIds, ...e.nodeList.map(el => el.id)]
+ })
+ this.$prompt('请输入忽略备注信息?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ }).then(({ value }) => {
+ let obj = {
+ routeCheckPerson: JSON.parse(localStorage.getItem('user')).nickName,
+ routeCheckRemark: value,
+ routeCheckStatus: 'DISAGREE',
+ manageRouteNodeIds: manageRouteNodeIds
+ }
+ audit(obj).then(res => {
+ this.$notify({
+ type: 'success',
+ title: '提示',
+ message: '已忽略,即将返回上一页',
+ duration: 3000
+ });
+ setTimeout(() => {
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/task/manualReview",
+ });
+ })
+ }, 3000);
+ })
+ })
+ },
//审核
auditing() {
let manageRouteNodeIds = []
From 710f38f07db9c2c7052ddcec077999bab53fc6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 19 Apr 2024 10:33:08 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/manage/projectdevice/index.vue | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/views/manage/projectdevice/index.vue b/src/views/manage/projectdevice/index.vue
index d26c197..3c50ce9 100644
--- a/src/views/manage/projectdevice/index.vue
+++ b/src/views/manage/projectdevice/index.vue
@@ -123,7 +123,9 @@
-
+
+
+
@@ -131,7 +133,6 @@
-
@@ -154,13 +155,11 @@
-
搜索
重置
-
@@ -276,7 +275,6 @@ export default {
/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/,
},
],
-
deviceCode: [
{ required: true, message: "设备编码不能为空", trigger: "blur" },
],
From cf88299bd0b8668c566eb7c82358718f2e283100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 19 Apr 2024 10:38:35 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/specialDiseaseNode/index.vue | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index 55301bc..60dbf84 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -360,12 +360,19 @@ export default {
},
methods: {
info() {
+ const loading = this.$loading({
+ lock: true,
+ text: '数据加载中',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
this.lists = []
if (this.$route.query) {
this.updata.suitRange = this.$route.query.suitRange
this.updata.routeName = this.$route.query.routeName
this.updata.specialDiseaseRouteId = this.$route.query.id
selectSpecialDisease(this.$route.query.id).then(res => {
+ loading.close();
this.agreeNumber = res.data.agreeNumber
this.totalNumber = res.data.totalNumber
res.data.specialDiseaseNodeList.forEach(e => {
@@ -380,6 +387,7 @@ export default {
}
})
} else {
+ loading.close();
this.lists.push({
routeNodeName: "",
routeNodeDay: '',
@@ -452,6 +460,12 @@ export default {
//暂存
TemporaryStorage() {
this.$refs.wangeditor.emit()
+ const loading = this.$loading({
+ lock: true,
+ text: '暂存中',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
this.updata.specialDiseaseNodeList = []
this.lists.forEach(e => {
e.list.length > 0 ? e.list.forEach(el => {
@@ -462,6 +476,7 @@ export default {
})
specialDiseaseNode(this.updata).then(res => {
this.info();
+ loading.close();
this.$modal.msgSuccess("暂存成功!");
})
},
From f2f72996185ac0611a1f854821bf023a96aac658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 19 Apr 2024 10:58:35 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/components/message.vue | 8 ++------
src/views/system/components/miniProgram.vue | 8 ++------
src/views/system/components/officialAccount.vue | 8 ++------
src/views/system/components/propaganda.vue | 8 ++------
src/views/system/components/question.vue | 8 ++------
5 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/src/views/system/components/message.vue b/src/views/system/components/message.vue
index 2dbe46c..cb9c72f 100644
--- a/src/views/system/components/message.vue
+++ b/src/views/system/components/message.vue
@@ -146,14 +146,10 @@ export default {
this.Departmentlist();
},
templateId(newValue, oldValue) {
- if (newValue) {
- this.handleselectId = newValue;
- }
+ this.handleselectId = newValue;
},
templateName(newValue, oldValue) {
- if (newValue) {
- this.handleselectName = newValue;
- }
+ this.handleselectName = newValue;
}
},
mounted() {
diff --git a/src/views/system/components/miniProgram.vue b/src/views/system/components/miniProgram.vue
index b0ff951..6db4100 100644
--- a/src/views/system/components/miniProgram.vue
+++ b/src/views/system/components/miniProgram.vue
@@ -146,14 +146,10 @@ export default {
this.Departmentlist();
},
templateId(newValue, oldValue) {
- if (newValue) {
- this.handleselectId = newValue;
- }
+ this.handleselectId = newValue;
},
templateName(newValue, oldValue) {
- if (newValue) {
- this.handleselectName = newValue;
- }
+ this.handleselectName = newValue;
}
},
mounted() {
diff --git a/src/views/system/components/officialAccount.vue b/src/views/system/components/officialAccount.vue
index 1e14a8d..7a59bbb 100644
--- a/src/views/system/components/officialAccount.vue
+++ b/src/views/system/components/officialAccount.vue
@@ -146,14 +146,10 @@ export default {
this.Departmentlist();
},
templateId(newValue, oldValue) {
- if (newValue) {
- this.handleselectId = newValue;
- }
+ this.handleselectId = newValue;
},
templateName(newValue, oldValue) {
- if (newValue) {
- this.handleselectName = newValue;
- }
+ this.handleselectName = newValue;
}
},
mounted() {
diff --git a/src/views/system/components/propaganda.vue b/src/views/system/components/propaganda.vue
index f4926c7..b07d128 100644
--- a/src/views/system/components/propaganda.vue
+++ b/src/views/system/components/propaganda.vue
@@ -165,14 +165,10 @@ export default {
},
watch: {
templateId(newValue, oldValue) {
- if (newValue) {
- this.handleselectId = newValue;
- }
+ this.handleselectId = newValue;
},
templateName(newValue, oldValue) {
- if (newValue) {
- this.handleselectName = newValue;
- }
+ this.handleselectName = newValue;
}
},
computed: {
diff --git a/src/views/system/components/question.vue b/src/views/system/components/question.vue
index 8b4231d..b7c097a 100644
--- a/src/views/system/components/question.vue
+++ b/src/views/system/components/question.vue
@@ -125,14 +125,10 @@ export default {
},
watch: {
templateId(newValue, oldValue) {
- if (newValue) {
- this.handleselectId = newValue;
- }
+ this.handleselectId = newValue;
},
templateName(newValue, oldValue) {
- if (newValue) {
- this.handleselectName = newValue;
- }
+ this.handleselectName = newValue;
}
},
methods: {
From 9f09f19b52cc2ea4bbcaea4c6eaa1eb39f5b207f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 19 Apr 2024 11:05:22 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/editorialSpecialization/index.vue | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/views/system/editorialSpecialization/index.vue b/src/views/system/editorialSpecialization/index.vue
index 8864aa5..4864b6b 100644
--- a/src/views/system/editorialSpecialization/index.vue
+++ b/src/views/system/editorialSpecialization/index.vue
@@ -4,6 +4,7 @@
+ 返回
保存
@@ -413,6 +414,13 @@ export default {
})
})
},
+ back() {
+ this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+ this.$router.push({
+ path: "/specialdisease/specialDiseaseRoute",
+ });
+ })
+ },
},
};
From 7c50cad446339333dd3976f4035f48b00a459230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 19 Apr 2024 11:30:09 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/specialDiseaseNode/index.vue | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index 60dbf84..e5efdd2 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -474,6 +474,7 @@ export default {
this.updata.specialDiseaseNodeList.push(el)
}) : ""
})
+ this.updata.specialDiseaseNodeList = this.updata.specialDiseaseNodeList.filter(e => e.routeNodeDay && e.routeNodeName && e.taskType && e.taskSubdivision && e.taskStatus)
specialDiseaseNode(this.updata).then(res => {
this.info();
loading.close();
@@ -614,6 +615,26 @@ export default {
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
+ if (!this.routeform.routeNodeDay) {
+ this.$message.error('请输入节点时间段天数');
+ return
+ }
+ if (!this.routeform.routeNodeName) {
+ this.$message.error('请选择节点时间段');
+ return
+ }
+ if (!this.routeform.taskType) {
+ this.$message.error('请选择任务类型');
+ return
+ }
+ if (!this.routeform.taskSubdivision) {
+ this.$message.error('请选择任务细分');
+ return
+ }
+ if (!this.routeform.taskStatus) {
+ this.$message.error('请选择任务状态');
+ return
+ }
updateRouteCheckStatus({
routeCheckStatus: this.routeform.routeCheckStatus,
id: this.form.specialDiseaseNodeId,
From 0be026b392f99e3b44801d572d84ac432639d0f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 19 Apr 2024 11:35:15 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/specialDiseaseNode/index.vue | 43 +++++++++++--------
1 file changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index e5efdd2..5b55d23 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -460,25 +460,30 @@ export default {
//暂存
TemporaryStorage() {
this.$refs.wangeditor.emit()
- const loading = this.$loading({
- lock: true,
- text: '暂存中',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
- });
- this.updata.specialDiseaseNodeList = []
- this.lists.forEach(e => {
- e.list.length > 0 ? e.list.forEach(el => {
- el.routeNodeDay = e.routeNodeDay
- el.routeNodeName = e.routeNodeName
- this.updata.specialDiseaseNodeList.push(el)
- }) : ""
- })
- this.updata.specialDiseaseNodeList = this.updata.specialDiseaseNodeList.filter(e => e.routeNodeDay && e.routeNodeName && e.taskType && e.taskSubdivision && e.taskStatus)
- specialDiseaseNode(this.updata).then(res => {
- this.info();
- loading.close();
- this.$modal.msgSuccess("暂存成功!");
+ this.$confirm('确认暂存时将过滤掉部分内容未填写完成的子节点,是否确认暂存？', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ }).then(() => {
+ const loading = this.$loading({
+ lock: true,
+ text: '暂存中',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
+ this.updata.specialDiseaseNodeList = []
+ this.lists.forEach(e => {
+ e.list.length > 0 ? e.list.forEach(el => {
+ el.routeNodeDay = e.routeNodeDay
+ el.routeNodeName = e.routeNodeName
+ this.updata.specialDiseaseNodeList.push(el)
+ }) : ""
+ })
+ this.updata.specialDiseaseNodeList = this.updata.specialDiseaseNodeList.filter(e => e.routeNodeDay && e.routeNodeName && e.taskType && e.taskSubdivision && e.taskStatus)
+ specialDiseaseNode(this.updata).then(res => {
+ this.info();
+ loading.close();
+ this.$modal.msgSuccess("暂存成功!");
+ })
})
},
//问卷传值