Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/views/core/accessPlan/index.vue

@@ -46,7 +46,7 @@
                   @change="changeSelect"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_org_type"
+                    v-for="dict in dict.type.monitor_org"
                     :key="dict.value"
                     :label="dict.label"
                     :value="`${dict.value}`"
@@ -305,22 +305,24 @@
 
         <el-form-item label="机构类型" prop="orgType">
           <el-select
+          :disabled="form.isEdit || form.isComplete"
             style="width: 100%"
             v-model="form.orgType"
             placeholder="请选择机构类型"
             @change="changeSelect"
           >
             <el-option
-              v-for="dict in dict.type.sys_org_type"
+              v-for="dict in dict.type.monitor_org"
               :key="dict.value"
               :label="dict.label"
               :value="`${dict.value}`"
-              :disabled="form.isEdit || form.isComplete"
+            
             ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="调阅周期" prop="planCycle">
           <el-select
+          :disabled="form.isEdit || form.isComplete"
             style="width: 100%"
             v-model="form.planCycle"
             placeholder="请选择调阅周期"
@@ -330,12 +332,13 @@
               :key="dict.value"
               :label="dict.label"
               :value="`${dict.value}`"
-              :disabled="form.isEdit || form.isComplete"
+            
             ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="调阅人员" prop="roleId">
           <el-select
+          :disabled="form.isEdit || form.isComplete"
             style="width: 100%"
             v-model="form.roleId"
             placeholder="请选择用户角色"
@@ -346,7 +349,7 @@
               :key="item.id"
               :label="item.roleName"
               :value="item.id"
-              :disabled="form.isEdit || form.isComplete"
+            
             ></el-option>
           </el-select>
         </el-form-item>
@@ -471,6 +474,7 @@ export default {
     "plan_status",
     "is_full",
     "edu_plan_status",
+    "monitor_org",
   ],
   components: {
     orgTree,
@@ -893,6 +897,7 @@ export default {
     },
     handWithdraw(row) {
       if (row.isComplete) {
+   
         this.$modal
         .confirm("因不存在已完成任务，撤回后将删除所有生成任务")
         .then(function () {
@@ -904,7 +909,11 @@ export default {
         })
         .catch(() => {});
       }else{
-        this.$modal
+        if (row.planCycle==0) {
+           this.$modal
+         .confirm("存在已完成任务，无周期任务不允许撤回，如需删除下发任务请点击“删除”。")
+        }else{
+          this.$modal
         .confirm("因存在已完成任务，撤回后下周期起将不再生成任务")
         .then(function () {
           return withdraw(row.id);
@@ -914,6 +923,8 @@ export default {
           this.$modal.msgSuccess("撤回成功");
         })
         .catch(() => {});
+        }
+   
       }
 
     },