From 2d50c51214f0ced8c992a415c72ea33b519fff59 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 03 Sep 2021 15:53:05 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/workreport/data.js | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/views/workreport/data.js b/src/views/workreport/data.js
index 5a9fe2f..3584230 100644
--- a/src/views/workreport/data.js
+++ b/src/views/workreport/data.js
@@ -17,28 +17,30 @@
message: "请输入时间",
trigger: "blur"
}]
-}, {
- label: "汇报类别",
- prop: "category",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- // searchSpan: 4,
- // search: true,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- rules: [{
- required: true,
- message: "请选择汇报类别",
- trigger: "blur"
- }]
-}, {
+},
+// {
+// label: "汇报类别",
+// prop: "category",
+// type: "select",
+// dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
+// props: {
+// label: "dictValue",
+// value: "dictKey"
+// },
+// dataType: "number",
+// // searchSpan: 4,
+// // search: true,
+// hide: true,
+// addDisplay: false,
+// editDisplay: false,
+// viewDisplay: false,
+// rules: [{
+// required: true,
+// message: "请选择汇报类别",
+// trigger: "blur"
+// }]
+// },
+{
label: "汇报类型",
prop: "type",
type: "select",
@@ -61,7 +63,7 @@
prop: "receivedIds",
// span: 12,
type: "tree",
- dicUrl: "/api/blade-system/dept/lazy-tree-user",
+ dicUrl: "/api/blade-system/dept/lazy-tree-users?type=3&deptId=" + this.deptId,
hide: true,
leafOnly: true,
props: {
@@ -162,7 +164,8 @@
message: "请输入时间",
trigger: "blur"
}]
-}, {
+},
+{
label: "汇报类别",
prop: "category",
type: "select",
@@ -178,14 +181,13 @@
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- hide: true,
- editDisplay: false,
rules: [{
required: true,
message: "请选择汇报类别",
trigger: "blur"
}]
-}, {
+},
+{
label: "汇报类型",
prop: "type",
type: "select",
--
Gitblit v1.9.3