范本库增加演练类型代码提交

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

@@ -73,11 +73,16 @@
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>
           </el-table-column>
-          <el-table-column  label="演练场景" scoped-slot="drillProjects" align="center" width="180" prop="drillProjects">
+          <el-table-column label="演练类型" align="left" header-align="center" width="180" prop="drillType">
             <template slot-scope="scope">
-              <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
+              <dict-tag :options="dict.type.core_drill_category" :value="scope.row.drillCategory"/>
             </template>
           </el-table-column>
+<!--          <el-table-column  label="演练场景" scoped-slot="drillProjects" align="center" width="180" prop="drillProjects">
+            <template slot-scope="scope">
+              <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
+            </template>
+          </el-table-column>-->
           <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>
@@ -130,9 +135,19 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="演练场景" prop="drillProjects">
-          <el-input v-model="form.drillProjects" maxlength="50"  placeholder="请输入演练场景"/>
+        <el-form-item label="演练类型" prop="drillCategory" style="width:100%;">
+          <el-select v-model="form.drillCategory" placeholder="请选择演练类型" style="width:100%;">
+            <el-option
+              v-for="dict in dict.type.core_drill_category"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
+<!--        <el-form-item label="演练场景" prop="drillProjects">
+          <el-input v-model="form.drillProjects" maxlength="50"  placeholder="请输入演练场景"/>
+        </el-form-item>-->
         <el-form-item label="预设案由" prop="defaultCause">
           <k-textarea v-model="form.defaultCause" :length="2000" show-word-limit placeholder="请输入预设案由"/>
         </el-form-item>
@@ -163,7 +178,7 @@ import KTextarea from "@/components/common/textarea.vue";
 export default {
   name: "DrillDictionary",
   components: {OrgTree,BtnTip,KTextarea},
-  dicts: ['core_drill_type'],
+  dicts: ['core_drill_type','core_drill_category'],
   mixins: [tableList],
   data() {
     return {
@@ -199,8 +214,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        drillType: [{ required: true, message: "请选择演练类型" }],
-        drillProjects: [{ required: true, message: "请输入解决方案名称" }],
+        drillType: [{ required: true, message: "请选择演练项目" }],
+        drillCategory: [{ required: true, message: "请选中演练类型" }],
         defaultCause: [{ required: true, message: "请输入预设案由" }],
       }
     };

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

@@ -63,7 +63,7 @@
                 {{ formData.drillEndTime }}
               </el-form-item>
             </el-col>
-           
+
             <el-col :span="24">
               <el-form-item prop="hostId" label="预设案由">{{
                   formData.presetCase
@@ -100,11 +100,11 @@
             </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>
-            
+
             <el-col :span="12">
               <el-form-item prop="comment" label="评语">{{
                   formData.comment

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

@@ -6,7 +6,7 @@
                  label-width="120px" label-prefix=":">
           <el-row>
             <!-- 演练主题 -->
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item prop="title" label="任务名称">
                 <el-input
                   v-model="formData.title"
@@ -51,7 +51,7 @@
 
               <el-form-item prop="presetCase" label="预设案由">
                 <div style="display: flex;justify-content: flex-end; margin-bottom: 10px">
-                  <el-button type="primary" @click="selectMaterials">演练范本库</el-button>
+                  <el-button type="primary" @click="selectMaterials">参考演练范本库</el-button>
                 </div>
                 <k-textarea v-model="formData.presetCase" placeholder="请输入预设案由" :length="2000"/>
               </el-form-item>
@@ -64,9 +64,9 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item prop="absenceList" label="参与人员">
+              <el-form-item prop="absenceList" label="参演人员">
                 <k-select :multiple="true" v-model="formData.absenceList" url="/user/find/all"
-                          :params="{ orgId: formData.orgId }" placeholder="请选择缺席人员"
+                          :params="{ orgId: formData.orgId }" placeholder="请选择参演人员"
                           @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
@@ -326,7 +326,7 @@ export default {
       console.log("onSubmit this.formData", this.formData);
       // if (!this.validatePerson()) {
       //   this.$message.error("参与人员与缺席人员重复，请重新选择!");
-      // } 
+      // }
       this.formData.taskUserList = this.formData.taskUserList ? this.formData.taskUserList : []
       if (this.formData.taskUserList.length == 0 || this.formData.taskUserList.filter(item => item.type == 1).length == 0) {
         this.$message.error("参与人员不能为空，请重新选择!");

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

@@ -54,7 +54,7 @@
 
               <el-form-item prop="presetCase" label="预设案由">
                 <div style="display: flex;justify-content: flex-end; margin-bottom: 10px">
-                  <el-button type="primary" @click="selectMaterials">演练范本库</el-button>
+                  <el-button type="primary" @click="selectMaterials">参考演练范本库</el-button>
                 </div>
                 <k-textarea v-model="formData.presetCase" placeholder="请输入预设案由" :length="2000"/>
               </el-form-item>
@@ -67,9 +67,9 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item prop="absenceList" label="参与人员">
+              <el-form-item prop="absenceList" label="参演人员">
                 <k-select style="width: 100%;" :multiple="true" v-model="formData.absenceList" url="/user/find/all"
-                          :params="{ orgId: formData.orgId }" placeholder="请选择参与人员"
+                          :params="{ orgId: formData.orgId }" placeholder="请选择参演人员"
                           @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>

src/views/core/drill/task/dialog.select.drillDictionary.vue

@@ -37,8 +37,15 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="drillProjects" label="演练场景">
-            <el-input v-model="search.drillProjects" placeholder="请输入关键字"></el-input>
+          <el-form-item label="演练项目" prop="drillCategory">
+            <el-select v-model="search.drillCategory" placeholder="请选择演练项目" clearable>
+              <el-option
+                v-for="dict in dict.type.core_drill_category"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
         </template>
 
@@ -51,9 +58,9 @@
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>
           </el-table-column>
-          <el-table-column label="演练场景" scoped-slot="drillProjects" align="center" prop="drillProjects">
+          <el-table-column label="演练类型" scoped-slot="drillCategory" align="center" prop="drillCategory">
             <template slot-scope="scope">
-              <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
+              <dict-tag :options="dict.type.core_drill_category" :value="scope.row.drillCategory"/>
             </template>
           </el-table-column>
           <el-table-column label="预设案由" scoped-slot="defaultCause" align="center" prop="defaultCause">
@@ -65,7 +72,7 @@
       </g-search-table>
     </div>
 
-    <div slot="footer" class="dialog-footer">      
+    <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="onSubmit">确定</el-button>
       <el-button @click="onHide">关闭</el-button>
     </div>
@@ -76,7 +83,7 @@ import GSearchTable from "@/components/table/gx.search.table.vue";
 // import { ruleListForOrg } from "@/api/resumption/rule.js";
 export default {
   components: {GSearchTable},
-  dicts: ['core_drill_type'],
+  dicts: ['core_drill_type','core_drill_category'],
   data() {
     return {
       isShow: false,