工作汇报修改

Administrator

2021-09-09 495938da52c69b03acf56b16d5d126c97836b23a

工作汇报修改

 src/api/system/dept.js

@@ -87,4 +87,14 @@
            parentId
        }
    })
}

export const getDeptLazyTreeUsers = (type) => {
    return request({
        url: '/api/blade-system/dept/lazy-tree-users',
        method: 'get',
        params: {
            type
        }
    })
}

 src/router/views/index.js

@@ -28,27 +28,27 @@
    {
        path: '/wel',
        component: () =>
            import('@/views/home/index')
        // component: Layout,
        // redirect: '/wel/index',
        // children: [{
        //   path: 'index',
        //   name: '首页',
        //   meta: {
        //     i18n: 'dashboard'
        //   },
        //   component: () =>
        //     import( /* webpackChunkName: "views" */ '@/views/wel/index')
        // }, {
        //   path: 'dashboard',
        //   name: '控制台',
        //   meta: {
        //     i18n: 'dashboard',
        //     menu: false,
        //   },
        //   component: () =>
        //     import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
        // }]
            import ('@/views/home/index')
            // component: Layout,
            // redirect: '/wel/index',
            // children: [{
            //   path: 'index',
            //   name: '首页',
            //   meta: {
            //     i18n: 'dashboard'
            //   },
            //   component: () =>
            //     import( /* webpackChunkName: "views" */ '@/views/wel/index')
            // }, {
            //   path: 'dashboard',
            //   name: '控制台',
            //   meta: {
            //     i18n: 'dashboard',
            //     menu: false,
            //   },
            //   component: () =>
            //     import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
            // }]
    },


@@ -64,7 +64,7 @@
                i18n: 'test'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/util/test')
                import ( /* webpackChunkName: "views" */ '@/views/util/test')
        }]
    }, {
        path: '/dict-horizontal',
@@ -77,7 +77,7 @@
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
        }]
    }, {
        path: '/dict-vertical',
@@ -90,7 +90,7 @@
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
        }]
    }, {
        path: '/info',
@@ -103,7 +103,7 @@
                i18n: 'info'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
                import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
        }]
    }, {
        path: '/work/process/leave',
@@ -116,7 +116,7 @@
                i18n: 'work'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
        }, {
            path: 'handle/:taskId/:processInstanceId/:businessId',
            name: '处理请假流程',
@@ -124,7 +124,7 @@
                i18n: 'work'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
        }, {
            path: 'detail/:processInstanceId/:businessId',
            name: '请假流程详情',
@@ -132,7 +132,7 @@
                i18n: 'work'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
        }]
    }, {
        path: '/attach',
@@ -145,7 +145,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/resource/attach')
                import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
        }]
    },
    // {
@@ -173,7 +173,7 @@
                i18n: 'register',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/securityGuardManagement/register')
                import ( /* webpackChunkName: "views" */ '@/views/securityGuardManagement/register')
        }]
    },
    {
@@ -187,7 +187,7 @@
                i18n: 'registerOnce',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/securityGuardManagement/registerOnce')
                import ( /* webpackChunkName: "views" */ '@/views/securityGuardManagement/registerOnce')
        }]
    },
    {
@@ -201,7 +201,7 @@
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/desk/notice')
                import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
        }]
    },
    {
@@ -215,36 +215,38 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
        }]
    }, {
        path: '/workreport',
        component: Layout,
        redirect: '/workreport/workreport',
        children: [{
            path: 'workreport',
            name: '发起的汇报',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/workreport/workreport')
                import ( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
        }]
    },
    // {
    //     path: '/workreport',
    //     component: Layout,
    //     redirect: '/workreport/workreport',
    //     children: [{
    //         path: 'workreport',
    //         name: '发起的汇报',
    //         meta: {
    //             i18n: 'dict'
    //         },
    //         component: () =>
    //             import( /* webpackChunkName: "views" */ '@/views/workreport/workreport')
    //     }]
    // },
    // {
    //     path: '/workreport',
    //     component: Layout,
    //     redirect: '/workreport/workreply',
    //     children: [{
    //         path: 'workreply',
    //         name: '接收的汇报',
    //         meta: {
    //             i18n: 'dict'
    //         },
    //         component: () =>
    //             import( /* webpackChunkName: "views" */ '@/views/workreport/workreply')
    //     }]
    // },
    {
        path: '/workreport',
        component: Layout,
        redirect: '/workreport/workreply',
        children: [{
            path: 'workreply',
            name: '接收的汇报',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/workreport/workreply')
        }]
    }, {
        path: '/management',
        redirect: '/management/index',
        component: Layout,
@@ -255,7 +257,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/management/peopleDetails')
                import ( /* webpackChunkName: "views" */ '@/views/management/peopleDetails')
        }]
    }, {
        path: '/management',
@@ -268,7 +270,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/management/idinformation')
                import ( /* webpackChunkName: "views" */ '@/views/management/idinformation')
        }]
    }, {
        path: '/securityCompany',
@@ -281,12 +283,12 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/securityCompany/companyDetails')
                import ( /* webpackChunkName: "views" */ '@/views/securityCompany/companyDetails')
        }]
    }, {
        path: '/map',
        component: () =>
            import( /* webpackChunkName: "views" */ '@/views/mapHome/index')
            import ( /* webpackChunkName: "views" */ '@/views/mapHome/index')
    }, {
        path: '/regulatoryInformation',
        redirect: '/regulatoryInformation/index',
@@ -298,7 +300,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/regulatoryInformation/index')
                import ( /* webpackChunkName: "views" */ '@/views/regulatoryInformation/index')
        }]
    }, {
        path: '/commandQuery',
@@ -311,7 +313,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/commandQuery/taskDistribution')
                import ( /* webpackChunkName: "views" */ '@/views/commandQuery/taskDistribution')
        }]
    },
    {
@@ -325,10 +327,10 @@
                i18n: 'registrationTrainingQuery',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/qualificationExamination/registrationTrainingQuery')
                import ( /* webpackChunkName: "views" */ '@/views/qualificationExamination/registrationTrainingQuery')
        }]
    },
    {  //报错  到不到vue文件
    { //报错  到不到vue文件
        path: '/securityUnitOperation/operationTable',
        redirect: '/securityUnitOperation/operationTable/index',
        component: Layout,
@@ -339,7 +341,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/securityUnitOperation/operationTable')
                import ( /* webpackChunkName: "views" */ '@/views/securityUnitOperation/operationTable')
        }]
    },
    // {
@@ -367,7 +369,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/companyDetails')
                import ( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/companyDetails')
        }]
    },
    // {
@@ -395,7 +397,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/companyDetails')
                import ( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/companyDetails')
        }]
    },
    {
@@ -409,7 +411,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/securityUnitOperation/economicTable')
                import ( /* webpackChunkName: "views" */ '@/views/securityUnitOperation/economicTable')
        }]
    },
    {
@@ -423,7 +425,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/businessStatisticsDetail')
                import ( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/businessStatisticsDetail')
        }]
    },
    {
@@ -437,7 +439,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/securityGuardDetail')
                import ( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/securityGuardDetail')
        }]
    }, {
        path: '/attachOnce',
@@ -450,7 +452,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/resource/attachOnce')
                import ( /* webpackChunkName: "views" */ '@/views/resource/attachOnce')
        }]
    }, {
        path: '/talk',
@@ -463,7 +465,7 @@
                i18n: 'index',
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/talk/talk')
                import ( /* webpackChunkName: "views" */ '@/views/talk/talk')
        }]
    }
]

 src/views/workreport/data.js

@@ -1,242 +1,115 @@
//已发送列表信息
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",
//     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&deptId=" + this.deptId,
    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"
    }]
}
]


//接收人列信息
export var workreplyColumn = [{
    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: "realName",
        disabled: true,
        span: 24,
        rules: [{
            required: true,
            message: "请选择接收人",
            trigger: "blur"
        }]
    },
    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"
    {
        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"
        }]
    },
    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"
    }]
}
    {
        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,
        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"
        }]
    }

]

 src/views/workreport/workreply.vue

@@ -77,7 +77,7 @@
        dialogWidth: 1000,
        tip: false,
        searchShow: true,
        searchBtn: false,
        searchBtn: true,
        searchMenuSpan: 6,
        editBtnText: "回复",
        searchShowBtn: false,

 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;