Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/drill/plan/index.vue

@@ -4,7 +4,7 @@
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                  @click="clickTreeNode" hangsheTree></org-tree>
+                  @click="clickTreeNode" ></org-tree>
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
@@ -191,11 +191,21 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训机构" prop="planExecOrgIdList">
-              <tree-select v-model="form.planExecOrgIdList" :options="deptOptions" :show-count="true"
-                           :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }"
-                           placeholder="请选择培训机构"/>
+          <el-col :span="24">
+            <!--            <el-form-item label="培训机构" prop="planExecOrgIdList">
+                          <tree-select v-model="form.planExecOrgIdList" :options="deptOptions" :show-count="true"
+                                       :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }"
+                                       placeholder="请选择培训机构"/>
+                        </el-form-item>-->
+
+            <el-form-item v-show="form.execOrgType" label="培训机构" prop="planExecOrgIdList">
+              <org-tree-select
+                v-model="form.planExecOrgIdList"
+                :queryData="form.execOrgType"
+                ref="orgTreeSelect"
+                :enabledCheckOrgTypes="form.execOrgType"
+                :disable="true">
+              </org-tree-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -212,11 +222,6 @@
               <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" v-model="form.fileList"/>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">
-            <el-form-item label="">
-              <el-button type="primary" @click="showSelectFile">从学习资料中选择</el-button>
-            </el-form-item>
-          </el-col>-->
         </el-row>
       </el-form>
 
@@ -251,11 +256,12 @@ import OrgTree from "@/components/orgTree";
 import {deptTreeSelect} from "@/api/system/public";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import DialogSelectFile from "./dialog.select.file.vue";
+import OrgTreeSelect from '@/components/orgTreeSelect'
 
 export default {
   name: "Plan",
   dicts: ['plan_cycle', 'sys_org_type', 'plan_status', 'drill_plan_cycle'],
-  components: {OrgTree, KFileUpload, DialogSelectFile},
+  components: {OrgTree, KFileUpload, DialogSelectFile,OrgTreeSelect},
   mixins: [tableList],
   data() {
     return {

src/views/core/drill/task/index.vue

@@ -98,7 +98,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-document-add"
-                v-if="canPerform(scope.row)"
+                v-if="canEvaluate(scope.row)"
                 @click="handleRecorded(scope.row.id)"
                 v-hasPermi="['core:drillTask:evaluate']"
               >评价</el-button>
@@ -108,7 +108,7 @@
                 icon="el-icon-document-add"
                 v-if="canPerform(scope.row)"
                 @click="handleRecorded(scope.row.id)"
-                v-hasPermi="['core:drillTask:remove']"
+                v-hasPermi="['core:drillTask:edit']"
               >演练登记</el-button>
               <el-button type="text" v-if="scope.row.pdfUrl" @click="onDown(scope.row.pdfUrl)"
               >演练登记簿</el-button>