From 69b6b6e33b8458295a731b96c062f6cbdddebe58 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 13 Sep 2021 17:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/workreport/workreport.vue | 133 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 128 insertions(+), 5 deletions(-)
diff --git a/src/views/workreport/workreport.vue b/src/views/workreport/workreport.vue
index 09342f1..bc05bc0 100644
--- a/src/views/workreport/workreport.vue
+++ b/src/views/workreport/workreport.vue
@@ -52,7 +52,6 @@
import { getDept } from "@/api/system/dept";
import { mapGetters } from "vuex";
import { mapState } from "vuex";
-import { workreportColumn } from "./data";
export default {
data() {
@@ -78,7 +77,7 @@
calcHeight: 30,
dialogWidth: 1000,
tip: false,
- searchBtn: false,
+ searchBtn: true,
searchShow: true,
searchShowBtn: false,
searchMenuSpan: 6,
@@ -91,7 +90,133 @@
excelBtn: false,
menuWidth: 320,
dialogClickModal: false,
- column:workreportColumn,
+ column:[{
+ label: "汇报时间",
+ prop: "reportTime",
+ type: "datetime",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ searchRange: true,
+ searchSpan: 6,
+ hide: false,
+ addDisplay: false,
+ editDisplay: false,
+ // viewDisplay: false,
+ search: 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",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ searchSpan: 4,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择汇报类型",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "接收人",
+ prop: "receivedIds",
+ // span: 12,
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/lazy-tree-users?type=3",
+ hide: true,
+ leafOnly: true,
+ props: {
+ label: "title",
+ value: "id",
+ },
+ multiple: true,
+ // dataType: "number",
+ rules: [{
+ required: true,
+ message: "请选择接收人",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "汇报人身份证号",
+ prop: "idCardNo",
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ },
+ {
+ label: "汇报内容",
+ prop: "content",
+ type: "textarea",
+ span: 24,
+ rules: [{
+ required: true,
+ message: "请输入汇报内容",
+ trigger: "blur"
+ }]
+ },
+
+ {
+ label: "接收人",
+ prop: "replyRealName",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ },
+ {
+ label: "接收人单位",
+ prop: "replyDeptName",
+ addDisplay: false,
+ editDisplay: false,
+ // viewDisplay: false,
+ },
+ {
+ label: "回复内容",
+ prop: "replyContent",
+ type: "textarea",
+ span: 24,
+ addDisplay: false,
+ editDisplay: false,
+ rules: [{
+ required: true,
+ message: "请输入回复内容",
+ trigger: "blur"
+ }]
+ }
+ ],
},
data: [],
};
@@ -245,8 +370,6 @@
var that = this;
getDept(this.deptId).then(() => {
- const columnReceivedIds = that.findObject(that.option.column, "receivedIds");
- columnReceivedIds.dicUrl = "/api/blade-system/dept/lazy-tree-users?type=3&deptId="+that.deptId;
params["deptId"] = that.deptId;
params["userId"] = that.userId;
--
Gitblit v1.9.3