From 4da370f500cbabfbeb75f8006b8a3403656c4c5f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 01 Sep 2021 16:33:17 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

---
 src/views/workreport/data.js |  436 +++++++++++++++++++++++++++---------------------------
 1 files changed, 218 insertions(+), 218 deletions(-)

diff --git a/src/views/workreport/data.js b/src/views/workreport/data.js
index b089e58..177ca83 100644
--- a/src/views/workreport/data.js
+++ b/src/views/workreport/data.js
@@ -1,232 +1,232 @@
 //已发送列表信息
 export var workreportColumn = [{
-        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",
-        cascaderItem: ["receivedIds"],
-        props: {
-            label: "dictValue",
-            value: "dictKey"
-        },
-        dataType: "number",
-        searchSpan: 5,
-        search: true,
-        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: 5,
-        search: true,
-        rules: [{
-            required: true,
-            message: "请选择汇报类型",
-            trigger: "blur"
-        }]
+    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",
+    cascaderItem: ["receivedIds"],
+    props: {
+        label: "dictValue",
+        value: "dictKey"
     },
-    {
-        label: "汇报人身份证号",
-        prop: "idCardNo",
-        hide: true,
-        addDisplay: false,
-        editDisplay: false,
-        viewDisplay: false,
+    dataType: "number",
+    searchSpan: 5,
+    search: true,
+    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"
     },
-    {
-        label: "汇报内容",
-        prop: "content",
-        type: "textarea",
-        span: 24,
-        rules: [{
-            required: true,
-            message: "请输入汇报内容",
-            trigger: "blur"
-        }]
+    dataType: "number",
+    searchSpan: 5,
+    search: true,
+    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: "receivedIds",
+    span: 24,
+    type: "tree",
+    // lazy: true,
+    // dicUrl: "/api/blade-system/dept/lazy-tree-user-app?type={{key}}",
+    hide: true,
+    props: {
+        label: "title",
+        value: "id",
     },
-    {
-        label: "接收人",
-        prop: "receivedIds",
-        span: 24,
-        type: "tree",
-        // lazy: true,
-        // dicUrl: "/api/blade-system/dept/lazy-tree-user-app?type={{key}}",
-        hide: true,
-        props: {
-            label: "title",
-            value: "id",
-        },
-        multiple: true,
-        // dataType: "number",
-        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"
-        }]
-    }
+    multiple: true,
+    // dataType: "number",
+    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"
+    }]
+}
 ]
 
 
 //接收人列信息
 export var workreplyColumn = [{
-        label: "汇报人",
-        prop: "realName",
-        disabled: true,
-        span: 24,
-        rules: [{
-            required: true,
-            message: "请选择接收人",
-            trigger: "blur"
-        }]
+    label: "汇报人",
+    prop: "realName",
+    disabled: true,
+    span: 24,
+    rules: [{
+        required: true,
+        message: "请选择接收人",
+        trigger: "blur"
+    }]
+},
+{
+    label: "汇报人单位",
+    prop: "deptName",
+    addDisplay: false,
+    editDisplay: false,
+    // viewDisplay: false,
+}, {
+    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"
     },
-    {
-        label: "汇报人单位",
-        prop: "deptName",
-        addDisplay: false,
-        editDisplay: false,
-        // viewDisplay: false,
-    }, {
-        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,
-        editDisplay: 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,
-        disabled: true,
-        rules: [{
-            required: true,
-            message: "请选择汇报类型",
-            trigger: "blur"
-        }]
+    dataType: "number",
+    searchSpan: 4,
+    search: true,
+    hide: true,
+    editDisplay: 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"
     },
-    // {
-    //     label: "汇报人身份证号",
-    //     prop: "idCardNo",
-    //     hide: true,
-    //     addDisplay: false,
-    //     editDisplay: false,
-    //     viewDisplay: false,
-    // },
-    {
-        label: "汇报内容",
-        prop: "content",
-        type: "textarea",
-        // editDisplay: false,
-        disabled: true,
-        span: 24,
-        rules: [{
-            required: true,
-            message: "请输入汇报内容",
-            trigger: "blur"
-        }]
-    },
-    {
-        label: "回复内容",
-        prop: "replyContent",
-        type: "textarea",
-        span: 24,
-        rules: [{
-            required: true,
-            message: "请输入回复内容",
-            trigger: "blur"
-        }]
-    }
+    dataType: "number",
+    searchSpan: 4,
+    search: true,
+    disabled: true,
+    rules: [{
+        required: true,
+        message: "请选择汇报类型",
+        trigger: "blur"
+    }]
+},
+// {
+//     label: "汇报人身份证号",
+//     prop: "idCardNo",
+//     hide: true,
+//     addDisplay: false,
+//     editDisplay: false,
+//     viewDisplay: false,
+// },
+{
+    label: "汇报内容",
+    prop: "content",
+    type: "textarea",
+    // editDisplay: false,
+    disabled: true,
+    span: 24,
+    rules: [{
+        required: true,
+        message: "请输入汇报内容",
+        trigger: "blur"
+    }]
+},
+{
+    label: "回复内容",
+    prop: "replyContent",
+    type: "textarea",
+    span: 24,
+    rules: [{
+        required: true,
+        message: "请输入回复内容",
+        trigger: "blur"
+    }]
+}
 
 ]
\ No newline at end of file

--
Gitblit v1.9.3