Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2022-03-02 b6d70fd9329b1c5fee415713e7ca5d9dcab66526

 src/views/workreport/workreport.vue

@@ -293,7 +293,7 @@
            this.selectionClear();
          });
        });
      } else if (this.userInfo.role_name == "公安管理员") {
      } else if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
        const column = that.findObject(that.option.column, "category");
        var code1 = { code: "workReportCategory" };
        getDictionaryBiz(code1).then(res => {