Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/accessPlan/index.vue

@@ -96,13 +96,13 @@
           <el-table-column label="备注" align="center" prop="description"/>
           <el-table-column label="操作" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="(scope.row.orgId==isEdit)&&check==true"
+              <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"
                          @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.orgId==isEdit)&&scope.row.parentId==null && check==true"
+              <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"
                          v-hasPermi="['core:accessPlan:remove']">删除
               </el-button>
             </template>
@@ -155,7 +155,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="调阅频次" prop="planFrequency">
-          <el-input type="number" oninput="if(value<=0)value=null;value=parseInt(value)"
+          <el-input type="number" @change="numChange"
                     v-model.number="form.planFrequency" placeholder="请输入调阅频次"/>
         </el-form-item>
         <el-form-item label="计划状态" prop="planStatus">
@@ -165,6 +165,13 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <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 label="备注" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入备注" :disabled="form.isEdit"/>
         </el-form-item>
@@ -187,7 +194,7 @@
 
   export default {
     name: "Plan",
-    dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable', 'plan_status'],
+    dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable', 'plan_status','is_full'],
     components: {
       orgTree
     },
@@ -263,8 +270,8 @@
           planFrequency: [
             {required: true, message: '请选择调阅频次', trigger: 'change'},
           ],
-        }
-
+        },
+        initNum:null
       };
     },
     created() {
@@ -277,6 +284,11 @@
       });
     },
     methods: {
+      numChange(value){
+        if(value<=0)this.form.planFrequency = 0;
+        if(value <= this.initNum) this.form.planFrequency = this.initNum;
+        //value = parseInt(value);
+      },
       getPageIndex($index) {
         //表格序号
         return (
@@ -315,6 +327,7 @@
           planCycle: null,
           planFrequency: null,
           planStatus: "0",
+          immediately:"2",
           createTime: null,
           createBy: null,
           updateTime: null,
@@ -408,6 +421,7 @@
         const id = row.id || this.ids
         getPlan(id).then(response => {
           this.form = response.data;
+          this.initNum = response.data.planFrequency; 
           this.open = true;
           this.title = "修改监控调阅计划";
           findRoleByType(this.form.orgType).then(response => {