Administrator
2021-09-09 495938da52c69b03acf56b16d5d126c97836b23a
工作汇报修改
5 files modified
326 ■■■■ changed files
src/api/system/dept.js 10 ●●●●● patch | view | raw | blame | history
src/router/views/index.js 54 ●●●● patch | view | raw | blame | history
src/views/workreport/data.js 127 ●●●●● patch | view | raw | blame | history
src/views/workreport/workreply.vue 2 ●●● patch | view | raw | blame | history
src/views/workreport/workreport.vue 133 ●●●●● patch | view | raw | blame | history
src/api/system/dept.js
@@ -88,3 +88,13 @@
        }
    })
}
export const getDeptLazyTreeUsers = (type) => {
    return request({
        url: '/api/blade-system/dept/lazy-tree-users',
        method: 'get',
        params: {
            type
        }
    })
}
src/router/views/index.js
@@ -217,34 +217,36 @@
            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')
        }]
    },
    // {
    //     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,
src/views/workreport/data.js
@@ -1,131 +1,4 @@
//已发送列表信息
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"
    }]
}
]
//接收人列信息
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;