Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/api/safetycheck/plan.js

@@ -61,3 +61,4 @@ export function delelte(id) {
     method: 'delete'
   })
 }
+

src/api/safetycheck/task.js

@@ -48,13 +48,15 @@ export function one(id) {
   });
 }
 
+
+
 /**
  * 查询 扫描记录
  */
 export function findNfcScanRecord(args) {
   return request({
-    url: "/core/resumption/record/nfc",
+    url: "/core/safetyTask/nfc",
     method: "get",
     params: args,
   });
-}
+}

src/views/check/dialog.edit.vue

@@ -402,11 +402,14 @@ export default {
         })
 
       }else{
+        this.formData.id=null;
         this.formData.planName= null;
         this.formData.planType= null;
         this.formData.planCycle= null;
         this.formData.planStatus= null;
         this.formData.execOrgType= null;
+        this.formData.checkOrgType= null;
+        this.formData.checkType= null;
         this.formData.roleNames= null;
         this.formData.count= null;
         this.formData.description= null;

src/views/check/index.vue

@@ -455,6 +455,7 @@ export default {
       this.getList();
     },
     handleAdd(id, other = {}) {
+      id=null;
       this.$refs.editDialog.show(id, other);
     },
     onEdit(id, other = {}) {
@@ -486,7 +487,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("search");
-      this.queryParams.orgId = undefined;
+      // this.queryParams.orgId = undefined;
       // this.$refs.tree.setCurrentKey(null);
       this.getList();
     },

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

@@ -66,7 +66,7 @@
   </div>
 </template>
 <script>
-import * as api from "@/api/resumption/taskManger.js";
+import * as api from "@/api/safetycheck/task.js";
 export default {
   data() {
     return {
@@ -79,7 +79,7 @@ export default {
       let detail = (
         await api.findNfcScanRecord({
           orgId: orgId,
-          resumptionId: id,
+          taskId: id,
         })
       ).data;
       // console.log(detail);

src/views/check/task/index.vue

@@ -22,13 +22,13 @@
         >
           <el-form-item label="检查名称" prop="title">
             <el-input
-                v-model="queryParams.title"
-                placeholder="请输入检查名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :maxlength="50" @input="inputTitle"
-              />
-           
+              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
@@ -59,7 +59,6 @@
             </el-select>
           </el-form-item> -->
 
-                   
           <el-form-item
             class="searchTitle"
             label="任务开始时间"
@@ -89,17 +88,24 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-row  >
           <el-form-item label="受检机构" prop="orgName">
-
-            <el-input
+            <!-- <el-input
                 v-model="queryParams.orgName"
                 placeholder="请输入受检机构"
                 clearable
                 @keyup.enter.native="handleQuery"
                 :maxlength="50" @input="inputRestriction"
-              />
+              /> -->
+            <org-tree-select
+              v-model="queryParams.checkOrgIds"
+              ref="checkorgTreeSelect"
+              :disable="true"
+              @change="getList"
+            >
+            </org-tree-select>
           </el-form-item>
-          <el-form-item style="margin-left: 50px;">
+          <el-form-item style="margin-left: 50px">
             <el-button
               type="primary"
               icon="el-icon-search"
@@ -111,6 +117,7 @@
               >重置</el-button
             >
           </el-form-item>
+        </el-row>
         </el-form>
         <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
@@ -136,15 +143,17 @@
           border
           height="600"
           size="small"
-          v-loading="loading" :data="pageData">
-          <el-table-column
-          type="index"
-          fixed
-          min-width="50"
-          label="序号"
-          v-if="columns[0].visible"
+          v-loading="loading"
+          :data="pageData"
         >
-        </el-table-column>
+          <el-table-column
+            type="index"
+            fixed
+            min-width="50"
+            label="序号"
+            v-if="columns[0].visible"
+          >
+          </el-table-column>
           <el-table-column
             prop="title"
             label="检查名称"
@@ -164,7 +173,7 @@
             label="检查角色"
             min-width="120"
             v-if="columns[6].visible"
-            >
+          >
           </el-table-column>
           <el-table-column
             prop="orgName"
@@ -173,7 +182,7 @@
             v-if="columns[4].visible"
           >
           </el-table-column>
-         
+
           <el-table-column
             prop="planStartTime"
             label="开始日期"
@@ -276,18 +285,24 @@
 </template>
 
 <script>
-import {mapGetters } from "vuex";
+import { mapGetters } from "vuex";
 import DialogDetail from "./dialog.detail";
 import DialogScanRecord from "./dialog.scanrecord";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import OrgTree from "@/components/orgTree";
 import * as api from "@/api/safetycheck/task.js";
 import { getLabel } from "@/views/commonOption.js";
-
+import OrgTreeSelect from "@/components/orgTreeSelect";
 export default {
   name: "checkTaskList",
-  dicts: ["resumption_plan_cycle", "resumption_status","safety_check_status"],
-  components: { DialogDetail, DialogScanRecord, DataRangePicker, OrgTree },
+  dicts: ["resumption_plan_cycle", "resumption_status", "safety_check_status"],
+  components: {
+    DialogDetail,
+    DialogScanRecord,
+    DataRangePicker,
+    OrgTreeSelect,
+    OrgTree,
+  },
   data() {
     return {
       loading: false,
@@ -306,10 +321,11 @@ export default {
         planId: null,
         pageNum: 1,
         pageSize: 10,
-        planStartTime:null,
-        title:null,
+        planStartTime: null,
+        title: null,
+        checkOrgIds: null,
       },
-      selectedOrgName:null,
+      selectedOrgName: null,
       pageData: [],
       columns: [
         { key: 0, label: `序号`, visible: true },
@@ -328,7 +344,6 @@ export default {
   },
   props: {},
   watch: {
-  
     statusVal(value) {
       if (value == undefined) return;
       if (value == "all") this.queryParams.status = null;
@@ -343,12 +358,9 @@ export default {
       //this.queryParams.type = this.$route.params.type.toUpperCase();
     },
     // 0每日；1每周；2每月；3每季度；4每半年；5每年
-
-
-   
   },
   computed: {
-    ...mapGetters(["orgName"])
+    ...mapGetters(["orgName"]),
   },
   methods: {
     updatePlanStartTime(value) {
@@ -356,24 +368,30 @@ export default {
       this.queryParams.planStartTime = value;
       // console.log(this.queryParams.planStartTime,"后");
     },
-    inputRestriction(){
+    inputRestriction() {
       // 限制只允许输入汉字、英文和数字
-      this.queryParams.orgName = this.queryParams.orgName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '');
+      this.queryParams.orgName = this.queryParams.orgName.replace(
+        /[^\u4e00-\u9fa5a-zA-Z0-9]/g,
+        ""
+      );
     },
-    inputTitle(){
+    inputTitle() {
       // 限制只允许输入汉字、英文和数字
-      this.queryParams.title = this.queryParams.title.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '');
+      this.queryParams.title = this.queryParams.title.replace(
+        /[^\u4e00-\u9fa5a-zA-Z0-9]/g,
+        ""
+      );
     },
     getLabel,
     showDetail(row) {
-      this.$refs.detaildialog.show(row.resumptionId, row.name);
+      this.$refs.detaildialog.show(row.id, row.name);
     },
     showscanRecord(row) {
-      this.$refs.scanrecorddialog.show(row.resumptionId, row.orgId);
+      this.$refs.scanrecorddialog.show(row.id, row.orgId);
     },
     getDefaultKey(key) {
       this.queryParams.orgId = key;
-      this.selectedOrgName=this.orgName;
+      this.selectedOrgName = this.orgName;
       this.getList();
       this.loadRoles(key);
       // this.loadPlanList();
@@ -387,17 +405,18 @@ export default {
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
-      this.selectedOrgName=data.name;
+      this.selectedOrgName = data.name;
       // this.loadPlanList();
       this.loadRoles();
       this.getList();
     },
     resetQuery() {
+      this.queryParams.checkOrgIds=[];
       this.resetForm("queryParams");
       this.getList();
     },
     async getList() {
-      console.log(this.queryParams,"this.queryParams")
+      console.log(this.queryParams, "this.queryParams");
       this.loading = true;
       api
         .page(this.queryParams)
@@ -431,7 +450,6 @@ export default {
     //     });
     // },
 
-   
     statusColor(status, isBackground) {
       let color = "";
       switch (status) {
@@ -456,12 +474,8 @@ export default {
       }
     },
   },
-  async mounted() {
-   
-  },
+  async mounted() {},
 };
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>