检查计划

src/api/safetycheck/plan.js

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 查询【请填写功能名称】列表
+export function list(query) {
+  return request({
+    url: '/core/checkplan/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询【请填写功能名称】详细
+export function itemfind(id) {
+  return request({
+    url: '/core/api/plan/item/find' + id,
+    method: 'get'
+  })
+}
+// 查询【请填写功能名称】详细
+export function distribute(query) {
+  return request({
+    url: '/core/api/plan/distribute' ,
+    method: 'post',
+    data: query
+  })
+}
+export function getPointIds(id) {
+  return request({
+    url: '/core/api/plan/getPointIds/' + id,
+    method: 'get'
+  })
+}
+// 查询【请填写功能名称】详细
+export function get(id) {
+  return request({
+    url: '/core/checkplan/' + id,
+    method: 'get'
+  })
+}
+// 修改【请填写功能名称】
+export function update(data) {
+  return request({
+    url: '/core/checkplan',
+    method: 'put',
+    data: data
+  })
+}
+// 新增【请填写功能名称】
+export function add(data) {
+  return request({
+    url: '/core/checkplan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除【请填写功能名称】
+export function delelte(id) {
+  return request({
+    url: '/core/checkplan/' + id,
+    method: 'delete'
+  })
+}

src/views/check/dialog.edit.vue

@@ -28,15 +28,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="planType" label="检查类型:">
+              <el-form-item prop="checkType" label="检查类型:">
                 <el-select
                   label="检查类型"
-                  v-model="formData.planType"
+                  v-model="formData.checkType"
                   placeholder="请选择检查类型"
                   clearable
                 >
                   <el-option
-                    v-for="dict in dict.type.resumption_plan_type"
+                    v-for="dict in dict.type.check_type"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -55,7 +55,7 @@
                   clearable
                 >
                   <el-option
-                    v-for="item in dict.type.resumption_plan_cycle"
+                    v-for="item in dict.type.check_cycle"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -65,16 +65,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="planStatus" label="检查机构类型:">
+              <el-form-item prop="execOrgType" label="检查机构类型:">
                 <el-select
-                  prop="planStatus"
+                  prop="execOrgType"
                   label="检查机构类型"
-                  v-model="formData.planStatus"
+                  v-model="formData.execOrgType"
                   placeholder="请选择检查机构类型"
                   clearable
                 >
                   <el-option
-                    v-for="item in dict.type.resumption_plan_status"
+                    v-for="item in dict.type.sys_org_type"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -86,37 +86,18 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item prop="execOrgType" label="检查角色:">
+              <el-form-item prop="roleIds" label="检查角色:">
                 <el-select
+                  @visible-change="getRolesByOrg"
                   label="检查角色"
-                  v-model="formData.execOrgType"
+                  v-model="formData.roleIds"
                   placeholder="请选择检查角色"
-                  @change="onOrgTypeChanged"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in dict.type.sys_org_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item prop="roleList" label="受检机构类型:">
-                <el-select
-                  
-                  label="受检机构类型"
-                  v-model="formData.roleList"
-                  placeholder="请选择受检机构类型"
                   multiple
                   filterable
                   @change="handleRolesChange"
                 >
                   <el-option
-                    v-for="item in resumptionRoles"
+                    v-for="item in planRoles"
                     :key="item.id"
                     :label="item.name"
                     :value="item.id"
@@ -126,15 +107,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="planExec" label="检查次数:">
+              <el-form-item prop="checkOrgType" label="受检机构类型:">
                 <el-select
-                  label="检查次数"
-                  v-model="formData.planExec"
-                  placeholder="请选择检查次数"
+                  prop="checkOrgType"
+                  label="受检机构类型"
+                  v-model="formData.checkOrgType"
+                  placeholder="请选择受检机构类型"
                   clearable
                 >
                   <el-option
-                    v-for="item in dict.type.resumption_plan_exec"
+                    v-for="item in dict.type.sys_org_type"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -144,7 +126,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="count" label="立即生效:">
+              <el-form-item prop="count" label="检查次数:">
                 <el-input-number
                   style="margin-left: 10px"
                   v-model="formData.count"
@@ -155,104 +137,94 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item prop="buildTaskNow" label="立即生效:">
+                <el-checkbox
+                  v-model="formData.buildTaskNow"
+                  size="medium"
+                  @change="handleCheckboxChange"
+                  >勾选后当前周期开始生效</el-checkbox
+                >
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-          <el-form-item  prop="note" label="计划状态">
-            <el-select
+              <el-form-item prop="planStatus" label="计划状态">
+                <el-select
                   label="计划状态"
-                  v-model="formData.execOrgType"
+                  v-model="formData.planStatus"
                   placeholder="请选择计划状态"
-                  @change="onOrgTypeChanged"
                   clearable
                 >
                   <el-option
-                    v-for="item in dict.type.sys_org_type"
+                    v-for="item in dict.type.check_status"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
                   >
                   </el-option>
                 </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item :span="6" prop="note" label="检查机构">
-            <el-select
-                  label="检查机构"
-                  v-model="formData.execOrgType"
-                  placeholder="请选择检查机构"
-                  @change="onOrgTypeChanged"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in dict.type.sys_org_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item :span="6" prop="note" label="受检机构">
-            <el-select
-                  label="受检机构"
-                  v-model="formData.execOrgType"
-                  placeholder="请选择受检机构"
-                  @change="onOrgTypeChanged"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in dict.type.sys_org_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-          </el-form-item>
-        </el-col>
-          
-        </el-row>
-        <el-form-item :span="6" prop="note" label="备注">
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :span="6" prop="execOrg" label="检查机构">
+                <orgDropDown
+                  v-model="formData.execOrg"
+                  placeholder="选择检查机构"
+                  @select="onexecOrgSelect"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :span="6" prop="checkOrg" label="受检机构">
+                <orgDropDown
+                  v-model="formData.checkOrg"
+                  placeholder="选择受检机构"
+                  @select="oncheckOrgSelect"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item :span="6" prop="description" label="备注">
             <el-input
-              v-model="formData.note"
+              v-model="formData.description"
               :maxlength="255"
               clearable
             />
           </el-form-item>
         </el-form>
         <el-button @click="openSelect">新增检查内容</el-button>
-       
+
         <el-table :data="tableData" style="width: 100%" height="400px">
-          <el-table-column  label="是否扫描" >
-            <template v-slot="{ row }"> 
+          <el-table-column label="是否扫描">
+            <template v-slot="{ row }">
               <el-switch
                 v-model="row.pointScan"
                 active-text="是"
-                inactive-text="否">
+                inactive-text="否"
+              >
               </el-switch>
             </template>
           </el-table-column>
 
-          <el-table-column label="是否必检" >
-            <template v-slot="{ row }"> 
+          <el-table-column label="是否必检">
+            <template v-slot="{ row }">
               <el-switch
                 v-model="row.required"
                 active-text="是"
-                inactive-text="否">
+                inactive-text="否"
+              >
               </el-switch>
             </template>
           </el-table-column>
-          <el-table-column prop="ruleName" label="检查手册" > </el-table-column>
-          <el-table-column prop="itemName" label="检查项" > </el-table-column>
-          <el-table-column prop="pointName" label="检查内容" > </el-table-column>
-          <el-table-column prop="areaName" label="检查区域" > </el-table-column>
-          <el-table-column prop="areaName" label="数据来源" > </el-table-column>
-          <el-table-column prop="areaName" label="操作" >
-            <template v-slot="{ row }"> 
+          <el-table-column prop="ruleName" label="检查手册"> </el-table-column>
+          <el-table-column prop="itemName" label="检查项"> </el-table-column>
+          <el-table-column prop="pointName" label="检查内容"> </el-table-column>
+          <el-table-column prop="areaName" label="检查区域"> </el-table-column>
+          <el-table-column prop="areaName" label="数据来源"> </el-table-column>
+          <el-table-column prop="areaName" label="操作">
+            <template v-slot="{ row }">
               <el-button type="text" @click="removeRow(row)">删除</el-button>
             </template>
           </el-table-column>
@@ -265,29 +237,23 @@
       </div>
     </el-dialog>
     <DialogSelect
-          ref="DialogSelect"
-          :defaultSelect=defaultSelect
-          :orgType="formData.execOrgType"
-          @select="onSelect"
-        ></DialogSelect>
+      ref="DialogSelect"
+      :defaultSelect="defaultSelect"
+      :orgType="formData.execOrgType"
+      @select="onSelect"
+    ></DialogSelect>
   </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
-import * as api from "@/api/resumption/plan";
+import orgDropDown from "@/components/orgTree/orgDropDown.vue";
+import * as api from "@/api/safetycheck/plan";
 import { statusOptions } from "@/views/commonOption";
 import { findAllRole } from "@/api/system/role";
 import DialogSelect from "@/views/safetycheck/ruleManager/dialog.select.point.vue";
 export default {
-  dicts: [
-    "resumption_plan_type",
-    "resumption_plan_cycle",
-    "resumption_org_type",
-    "resumption_plan_status",
-    "sys_org_type",
-    "resumption_plan_exec",
-  ],
+  dicts: ["sys_org_type", "check_type", "check_cycle", "check_status"],
   data() {
     // const params = this.$route.params;
     // let o1=options;
@@ -296,7 +262,7 @@ export default {
     return {
       defaultSelect: [],
       selectedValues: [],
-      resumptionRoles: [],
+      planRoles: [],
       planName: null,
       planType: null,
       planCycle: null,
@@ -373,6 +339,17 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    handleCheckboxChange() {
+      this.formData.buildTaskNow = !this.formData.buildTaskNow;
+    },
+    onexecOrgSelect(node) {
+      this.formData.execOrg = node.id;
+      console.log(node, "onexecOrgSelect");
+    },
+    oncheckOrgSelect(node) {
+      this.formData.checkOrg = node.id;
+      console.log(node, "oncheckOrgSelect");
+    },
     reset() {
       return {
         planName: null,
@@ -391,78 +368,81 @@ export default {
         planCreateOrgId: null,
         planCreateOrgName: null,
         roleList: null,
+        roleIds: null,
+        execOrg: null,
+        checkOrg: null,
+        buildTaskNow: false,
       };
     },
     getRolesByOrg() {
+      // console.log("开始获取角色")
       let params = {
-        orgType: this.formData.execOrgType,
+        orgType: null,
       };
       findAllRole(params).then((res) => {
         // console.info(res);
-        this.resumptionRoles = res.data;
+        this.planRoles = res.data;
       });
     },
     handleChange(value) {
-      console.log(value);
+      // console.log(value);
       this.count = value;
     },
     async refresh(id, other) {
       this.formData = id ? (await api.get(id)).data : this.reset(other);
-      if(this.formData.execOrgType){
+      if (this.formData.execOrgType) {
+        this.formData.roleIds=this.formData.roleList.map(role => role.id);
         this.getRolesByOrg();
-      } 
+      }
     },
-    onSelect(selectList){
+    onSelect(selectList) {
       console.log(selectList);
-      for(let i=0;i<selectList.length;i++){
-        let tem={
-          pointScan:!selectList[i].pointScan,
-          required:!selectList[i].required,
-          ruleName:selectList[i].ruleName,
-          itemName:selectList[i].itemName,
-          pointName:selectList[i].pointName,
-          areaName:selectList[i].areaName,
-          itemId:selectList[i].itemId,
-          id:selectList[i].id,
-        }
-        if(this.tableData==null){
-          this.tableData=[];
+      for (let i = 0; i < selectList.length; i++) {
+        let tem = {
+          pointScan: !selectList[i].pointScan,
+          required: !selectList[i].required,
+          ruleName: selectList[i].ruleName,
+          itemName: selectList[i].itemName,
+          pointName: selectList[i].pointName,
+          areaName: selectList[i].areaName,
+          itemId: selectList[i].itemId,
+          id: selectList[i].id,
+        };
+        if (this.tableData == null) {
+          this.tableData = [];
         }
         this.tableData.push(tem);
       }
-     
-      
-      
     },
-    onOrgTypeChanged(){
+    onOrgTypeChanged() {
       this.getRolesByOrg();
     },
     async show(id, other = {}) {
       this.id = id;
       this.tableData = null;
-      this.formData.itemList = null;
+      this.formData.itemList = {};
       await this.refresh(id, other);
       console.log(id);
       if (id !== undefined) {
         await api.get(id).then((res) => {
-          console.log(res);
+          // console.log(res);
           this.tableData = res.data.itemList;
         });
       }
-
+      this.getRolesByOrg();
       this.isShow = true;
     },
     removeRow(row) {
-      this.tableData = this.tableData.filter(item => item !== row)
+      this.tableData = this.tableData.filter((item) => item !== row);
       // this.tableData.splice(index, 1);
     },
     // 事件
     onHide() {
       this.isShow = false;
     },
-    getIteamF(){
-      if(this.id==null){
-        this.defaultSelect=[];
+    getIteamF() {
+      if (this.id == null) {
+        this.defaultSelect = [];
         return;
       }
       api.getPointIds(this.id).then((res) => {
@@ -470,7 +450,6 @@ export default {
       });
     },
     openSelect() {
-      
       this.getIteamF();
       this.$refs.DialogSelect.show();
     },
@@ -481,8 +460,17 @@ export default {
         this.formData.planCreateOrgName = this.orgName;
         if (!isValidate) return;
         this.formData.itemList = this.tableData == null ? [] : this.tableData;
-        this.formData.roleList = this.selectedValues.length==0?null:this.selectedValues;
-        await api.update(this.formData);
+        this.formData.roleList = null;
+        // console.log(this.selectedValues,"selectedValues");
+        this.formData.roleIds =
+          this.selectedValues.length == 0 ? null : this.selectedValues;
+        this.formData.buildTaskNow = this.formData.buildTaskNow ? 1 : 0;
+        if (this.id == undefined) {
+          await api.add(this.formData);
+        } else {
+          await api.update(this.formData);
+        }
+
         this.$emit("success");
         this.onHide();
       });
@@ -494,7 +482,7 @@ export default {
     //apimark//
   },
   mounted() {},
-  components: {DialogSelect},
+  components: { DialogSelect, orgDropDown },
 };
 </script>
 

src/views/check/index.vue

@@ -22,67 +22,67 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item prop="planType" label="检查机构类型">
+          <el-form-item prop="execOrgType" label="检查机构类型">
             <el-select
-              prop="planType"
+              prop="execOrgType"
               label="检查机构类型"
-              v-model="queryParams.planType"
+              v-model="queryParams.execOrgType"
               placeholder="请选择检查机构类型"
               clearable
             >
               <el-option
-                v-for="dict in dict.type.resumption_plan_type"
+                v-for="dict in dict.type.sys_org_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="resumptionRole" label="受检机构类型">
+          <el-form-item prop="checkOrgType" label="受检机构类型">
             <el-select
-              @visible-change="getRolesByOrg"
-              prop="resumptionRole"
+              prop="checkOrgType"
               label="受检机构类型"
-              v-model="queryParams.resumptionRole"
+              v-model="queryParams.checkOrgType"
               placeholder="请选择受检机构类型"
               clearable
             >
               <el-option
-                v-for="dict in resumptionRoles"
-                :key="dict.index"
-                :label="dict.roleName"
-                :value="dict.id"
+                v-for="dict in dict.type.sys_org_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
               />
             </el-select>
+            
           </el-form-item>
 
-          <el-form-item prop="planCycle" label="检查角色">
+          <el-form-item prop="checkRole" label="检查角色">
             <el-select
-              prop="planCycle"
+              @visible-change="getRolesByOrg"
+              prop="checkRole"
               label="检查角色"
-              v-model="queryParams.planCycle"
+              v-model="queryParams.checkRole"
               placeholder="请选择检查角色"
               clearable
             >
               <el-option
-                v-for="item in dict.type.resumption_plan_cycle"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
+                v-for="dict in resumptionRoles"
+                :key="dict.index"
+                :label="dict.roleName"
+                :value="dict.id"
+              />
             </el-select>
           </el-form-item>
-          <el-form-item prop="planStatus" label="检查周期">
+          <el-form-item prop="planCycle" label="检查周期">
             <el-select
-              prop="planStatus"
+              prop="planCycle"
               label="检查周期"
-              v-model="queryParams.planStatus"
+              v-model="queryParams.planCycle"
               placeholder="请选择检查周期"
               clearable
             >
               <el-option
-                v-for="item in dict.type.resumption_plan_status"
+                v-for="item in dict.type.check_cycle"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -99,7 +99,7 @@
               clearable
             />
           </el-form-item>
-          <el-form-item prop="planName" label="计划状态">
+          <el-form-item prop="planStatus" label="计划状态">
             <el-select
               prop="planStatus"
               label="计划状态"
@@ -108,7 +108,7 @@
               clearable
             >
               <el-option
-                v-for="item in dict.type.resumption_plan_status"
+                v-for="item in dict.type.check_status"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -143,31 +143,6 @@
               >新增计划</el-button
             >
           </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-              >删除</el-button
-            > 
-          </el-col>-->
-
           <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
@@ -197,7 +172,9 @@
             prop="planOfOrgName"
             label="计划所属机构"
             v-if="columns[4].visible"
-          ></el-table-column>
+          >
+        
+        </el-table-column>
         
           <el-table-column
             prop="planCreateOrgName"
@@ -207,44 +184,50 @@
           
           </el-table-column>
           <el-table-column
-            prop="planType"
+            prop="checkType"
             label="检查类型"
             v-if="columns[2].visible"
           >
             <template slot-scope="r"
               >{{
-                getLabel(dict.type.resumption_plan_type, `${r.row.planType}`)
+                getLabel(dict.type.check_type, `${r.row.checkType}`)
               }}
             </template>
           </el-table-column>
           <el-table-column
-            prop="planType"
+            prop="execOrgType"
             label="检查机构类型"
             v-if="columns[2].visible"
           >
             <template slot-scope="r"
               >{{
-                getLabel(dict.type.resumption_plan_type, `${r.row.planType}`)
+                getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`)
               }}
             </template>
           </el-table-column>
 
           <el-table-column
-            prop="execOrgType"
+            prop="checkOrgType"
             label="受检机构类型"
             width="120px"
             v-if="columns[6].visible"
           >
             <template slot-scope="r"
-              >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
+              >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
             </template>
           </el-table-column>
 
           <el-table-column
-            prop="roleNames"
+            prop="roleList"
             label="检查角色"
             v-if="columns[6].visible"
-          ></el-table-column>
+          >
+          <template slot-scope="scope">
+              <template v-for="item in scope.row.roleList">
+                {{ item.roleName }}
+                <br />
+              </template>
+            </template></el-table-column>
           <el-table-column
             prop="planCycle"
             label="检查周期"
@@ -253,7 +236,7 @@
           >
             <template slot-scope="r"
               >{{
-                getLabel(dict.type.resumption_plan_cycle, `${r.row.planCycle}`)
+                getLabel(dict.type.check_cycle, `${r.row.planCycle}`)
               }}
             </template>
           </el-table-column>
@@ -265,14 +248,14 @@
           ></el-table-column>
 
           <el-table-column
-            prop="planExec"
+            prop="planStatus"
             label="状态"
             width="80px"
             v-if="columns[6].visible"
           >
             <template slot-scope="r"
               >{{
-                getLabel(dict.type.resumption_plan_exec, `${r.row.planExec}`)
+                getLabel(dict.type.check_status, `${r.row.planStatus}`)
               }}
             </template>
           </el-table-column>
@@ -284,19 +267,16 @@
           ></el-table-column>
 
           <el-table-column
-            prop="planStatus"
+            prop="modifiedTime"
             label="修改时间"
             width="80px"
             v-if="columns[6].visible"
           >
-            <template slot-scope="r"
-              >{{
-                getLabel(
-                  dict.type.resumption_plan_status,
-                  `${r.row.planStatus}`
-                )
-              }}
+
+          <template slot-scope="scope">
+              <span>{{ formatTime(scope.row.modifiedTime,"YYYY-MM-DD") }}</span>
             </template>
+           
           </el-table-column>
 
           <el-table-column label="操作">
@@ -353,7 +333,7 @@ import DialogDistribute from "@/views/resumption/plan/distribute.vue";
 import OrgTree from "@/components/orgTree";
 import { mapState, mapMutations } from "vuex";
 import DialogEdit from "./dialog.edit";
-import * as api from "@/api/resumption/plan";
+import * as api from "@/api/safetycheck/plan";
 import { statusOptions, getLabel } from "@/views/commonOption";
 import { listRole } from "@/api/system/role";
 export default {
@@ -361,10 +341,7 @@ export default {
   dicts: [
     "sys_org_type",
     "rule_type",
-    "resumption_plan_type",
-    "resumption_plan_cycle",
-    "resumption_plan_status",
-    "resumption_plan_exec",
+    "check_cycle","check_status","check_type"
   ],
   components: {
     DialogEdit,
@@ -386,15 +363,20 @@ export default {
       resumptionRoles: [],
       total: 0,
       queryParams: {
-        orgId: null,
-        planType: null,
-        resumptionRole: null,
-        planCycle: null,
-        planStatus: null,
+        id: null,
         planName: null,
-        pageNum: 1,
-        pageSize: 10,
+        checkRole: null,
+        planCycle: null,
+        planCreateOrgId: null,
+        checkType: null,
+        planOfOrgId: null,
+        execOrgType: null,
+        checkOrgType:null,
+        planStatus:null,
+        pageSize:10,
+        pageNum:1,
         checkSub:false,
+        orgId:null,
         ...query,
       },
       pageData: [],
@@ -494,9 +476,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("search");
       this.queryParams.orgId = undefined;
-      this.$refs.tree.setCurrentKey(null);
+      // this.$refs.tree.setCurrentKey(null);
       this.getList();
     },
     //单选框状态改变

src/views/resumption/plan/index.vue

@@ -467,9 +467,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("search");
       this.queryParams.orgId = undefined;
-      this.$refs.tree.setCurrentKey(null);
+      // this.$refs.tree.setCurrentKey(null);
       this.getList();
     },
     //单选框状态改变