修改缺陷

src/api/core/accessPlan.js

@@ -21,6 +21,7 @@ export function getPlan(id) {
 export function distribute(id) {
   return request({
     url: '/core/accessPlan/distribute/' + id,
+    showLoading:true,
     method: 'get'
   })
 }

src/views/core/accessPlan/index.vue

@@ -99,7 +99,7 @@
               <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="(scope.row.parentOrgId==isEdit||scope.row.orgId==isEdit)&&check==true"
                          v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
               </el-button>
-              <el-button size="mini" type="text" v-if="(scope.row.orgId==isEdit)&&scope.row.isDistribute == 0 && scope.row.planStatus==0" icon="el-icon-arrow-down"
+              <el-button size="mini" type="text" v-if="scope.row.orgId==isEdit&&(1==xf)&&scope.row.isDistribute == 0 && scope.row.planStatus==0" icon="el-icon-arrow-down"
                          @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
               </el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-if="(scope.row.parentOrgId==isEdit)&&scope.row.parentId==null && check==true"
@@ -165,13 +165,25 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="立即生成任务" prop="immediately" v-if="form.planCycle!=0">
+      <!-- <el-form-item label="立即生成任务" prop="immediately" v-if="form.planCycle!=0">
           <el-radio-group v-model="form.immediately">
             <el-radio v-for="dict in dict.type.is_full" :key="dict.value" :label="dict.value" :disabled="form.isEdit">{{ dict.label
               }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item>  -->
+
+            <el-form-item label="立即生效" prop="immediately" v-if="form.planCycle!=0">
+              <el-checkbox v-model="form.immediately">
+              
+                <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-form-item> 
+
+       
         <el-form-item label="备注" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入备注" :disabled="form.isEdit"/>
         </el-form-item>
@@ -305,6 +317,7 @@
           this.planList = response.data.rows;
           this.check=response.check;
           this.isEdit=response.isEdit;
+          this.xf=response.xf;
           this.total = response.data.total;
           this.loading = false;
         });
@@ -327,7 +340,7 @@
           planCycle: null,
           planFrequency: null,
           planStatus: "0",
-          immediately:"2",
+          immediately:false,
           createTime: null,
           createBy: null,
           updateTime: null,

src/views/core/send/index.vue

@@ -232,6 +232,9 @@ export default {
         content: [
           { required: true, message: '请输入内容', trigger: 'change' },
         ],
+        sendTime: [
+          { required: true, message: '请选择发送时间', trigger: 'change' },
+        ],
       }
     };
   },
@@ -276,7 +279,7 @@ export default {
         content: null,
         sendUser: null,
         sendRole: null,
-        sendTimeType: null,
+        sendTimeType: "1",
         sendTime: null,
         delFlag: null,
         createTime: null,