预案演练任务代码提交

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

@@ -56,12 +56,12 @@
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>
           </el-table-column>
-          <el-table-column scoped-slot="drillProjects" align="center" prop="drillProjects">
+          <el-table-column  label="演练项目" scoped-slot="drillProjects" align="center" prop="drillProjects">
             <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
             </template>
           </el-table-column>
-          <el-table-column scoped-slot="defaultCause" align="center" prop="defaultCause">
+          <el-table-column  label="预设案由" scoped-slot="defaultCause" align="center" prop="defaultCause">
             <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.defaultCause">{{ scope.row.defaultCause }}</div>
             </template>

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

@@ -90,7 +90,7 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row.id)"
-            v-hasPermi="['system:eduTask:detail']"
+            v-hasPermi="['core:eduTask:detail']"
           >详情</el-button>
           <el-button
             size="mini"
@@ -98,21 +98,11 @@
             icon="el-icon-document-add"
             v-if="canPerform(scope.row)"
             @click="handleRecorded(scope.row.id)"
-            v-hasPermi="['system:eduTask:remove']"
+            v-hasPermi="['core:eduTask:remove']"
           >培训登记</el-button>
           <el-button type="text" v-if="scope.row.pdfUrl" @click="onDown(scope.row.pdfUrl)"
             >培训登记簿
           </el-button>
-          <!-- <el-button type="text" @click="onEdit(scope.row)">查看</el-button>
-          <el-button
-              type="text"
-              v-if="
-              r.row.auditFlag == 'PASS' &&
-                (isExecute || loginOrgId == r.row.orgId) && canPerform(r.row.eduJobIds)&&isOverOrUnStart(r.row)
-            "
-              @click="onPerform(r.row.id, r.row.eduJobIds, r.row.endDate)"
-          >执行
-          </el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -126,93 +116,6 @@
     />
   </el-col>
   </el-row>
-    <!-- 添加或修改教育任务对话框 -->
-    <!-- <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="教育培训计划Id" prop="planId">
-          <el-input v-model="form.planId" placeholder="请输入教育培训计划Id" />
-        </el-form-item>
-        <el-form-item label="培训岗位" prop="roleId">
-          <el-input v-model="form.roleId" placeholder="请输入培训岗位" />
-        </el-form-item>
-        <el-form-item label="开始日期" prop="startDate">
-          <el-date-picker clearable
-            v-model="form.startDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开始日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="截止日期" prop="endDate">
-          <el-date-picker clearable
-            v-model="form.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择截止日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="实到人数" prop="actualCount">
-          <el-input v-model="form.actualCount" placeholder="请输入实到人数" />
-        </el-form-item>
-        <el-form-item label="内容">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="培训岗位名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入培训岗位名称" />
-        </el-form-item>
-        <el-form-item label="岗位id集合" prop="roleIds">
-          <el-input v-model="form.roleIds" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="岗位名集合" prop="roleNames">
-          <el-input v-model="form.roleNames" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="学习主题" prop="title">
-          <el-input v-model="form.title" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="总结" prop="note">
-          <el-input v-model="form.note" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="时间" prop="dateTime">
-          <el-date-picker clearable
-            v-model="form.dateTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="应到人数" prop="dueCount">
-          <el-input v-model="form.dueCount" placeholder="请输入应到人数" />
-        </el-form-item>
-        <el-form-item label="主持人" prop="hostId">
-          <el-input v-model="form.hostId" placeholder="请输入主持人" />
-        </el-form-item>
-        <el-form-item label="附件" prop="fileList">
-          <file-upload v-model="form.fileList"/>
-        </el-form-item>
-        <el-form-item label="图片" prop="imageList">
-          <image-upload v-model="form.imageList"/>
-        </el-form-item>
-        <el-form-item label="机构" prop="orgId">
-          <el-input v-model="form.orgId" placeholder="请输入机构" />
-        </el-form-item>
-        <el-form-item label="记录人" prop="recorderId">
-          <el-input v-model="form.recorderId" placeholder="请输入记录人" />
-        </el-form-item>
-        <el-form-item label="机构名称" prop="orgName">
-          <el-input v-model="form.orgName" placeholder="请输入机构名称" />
-        </el-form-item>
-        <el-form-item label="机构" prop="orgPath">
-          <el-input v-model="form.orgPath" placeholder="请输入机构" />
-        </el-form-item>
-        <el-form-item label="pdf下载地址" prop="pdfUrl">
-          <el-input v-model="form.pdfUrl" placeholder="请输入pdf下载地址" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </DialogCom> -->
 
     <dialog-info ref="infoDialog" @success="handleQuery(true)"></dialog-info>
     <dialog-perform ref="performDialog" @success="handleQuery(true)"></dialog-perform>