调整演练登记界面

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

@@ -173,6 +173,7 @@ export default {
         absentList: [],
         orgList: [],
         fileList: [],
+        presetCase:null,
         ...other,
       };
     },
@@ -358,6 +359,11 @@ export default {
       this.$refs["DialogDrillDictionarySelect"].show(this.formData.type);
     },
     drillDictionarySelect(data){
+      // console.log("selectMaterials",this.formData)
+      if(this.formData.type==null)
+      {
+        this.formData.type=parseInt(data[0].drillType);
+      }
       this.formData.presetCase=data[0].defaultCause;
     },
 

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

@@ -17,6 +17,21 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item label="演练项目" prop="type">
+                <el-select style="width: 100%;" 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>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="drillSite" label="演练地点">
+                <el-input style="width: 100%;" v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
+              </el-form-item>
+            </el-col>
+         
+            <el-col :span="12">
               <el-form-item prop="drillStartTime" label="演练开始时间">
                 <el-date-picker style="width: 100%;" required v-model="formData.drillStartTime"
                                 :picker-options="startDatepickerOptions"
@@ -33,26 +48,13 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
-              <el-form-item prop="drillSite" label="演练地点">
-                <el-input style="width: 100%;" v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="演练项目" prop="type">
-                <el-select style="width: 100%;" 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>
-                </el-select>
-              </el-form-item>
-            </el-col>
+         
 
             <el-col :span="24">
 
               <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>
@@ -79,7 +81,12 @@
                 </k-select>
               </el-form-item>
             </el-col>
-
+            <el-col :span="24">
+              <el-form-item prop="imageList" label="演练图片">
+                <imgUpload ref="uploadimage" type="more" :value="formData.imageList" @input="imageListChanged">
+                </imgUpload>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="演练资料" prop="fileList">
                 <K-file-upload ref="upload"
@@ -87,12 +94,7 @@
                                v-model="formData.fileList"/>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item prop="imageList" label="演练图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList" @input="imageListChanged">
-                </imgUpload>
-              </el-form-item>
-            </el-col>
+           
 
             <el-col :span="24">
               <el-form-item v-if="formData.status==2" prop="commentScore" label="评分">
@@ -425,6 +427,11 @@ export default {
       this.$refs["DialogDrillDictionarySelect"].show(this.formData.type);
     },
     drillDictionarySelect(data) {
+      // console.log("drillDictionarySelect",data);
+      if(this.formData.type==null)
+      {
+        this.formData.type=parseInt(data[0].drillType);
+      }
       this.formData.presetCase = data[0].defaultCause;
     },