Merge branch 'v0.1.0' of http://10.87.21.221:8000/jzyd_yyds/soc_web into v0.1.0

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

@@ -81,20 +81,20 @@
 
             <el-col :span="12">
               <el-form-item prop="absenceList" label="参演人员">
-                <k-select :multiple="true" v-model="formData.absenceList" url="/user/find/all"
+                <k-select :multiple="true" style="width: 100%" v-model="formData.absenceList" url="/user/find/all"
                           :params="{ orgId: formData.orgId }" placeholder="请选择参演人员"
                           @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item prop="absentList" label="缺席人员">
-                <k-select :multiple="true" v-model="formData.absentList" url="/user/find/all"
+                <k-select :multiple="true" style="width: 100%" v-model="formData.absentList" url="/user/find/all"
                           :params="{ orgId: formData.orgId }" @select="absentUserSelectChanged"
                           placeholder="请选择缺席人员">
                 </k-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="hostName" label="指挥人">
                 <el-input :style="{width : '100%'}"
                           v-model="formData.hostName"
@@ -105,6 +105,8 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+            </el-col>
             <el-col :span="24">
               <el-form-item prop="imageList" ref="fileImage" label="演练图片">
                 <imgUpload ref="uploadimage" :limit="10" type="more" :value="formData.imageList" @input="imageListChanged">

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

@@ -98,7 +98,7 @@
                 </k-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="hostName" label="指挥人">
                 <el-input :style="{width : '100%'}"
                           v-model="formData.hostName"
@@ -109,6 +109,8 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+            </el-col>
             <el-col :span="24">
               <el-form-item prop="imageList" ref="fileImage" label="演练图片">
                 <imgUpload ref="uploadimage" :limit="10" type="more" :value="formData.imageList" @input="imageListChanged">

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

@@ -90,7 +90,7 @@
                 </k-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="hostName" label="主持人">
                 <el-input :style="{width : '100%'}"
                           v-model="formData.hostName"
@@ -101,6 +101,9 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+
+            </el-col>
           </el-row>
 
           <el-row>

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

@@ -89,7 +89,7 @@
                 </k-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="hostName" label="主持人">
                 <el-input style="width: 100%;"
                           v-model="formData.hostName"
@@ -100,6 +100,8 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+            </el-col>
             <el-col :span="24">
               <el-form-item prop="imageList" ref="fileImage" label="培训图片">
                 <imgUpload ref="uploadimage" :limit="10" type="more" :value="formData.imageList"

src/views/system/compensate/index.vue

@@ -213,7 +213,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="补偿范围" prop="orgIdList">
+        <el-form-item label="补偿范围" prop="orgIdList" class="is-required">
           <org-tree-select
             v-model="form.orgIdList"
             :queryData="4"
@@ -311,7 +311,7 @@ export default {
           {required: true, message: "请选择业务类型", trigger: "change"},
         ],
         planId: [
-          {required: true, message: "请选择提醒角色", trigger: "change"},
+          {required: true, message: "请选择补偿计划", trigger: "change"},
         ],
       },
     };
@@ -327,6 +327,7 @@ export default {
 
   methods: {
     selectPlan(businessType) {
+      this.form.planId=null;
       queryPlanBySendModule(businessType).then((response) => {
         this.planList = response.data;
       });
@@ -427,6 +428,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if (!this.form.orgIdList.length){
+        this.$modal.msgError("请选择机构");
+        return;
+      }
       this.$refs["form"].validate((valid) => {
         if (valid) {
           edit(this.form).then((response) => {