diff --git a/client/src/views/dashboard/index.vue b/client/src/views/dashboard/index.vue
index 913477d..31ce93a 100644
--- a/client/src/views/dashboard/index.vue
+++ b/client/src/views/dashboard/index.vue
@@ -58,11 +58,11 @@
待办任务提醒
-
+
您有
{{todos.toup}}
- 条记录待上报
+ 条记录待报送
@@ -72,7 +72,7 @@
条记录待整改
-
+
您有
{{todos.toconfirm}}
diff --git a/client/src/views/supervision/record.vue b/client/src/views/supervision/record.vue
index ee6aff2..e9e8227 100644
--- a/client/src/views/supervision/record.vue
+++ b/client/src/views/supervision/record.vue
@@ -39,7 +39,7 @@
@@ -54,7 +54,7 @@
v-model="listQuery.date_gt"
type="date"
value-format="yyyy-MM-dd"
- placeholder="上报时间"
+ placeholder="报送时间"
style="width: 140px"
>
@@ -65,7 +65,7 @@
value-format="yyyy-MM-dd"
@change="handleFilter"
style="width: 140px"
- placeholder="上报时间"
+ placeholder="报送时间"
>
主动上报主动报送
否
-
+
{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}
-
+
{{ scope.row.noteb }}
@@ -167,7 +167,7 @@
- {{
+ {{
scope.row.state
}}
{{
scope.row.state
}}
- {{
+ {{
scope.row.state
}}
-
+
上报报送
-
上报记录
+
报送记录
{{ record.content_name }}
@@ -8,9 +8,9 @@
{{ record.content_desc }}
-
+
{{ record.state }}
- 主动上报
+ 主动报送
{{ record.task_.name }}/{{ record.task_.end_date }}
@@ -25,10 +25,10 @@
{{ record.belong_dept_.name }}
-
+
{{ record.up_user_.name }}/{{ record.up_date }}
-
+
{{ record.noteb }}
diff --git a/client/src/views/supervision/report.vue b/client/src/views/supervision/report.vue
index 72b1341..42f7cb8 100644
--- a/client/src/views/supervision/report.vue
+++ b/client/src/views/supervision/report.vue
@@ -3,7 +3,7 @@
主动上报主动报送
-
-
+
+
@@ -54,7 +54,7 @@
- {{
+ {{
scope.row.state
}}
{{
@@ -63,17 +63,17 @@
{{
scope.row.state
}}
- {{
+ {{
scope.row.state
}}
-
+
{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}
-
+
有
@@ -88,7 +88,7 @@
上报报送
{{ scope.row.end_date }}
-
@@ -219,7 +219,7 @@ export default {
});
},
handleDelete(scope) {
- this.$confirm("确认删除?该操作将删除该任务所有上报记录!", "警告", {
+ this.$confirm("确认删除?该操作将删除该任务所有报送记录!", "警告", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "error",
diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue
index 68a3d1f..b36146c 100644
--- a/client/src/views/supervision/taskdo.vue
+++ b/client/src/views/supervision/taskdo.vue
@@ -53,7 +53,7 @@