演练bug修改

src/views/core/drill/task/dialog.info.vue

@@ -7,7 +7,7 @@
           <el-row>
 
             <el-col :span="12">
-              <el-form-item prop="type" label="演练主题">{{
+              <el-form-item prop="type" label="主题">{{
                   formData.title
                 }}
               </el-form-item>
@@ -21,7 +21,7 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="演练类型">{{
+              <el-form-item label="演练项目">{{
                   formData.typeText
                 }}
               </el-form-item>
@@ -85,7 +85,7 @@
             </el-col>
             <!-- 图片 -->
             <el-col :span="12">
-              <el-form-item prop="imageList" label="签名图片">
+              <el-form-item prop="imageList" label="参与人员签名图片">
                 <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
               </el-form-item>
             </el-col>

src/views/core/drill/task/dialog.newtask.vue

@@ -5,19 +5,19 @@
         <el-form :model="formData" :rules="formDataRules" size="small" ref="form" label-position="right"
                  label-width="120px" label-prefix=":">
           <el-row>
-            <!-- 培训主题 -->
+            <!-- 演练主题 -->
             <el-col :span="12">
-              <el-form-item prop="title" label="培训主题">
+              <el-form-item prop="title" label="主题">
                 <el-input
                   v-model="formData.title"
                   :maxlength="32"
-                  placeholder="请输入培训主题"
+                  placeholder="请输入主题"
                   clearable
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item prop="content" label="演练地点">
+              <el-form-item prop="drillSite" label="演练地点">
                 <el-input v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
               </el-form-item>
             </el-col>

src/views/core/drill/task/dialog.perform.vue

@@ -7,7 +7,7 @@
           <el-row>
             <!-- 培训主题 -->
             <el-col :span="12">
-              <el-form-item prop="title" label="演练主题">
+              <el-form-item prop="title" label=>
                 {{ formData.title }}
               </el-form-item>
             </el-col>
@@ -32,13 +32,13 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item prop="content" label="演练地点">
+              <el-form-item prop="drillSite" label="演练地点">
                 <el-input v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="演练类型" prop="type">
-                <el-select v-model="formData.type" placeholder="请选择演练类型">
+              <el-form-item label="演练项目" prop="type">
+                <el-select v-model="formData.type" placeholder="请选择演练项目">
                   <el-option v-for="dict in dict.type.core_drill_type" :key="dict.value" :label="dict.label"
                              :value="parseInt(dict.value)">
                   </el-option>
@@ -112,9 +112,9 @@ export default {
         drillStartTime: [{required: true, message: "请选择演练开始时间"}],
         drillEndTime: [{required: true, message: "请选择演练结束时间"}],
         drillSite: [{required: true, message: "请输入演练地点"}],
-        type: [{required: true, message: "请选择演练类型"}],
+        type: [{required: true, message: "请选择演练项目"}],
         presetCase: [{required: true, message: "请输入预设案由"}],
-        drillSituation: [{required: true, message: "请输入预设案由"}],
+        drillSituation: [{required: true, message: "请输入演练情况"}],
         imageList: [{required: true, message: "请上传图片"}],
         absenceList: [{required: true, type: "array", message: "请选择参与人员", trigger: ['blur', 'change']}],
       },

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

@@ -10,8 +10,8 @@
                  label-width="100px">
 
 
-          <el-form-item label="演练类型" prop="type">
-            <el-select v-model="queryParams.type" placeholder="请选择演练类型" clearable>
+          <el-form-item label="演练项目" prop="type">
+            <el-select v-model="queryParams.type" placeholder="请选择演练项目" clearable>
               <el-option
                 v-for="dict in dict.type.core_drill_type"
                 :key="dict.value"
@@ -21,14 +21,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="任务时间" prop="rangen">
-            <el-date-picker
-              v-model="queryParams.range"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择开始日期">
-            </el-date-picker>
-          </el-form-item>
+
           <el-form-item label="演练状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="请选择演练状态" clearable>
               <el-option
@@ -39,6 +32,14 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="任务时间" prop="rangen">
+            <el-date-picker
+              v-model="queryParams.range"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择开始日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -54,7 +55,7 @@
         </el-row>
 
         <el-table border height="550px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
-          <el-table-column label="演练主题" width="200" align="left" header-align="center" prop="title"/>
+          <el-table-column label="主题" width="200" align="left" header-align="center" prop="title"/>
           <el-table-column label="演练机构" width="200" align="left" header-align="center" prop="orgName"/>
           <!--          <el-table-column label="演练角色" align="center">
                       <template slot-scope="scope">
@@ -67,7 +68,7 @@
                         </template>
                       </template>
                     </el-table-column>-->
-          <el-table-column label="演练类型" align="left" header-align="center" prop="type">
+          <el-table-column label="演练项目" align="left" header-align="center" prop="type">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.type"/>
             </template>
@@ -248,9 +249,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.clearQueryForm();
       this.handleQuery();
     },
+    clearQueryForm(){
+      this.queryParams.type=null;
+      this.queryParams.status=null;
+      this.queryParams.range=[];
+    },
     //单选框状态改变
     checkChange(state) {
       this.queryParams.checkSub = state;

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

@@ -443,10 +443,10 @@ export default {
       }
       return time.getTime() < new Date(startDate).getTime()
     },
-    //草稿状态显示按钮“下发、编辑、删除”，使用中显示按钮“撤回、编辑、删除”，停用状态显示按钮“下发、编辑、删除”；
-    //已完成下发的计划不显示下发按钮
+
     checkCanPublish(row) {
-      if (row.issue == 0 && row.standard == 1 && (row.planStatus == 0 || row.planStatus == 2)) {
+      //是标准计划且未下发，状态为草稿或停用，且所属机构为当前用户登录机构时才显示 “下发”按钮
+      if (row.issue == 0 && row.standard == 1 && (row.planStatus == 0 || row.planStatus == 2)&& row.belongOrgId == this.$store.getters.orgId) {
         return true
       }
       return false;

src/views/core/edu/task/dialog.info.vue

@@ -107,7 +107,7 @@
                         </el-col>
                         <!-- 图片 -->
                         <el-col :span="24">
-                            <el-form-item prop="imageList" label="签名图片">
+                            <el-form-item prop="imageList" label="参与人员签名图片">
                                 <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
                                 <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
                                     moduleName="edu-training" v-if="isShow" /> -->

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

@@ -269,10 +269,17 @@ export default {
       this.getList();
     },
     /** 重置按钮操作 */
+    /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.clearQueryForm();
       this.handleQuery();
     },
+    clearQueryForm(){
+      this.queryParams.title=null;
+      this.queryParams.status=null;
+      this.queryParams.range=[];
+    },
+
     //单选框状态改变
     checkChange(state) {
       this.queryParams.checkSub = state;