Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulator...

zhengpz

2021-12-04 2716502f2a9bd81f2e8f2de2165b8d3ad284de24

 src/views/workreport/workreport.vue

@@ -99,8 +99,6 @@
                  searchRange: true,
                  searchSpan: 6,
                  hide: false,
                  addDisplay: false,
                  editDisplay: false,
                  // viewDisplay: false,
                  search: false,
                  rules: [{
@@ -130,7 +128,7 @@
              //         message: "请选择汇报类别",
              //         trigger: "blur"
              //     }]
              // }, 
              // },
              {
                  label: "汇报类型",
                  prop: "type",