进行检查任务

src/api/safetycheck/task.js

@@ -12,7 +12,7 @@ export function page(query) {
 //获取计划列表
 export function getPlans(args) {
   return request({
-    url: "/core/resumption/record/plan",
+    url: "/core/safetyTask/plan",
     method: "get",
     params: args,
   });

src/views/check/dialog.edit.vue

@@ -172,7 +172,7 @@
             <el-col :span="6">
               <el-form-item :span="6" prop="execOrgIds" label="检查机构">
                 <org-tree-select
-                  v-model="formData.execOrgList"
+                  v-model="formData.execOrgIds"
                   :queryData="parseInt(formData.execOrgType)"
                   ref="execorgTreeSelect"
                   :enabledCheckOrgTypes="parseInt(formData.execOrgType)"
@@ -184,7 +184,7 @@
             <el-col :span="6">
               <el-form-item :span="6" prop="checkOrgIds" label="受检机构">
                 <org-tree-select
-                  v-model="formData.checkOrgList"
+                  v-model="formData.checkOrgIds"
                   :queryData="parseInt(formData.checkOrgType)"
                   ref="checkorgTreeSelect"
                   :enabledCheckOrgTypes="parseInt(formData.checkOrgType)"
@@ -492,6 +492,7 @@ export default {
         this.formData.roleList = null;
         this.formData.roleIds =
           this.selectedValues.length == 0 ? null : this.selectedValues;
+          
         await api.add(this.formData);
         this.$emit("success");
         this.onHide();

src/views/check/index.vue

@@ -412,8 +412,13 @@ export default {
       return false;
     },
     splitRoleNames(val) {
+      if(val!=null&&val!=undefined){
+        return val.split(',');
+      }else{
+        return [];
+      }
       // 使用逗号分割字符串，得到角色名称的数组
-      return val.split(',');
+      
     },
     sel(selectList){
       this.loading = true;

src/views/check/task/dialog.scanrecord.vue

@@ -8,7 +8,7 @@
     >
       <el-table :data="tableData" border>
         <el-table-column
-          label="履职区域"
+          label="检查区域"
           align="center"
           :show-overflow-tooltip="true"
           prop="areaName"

src/views/check/task/index.vue

@@ -20,21 +20,15 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item label="检查名称" prop="planId">
-            <el-select
-              v-model="queryParams.planId"
-              filterable
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in planList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
+          <el-form-item label="检查名称" prop="title">
+            <el-input
+                v-model="queryParams.title"
+                placeholder="请输入检查名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+                :maxlength="50" @input="inputTitle"
+              />
+           
           </el-form-item>
           <!-- <el-form-item label="检查角色" prop="executeRole">
             <el-select
@@ -69,11 +63,12 @@
           <el-form-item
             class="searchTitle"
             label="任务开始时间"
-            
+            prop="planStartTime"
           >
             <el-date-picker
-              v-model="queryParams.startTime"
+              v-model="queryParams.planStartTime"
               :clearable="timeClearable"
+              type="date"
               placeholder="选择时间"
             >
             </el-date-picker>
@@ -85,26 +80,22 @@
               clearable
             >
               <el-option
-                v-for="item in dict.type.resumption_status"
+                v-for="item in dict.type.safety_check_status"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="受检机构" prop="orgId">
-            <el-select
-              v-model="queryParams.ofOrgId"
-              placeHolder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.resumption_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
+          <el-form-item label="受检机构" prop="orgName">
+
+            <el-input
+                v-model="queryParams.orgName"
+                placeholder="请输入受检机构"
+                clearable
+                @keyup.enter.native="handleQuery"
+                :maxlength="50" @input="inputRestriction"
+              />
           </el-form-item>
           <el-form-item style="margin-left: 50px;">
             <el-button
@@ -182,13 +173,13 @@
           </el-table-column>
          
           <el-table-column
-            prop="startTime"
+            prop="planStartTime"
             label="开始日期"
             min-width="140"
             v-if="columns[2].visible"
           />
           <el-table-column
-            prop="endTime"
+            prop="planEndTime"
             label="截止日期"
             min-width="140"
             v-if="columns[3].visible"
@@ -205,7 +196,7 @@
                 <i class="circle" :style="statusColor(r.row.status, true)" />
                 <label :style="statusColor(r.row.status, false)">
                   {{
-                    getLabel(dict.type.resumption_status, r.row.status)
+                    getLabel(dict.type.safety_check_status, r.row.status)
                   }}</label
                 >
               </span>
@@ -293,7 +284,7 @@ import { getLabel } from "@/views/commonOption.js";
 
 export default {
   name: "checkTaskList",
-  dicts: ["resumption_plan_cycle", "resumption_status"],
+  dicts: ["resumption_plan_cycle", "resumption_status","safety_check_status"],
   components: { DialogDetail, DialogScanRecord, DataRangePicker, OrgTree },
   data() {
     return {
@@ -308,12 +299,13 @@ export default {
       queryParams: {
         checkSub: true,
         orgId: null,
-        ofOrgId: null,
+        orgName: null,
         status: null,
         planId: null,
         pageNum: 1,
         pageSize: 10,
-        startTime:null,
+        planStartTime:null,
+        title:null,
       },
       selectedOrgName:null,
       pageData: [],
@@ -357,7 +349,14 @@ export default {
     ...mapGetters(["orgName"])
   },
   methods: {
-
+    inputRestriction(){
+      // 限制只允许输入汉字、英文和数字
+      this.queryParams.orgName = this.queryParams.orgName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '');
+    },
+    inputTitle(){
+      // 限制只允许输入汉字、英文和数字
+      this.queryParams.title = this.queryParams.title.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '');
+    },
     getLabel,
     showDetail(row) {
       this.$refs.detaildialog.show(row.resumptionId, row.name);
@@ -370,7 +369,7 @@ export default {
       this.selectedOrgName=this.orgName;
       this.getList();
       this.loadRoles(key);
-      this.loadPlanList();
+      // this.loadPlanList();
     },
     //单选框状态改变
     checkChange(state) {
@@ -382,7 +381,7 @@ export default {
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
       this.selectedOrgName=data.name;
-      this.loadPlanList();
+      // this.loadPlanList();
       this.loadRoles();
       this.getList();
     },
@@ -413,16 +412,16 @@ export default {
         .then((r) => (this.roleList = r.data));
     },
 
-    loadPlanList() {
-      api
-        .getPlans({
-          orgId: this.queryParams.orgId,
-          planCycle: this.queryParams.executeCycle,
-        })
-        .then((r) => {
-          this.planList = r.data;
-        });
-    },
+    // loadPlanList() {
+    //   api
+    //     .getPlans({
+    //       orgId: this.queryParams.orgId,
+    //       // planCycle: this.queryParams.executeCycle,
+    //     })
+    //     .then((r) => {
+    //       this.planList = r.data;
+    //     });
+    // },
 
    
     statusColor(status, isBackground) {