Merge remote-tracking branch 'origin/master'

@@ -467,7 +467,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
             elem: '#upload_tasktemp' //绑定元素
             elem: '#upload_tasktemp' //绑定元素
             , url: common.domainName + '/api-web/inspectiontask/upload?access_token=' + accessToken //上传接口
             , url: common.domainName + '/api-web/inspectiontask/upload?access_token=' + accessToken //上传接口
             , accept: 'file' //允许上传的文件类型
             , accept: 'file' //允许上传的文件类型
-            , exts: 'docx'
+            , exts: 'docx|doc'
             , multiple: false
             , multiple: false
             , before: function () {
             , before: function () {
                 layer.load(2);
                 layer.load(2);

@@ -50,6 +50,8 @@
                <label class="layui-form-label">周期类型<span style="color: red">*</span>：</label>
                <label class="layui-form-label">周期类型<span style="color: red">*</span>：</label>
                <div class="layui-input-block">
                <div class="layui-input-block">
                    <select class="layui-select" name="frequencyType">
                    <select class="layui-select" name="frequencyType">
+                       <!--增加请选择项，去除默认加载年报，joke modify 20220224-->
+                       <option value="">请选择</option>
                        <option value="year">年报</option>
                        <option value="year">年报</option>
                        <option value="quarter">季报</option>
                        <option value="quarter">季报</option>
                        <option value="week">周报</option>
                        <option value="week">周报</option>

@@ -343,8 +343,7 @@ export default {
                 if (loadTree && loadTree == true) {
                 if (loadTree && loadTree == true) {
                     getTree();
                     getTree();
                 } else {
                 } else {
-                    // getPage();
-                    getTree();
+                    getPage(id);
                 }
                 }