根据最近反馈解决 调整 演练计划管理解决

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

@@ -10,46 +10,53 @@
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="100px">
-
-          <el-form-item label="演练机构类型" prop="execOrgType">
-            <el-select v-model="queryParams.execOrgType" placeholder="请选择演练机构类型" clearable>
+          <el-form-item label="任务名称" prop="planName">
+            <el-input v-model="queryParams.planName" placeholder="请输入关键字" clearable
+                      @keyup.enter.native="handleQuery"/>
+          </el-form-item>
+          <el-form-item label="机构类型" prop="execOrgType">
+            <el-select v-model="queryParams.execOrgType" placeholder="请选择机构类型" clearable>
               <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="计划周期" prop="planCycle">
-            <el-select v-model="queryParams.planCycle" placeholder="请选择计划周期" clearable>
-              <el-option v-for="dict in dict.type.drill_plan_cycle" :key="dict.value" :label="dict.label"
+          <el-form-item label="任务状态" prop="planStatus">
+            <el-select v-model="queryParams.planStatus" placeholder="请选择任务状态" clearable>
+              <el-option v-for="dict in dict.type.drill_plan_status" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="计划状态" prop="planStatus">
-            <el-select v-model="queryParams.planStatus" placeholder="请选择计划状态" clearable>
-              <el-option v-for="dict in dict.type.drill_plan_status" :key="dict.value" :label="dict.label"
+          <el-form-item label="任务周期" prop="planCycle">
+            <el-select v-model="queryParams.planCycle" placeholder="请选择任务周期" clearable>
+              <el-option v-for="dict in dict.type.drill_plan_cycle" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
           </el-form-item>
+         
           <!--          <el-form-item label="演练角色" prop="planRoleId">
                       <el-select v-model="queryParams.planRoleId" placeholder="请选择演练角色" clearable>
                         <el-option v-for="item in planRoleList" :key="item.roleId" :label="item.roleName"
                                    :value="item.roleId"></el-option>
                       </el-select>
                     </el-form-item>-->
-          <el-form-item label="计划名称" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable
-                      @keyup.enter.native="handleQuery"/>
-          </el-form-item>
+          
 
-          <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>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-col>
+          <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
-                       v-hasPermi="['core:drillPlan:add']">新增
+                       v-hasPermi="['core:drillPlan:add']">新增任务
             </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -59,42 +66,28 @@
                   row-key="id"
                   :tree-props="{ children: 'children' }">
           <el-table-column label="序号" align="center" width="60" prop="no"/>
-          <el-table-column label="计划名称" align="center" width="200" prop="planName"/>
-          <el-table-column label="计划创建机构" align="center" width="180" prop="createOrgName"/>
-          <el-table-column label="计划所属机构" align="center" width="180" prop="belongOrgName"/>
-          <el-table-column label="演练机构类型" align="center" width="120" prop="execOrgType">
+          <el-table-column label="任务名称" align="left" header-align="center" width="250" prop="planName"/>
+          <el-table-column label="创建机构" align="left" header-align="center" width="180" prop="createOrgName"/>
+          <el-table-column label="行社名称" align="left" header-align="center" width="180" prop="belongOrgName"/>
+          <el-table-column label="机构类型" align="center" width="120" prop="execOrgType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.execOrgType"/>
             </template>
           </el-table-column>
-          <!--          <el-table-column prop="planRoleNameList" label="演练角色" width="200">
-                      <template slot-scope="scope">
-                        <template v-if="scope.row.planRoleNameList">
-                          <el-tag size="mini" type="success" style="margin-right: 5px;"
-                                  v-for="(item, index) in (scope.row.planRoleNameList || '').split(',')"
-                                  :key="index">
-                            {{ item }}
-                          </el-tag>
-                        </template>
-                        <template v-else>
-                          <el-tag size="mini">{{ scope.row.checkOrgTypeText }}</el-tag>
-                        </template>
-                      </template>
-                    </el-table-column>-->
-          <el-table-column label="计划周期" align="center" prop="planCycle">
+          <el-table-column label="任务周期" align="center" width="120" prop="planCycle">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.drill_plan_cycle" :value="scope.row.planCycle"/>
             </template>
           </el-table-column>
-          <el-table-column label="计划状态" align="center" prop="planStatus">
+          <el-table-column label="任务次数" align="center" width="120" prop="execTimes"/>
+          <el-table-column label="任务状态" align="center" width="120" prop="planStatus">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.drill_plan_status" :value="scope.row.planStatus"/>
             </template>
-          </el-table-column>
-          <el-table-column label="演练次数" align="center" prop="execTimes"/>
-          <el-table-column label="备注" align="center" prop="remark"/>
-          <el-table-column label="修改人" align="center" width="100" prop="updateBy"/>
-          <el-table-column label="操作" align="center" width="180" fixed="right" class-name="small-padding fixed-width">
+          </el-table-column>          
+          <!-- <el-table-column label="备注" align="center" prop="remark"/> -->
+          <!-- <el-table-column label="修改人" align="center" width="100" prop="updateBy"/> -->
+          <el-table-column label="操作" align="left" header-align="center"  fixed="right" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:drillPlan:publish']">下发
@@ -123,38 +116,27 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="计划名称" prop="planName">
-              <el-input v-model="form.planName" placeholder="请输入计划名称"/>
+            <el-form-item label="任务名称" prop="planName">
+              <el-input v-model="form.planName" placeholder="请输入任务名称"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="计划周期" prop="planCycle">
-              <el-select v-model="form.planCycle" placeholder="请选择计划周期" style="width: 100%;">
+            <el-form-item label="任务周期" prop="planCycle">
+              <el-select v-model="form.planCycle" placeholder="请选择任务周期" style="width: 100%;">
                 <el-option v-for="dict in dict.type.drill_plan_cycle" :key="dict.value" :label="dict.label"
                            :value="parseInt(dict.value)"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
-
-          <el-col :span="12" v-show="form.planCycle != 0">
-            <el-form-item label="立即生效" prop="buildTaskNow">
-              <!--              <el-checkbox v-model="form.buildTaskNow">
-                              默认从下个周期...
-                              <el-popover placement="top-start" title="" width="200" trigger="hover"
-                                          content="默认从下个周期生成任务，勾选后从当前周期立即生成任务">
-                                <i class="el-icon-warning-outline change-icon" slot="reference"></i>
-                              </el-popover>
-                            </el-checkbox>-->
-              <el-checkbox v-model="form.buildTaskNow">
-                默认从下个周期生成任务，
-                <br/>
-                勾选后从当前周期立即生成任务
-              </el-checkbox>
+          </el-col>          
+          <el-col :span="12">
+            <el-form-item label="任务次数" prop="execTimes">
+              <template>
+                <el-input-number style="width: 100%;" v-model="form.execTimes" :min="1" :max="10"></el-input-number>
+              </template>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
           <el-col :span="12" v-show="form.planCycle == 0">
@@ -174,11 +156,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-
         <el-row>
+          <el-col :span="12" v-show="form.planCycle != 0">
+            <el-form-item label="立即生效" prop="buildTaskNow">
+              <!--              <el-checkbox v-model="form.buildTaskNow">
+                              默认从下个周期...
+                              <el-popover placement="top-start" title="" width="200" trigger="hover"
+                                          content="默认从下个周期生成任务，勾选后从当前周期立即生成任务">
+                                <i class="el-icon-warning-outline change-icon" slot="reference"></i>
+                              </el-popover>
+                            </el-checkbox>-->
+              <el-checkbox v-model="form.buildTaskNow">
+                默认从下个周期生成任务，
+                <br/>
+                勾选后从当前周期立即生成任务
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
-            <el-form-item label="演练机构类型" prop="execOrgType">
+            <el-form-item label="机构类型" prop="execOrgType">
               <el-select v-model="form.execOrgType" placeholder="请选择执行机构类型" @change="execOrgTypeChanged()"
                          style="width: 100%;">
                 <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
@@ -186,13 +182,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="演练次数" prop="execTimes">
-              <template>
-                <el-input-number style="width: 100%;" v-model="form.execTimes" :min="1" :max="10"></el-input-number>
-              </template>
-            </el-form-item>
-          </el-col>
+          
         </el-row>
         <!-- <el-row>
            <el-col :span="12">
@@ -223,7 +213,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" placeholder="请输入备注"/>
             </el-form-item>
@@ -243,12 +233,12 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </DialogCom>
-    <DialogSelectFile
+    <!-- <DialogSelectFile
       ref="DialogSelectFile"
       :defaultSelect=defaultSelect
       @select="fileSelected"
       :orgId="orgId"
-    ></DialogSelectFile>
+    ></DialogSelectFile> -->
 
   </div>
 </template>
@@ -269,14 +259,14 @@ import tableList from "@/mixins/tableList";
 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 DialogSelectFile from "./dialog.select.file.vue";
 import OrgTreeSelect from '@/components/orgTreeSelect'
 import dayjs from "dayjs";
 
 export default {
   name: "Plan",
   dicts: ['sys_org_type', 'drill_plan_status', 'drill_plan_cycle'],
-  components: {OrgTree, KFileUpload, DialogSelectFile, OrgTreeSelect},
+  components: {OrgTree, KFileUpload, OrgTreeSelect},
   mixins: [tableList],
   data() {
     return {
@@ -320,23 +310,23 @@ export default {
       // 表单校验
       rules: {
         planName: [
-          {required: true, message: "计划名称不能为空", trigger: "blur"}
+          {required: true, message: "任务名称不能为空", trigger: "blur"}
         ],
         planCycle: [
-          {required: true, message: "计划周期不能为空", trigger: "blur"}
+          {required: true, message: "任务周期不能为空", trigger: "blur"}
         ],
         execTimes: [
-          {required: true, message: "演练次数不能为空", trigger: "blur"}
-        ],
-        planStatus: [
-          {required: true, message: "计划状态不能为空", trigger: "blur"}
+          {required: true, message: "任务次数不能为空", trigger: "blur"}
         ],
+        // planStatus: [
+        //   {required: true, message: "计划状态不能为空", trigger: "blur"}
+        // ],
         execOrgType: [
-          {required: true, message: "演练机构类型不能为空", trigger: "blur"}
-        ],
-        planRoleId: [
-          {required: true, message: "演练角色不能为空", trigger: "blur"}
+          {required: true, message: "机构类型不能为空", trigger: "blur"}
         ],
+        // planRoleId: [
+        //   {required: true, message: "演练角色不能为空", trigger: "blur"}
+        // ],
       },
       planRoleList: [],
       roleList: [],
@@ -518,7 +508,7 @@ export default {
       this.getDeptTree()
       this.reset();
       this.open = true;
-      this.title = "新增演练计划";
+      this.title = "新增演练任务";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -530,7 +520,7 @@ export default {
         this.form = response.data;
         this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
-        this.title = "编辑演练计划";
+        this.title = "编辑演练任务";
       });
     },
     /** 提交按钮 */
@@ -586,7 +576,7 @@ export default {
         this.$modal.confirm(this.getMsgStr(row, '下发')).then(function () {
           return publishPlan(row.id);
         }).then(() => {
-          this.$modal.msgSuccess("计划下发成功");
+          this.$modal.msgSuccess("下发成功");
           this.getList();
         }).catch(() => {
         });
@@ -595,10 +585,10 @@ export default {
     //撤回计划
     handleRevocation(row) {
       if (row.id != null) {
-        this.$modal.confirm('撤回计划会清除本周期所有任务,是否继续?').then(function () {
+        this.$modal.confirm('撤回会清除本周期所有任务,是否继续?').then(function () {
           return revocationPlan(row.id);
         }).then(() => {
-          this.$modal.msgSuccess("计划撤回成功");
+          this.$modal.msgSuccess("撤回成功");
           this.getList();
         }).catch(() => {
         });
@@ -610,14 +600,13 @@ export default {
         ...this.queryParams
       }, `plan_${new Date().getTime()}.xlsx`)
     },
-    showSelectFile() {
-      // this.$refs.DialogSelectFile.show();
-      this.$refs["DialogSelectFile"].show();
-    },
+    // showSelectFile() {
+    //   this.$refs["DialogSelectFile"].show();
+    // },
     getMsgStr(row, type) {
-      let str = '是否确认' + type + '该计划？';
+      let str = '是否确认' + type + '该任务？';
       if (row.standard == 1) {
-        str = '此操作将会影响所有行社计划,' + str;
+        str = '此操作将会影响所有行社任务,' + str;
       }
       return str;
     },