前端

src/api/core/accessPlan.js

@@ -25,6 +25,15 @@ export function distribute(id) {
     method: 'get'
   })
 }
+
+// 下发
+export function withdraw(id) {
+  return request({
+    url: '/core/accessPlan/withdraw/' + id,
+    showLoading:true,
+    method: 'get'
+  })
+}
 // 新增监控调阅计划
 export function addPlan(data) {
   return request({

src/views/core/accessPlan/index.vue

@@ -37,7 +37,7 @@
           </el-form-item>
           <el-form-item label="计划状态" prop="planStatus">
             <el-select style="width: 100%;" v-model="queryParams.planStatus" placeholder="请选择计划状态">
-              <el-option v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.label"
+              <el-option v-for="dict in dict.type.edu_plan_status" :key="dict.value" :label="dict.label"
                          :value="`${dict.value}`"></el-option>
             </el-select>
           </el-form-item>
@@ -88,7 +88,7 @@
 
           <el-table-column label="计划状态" align="center" key="planStatus" prop="planStatus" width="80">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus"/>
+              <dict-tag :options="dict.type.edu_plan_status" :value="scope.row.planStatus"/>
             </template>
           </el-table-column>
           <!-- <el-table-column label="修改人" align="center" prop="updateBy"/>
@@ -99,9 +99,12 @@
               <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&&(1==xf)&&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&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)" icon="el-icon-arrow-down"
                          @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
               </el-button>
+              <el-button size="mini" type="text" v-if="scope.row.orgId==isEdit&&scope.row.isDistribute == 1 && scope.row.planStatus==1" icon="el-icon-arrow-down"
+                         @click="handWithdraw(scope.row)" >撤回
+              </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"
                          v-hasPermi="['core:accessPlan:remove']">删除
               </el-button>
@@ -154,31 +157,26 @@
             <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id" :disabled="form.isEdit"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="调阅频次" prop="planFrequency">
+        <el-form-item label="调阅频次" prop="planFrequency" v-if="form.isEdit==true">
           <el-input type="number" @change="numChange"
                     v-model.number="form.planFrequency" placeholder="请输入调阅频次"/>
         </el-form-item>
-        <el-form-item label="计划状态" prop="planStatus">
-          <el-radio-group v-model="form.planStatus">
-            <el-radio v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.value" :disabled="form.isEdit">{{ dict.label
-              }}
-            </el-radio>
-          </el-radio-group>
+        <el-form-item label="调阅频次" prop="planFrequency" v-if="form.isEdit==false||form.isEdit==null">
+          <el-input type="number"  :min="1" oninput="if(value<0)value=1"
+                    v-model.number="form.planFrequency" placeholder="请输入调阅频次"/>
         </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-form-item label="计划状态" prop="planStatus">
+          <el-radio-group v-model="form.planStatus">
+            <el-radio v-for="dict in dict.type.edu_plan_status" :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> 
@@ -197,7 +195,7 @@
 </template>
 
 <script>
-  import {listPlan, getPlan, delPlan, addPlan, updatePlan, distribute} from "@/api/core/accessPlan";
+  import {listPlan, getPlan, delPlan, addPlan, updatePlan, distribute,withdraw} from "@/api/core/accessPlan";
   import {listRole, findRoleByType, getRole, allRole} from "@/api/system/role";
   import tableList from "@/mixins/tableList";
   import orgTree from "@/components/orgTree";
@@ -206,7 +204,7 @@
 
   export default {
     name: "Plan",
-    dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable', 'plan_status','is_full'],
+    dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable', 'plan_status','is_full','edu_plan_status'],
     components: {
       orgTree
     },
@@ -484,6 +482,16 @@
         });
 
       },
+      handWithdraw(row){
+        this.$modal.confirm('是否确认撤回监控调阅计划"' + row.planName + '"的数据项？').then(function () {
+          return withdraw(row.id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("撤回成功");
+        }).catch(() => {
+        });
+
+      },
       /** 导出按钮操作 */
       handleExport() {
         this.download('system/plan/export', {