safecheck-client 3.0.33-gongyi → 3.0.35-gongyi-1

package/src/components/pc/CheckBookManage.vue

@@ -266,6 +266,9 @@
               <th>
                 <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookAll"></input>全选</nobr>
               </th>
+              <th>
+                <nobr><input  type="checkbox" v-model="$parent.$parent.$parent.isallchecked"/>全选本页</nobr>
+              </th>
               <th>
                 <nobr>客户姓名</nobr>
               </th>
@@ -292,6 +295,12 @@
                            @change="$parent.$parent.$parent.checkChange(row, $event)"></input>
               </nobr>
             </td>
+            <td style="text-align: center">
+              <nobr>
+                <input type="checkbox" :checked="$parent.$parent.$parent.pageCheckModel(row)"
+                       @change="$parent.$parent.$parent.pageCheckChange(row, $event)"></input>
+              </nobr>
+            </td>
             <td style="text-align: center">{{ row.f_user_name }}</td>
             <td style="text-align: center">{{ row.f_userinfo_code }}</td>
             <td style="text-align: center">{{ row.f_user_type }}</td>
@@ -433,6 +442,7 @@ export default {
       checkBooks: [],
       f_orgid: '',
       bookAll: false,
+      isallchecked:false,//本页全选
       bookList: [],
       selectBook:'',
       // init:false,
@@ -453,6 +463,7 @@ export default {
         f_create_person: this.$login.f.name,
         f_orgid: this.$login.f.orgid,
         f_depid:'',
+        f_dep:'',
         f_checker_name: '',
         f_checker_id:''
       },
@@ -544,11 +555,16 @@ export default {
       })
     },
     reres(val){
-      if (!val.resids){
+      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || val.resids.length>1){
         return
       }
-      console.log('val',val)
-      this.checkBook.f_depid = val.resids[0]
+      console.log('val2',val)
+      const resids = val.orgobj.filter(res=>res.resourcetype==='department')
+      console.log('val2',resids)
+      if (resids.length>0){
+        this.checkBook.f_depid = resids[0].id
+        this.checkBook.f_dep = resids[0].name
+      }
     },
     clearBook(){
       this.checkBook ={
@@ -560,6 +576,7 @@ export default {
           f_create_person: this.$login.f.name,
           f_orgid: this.$login.f.orgid,
           f_depid:'',
+          f_dep:'',
           f_checker_name: '',
           f_checker_id:''
       }
@@ -569,7 +586,7 @@ export default {
        this.$showMessage('请选择安检册')
        return
      }
-     if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+     if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
        let userCondition = ''
        if (this.bookList.length < 1) {
          console.log('bookCondition', this.bookCondition)
@@ -597,6 +614,7 @@ export default {
        this.selectBook = ''
        this.clearBook()
        this.bookAll = false
+       this.isallchecked = false
        this.bookList = []
        this.showModal2 = false
        this.$refs.paged.$refs.criteria.search()
@@ -607,7 +625,7 @@ export default {
         this.$showMessage('请选择安检册')
         return
       }
-      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
         let userCondition = ''
         if (this.bookList.length < 1) {
           console.log('bookCondition', this.bookCondition)
@@ -635,6 +653,7 @@ export default {
         this.selectBook = ''
         this.clearBook()
         this.bookAll = false
+        this.isallchecked = false
         this.bookList = []
         this.showModal3 = false
         this.$refs.paged.$refs.criteria.search()
@@ -644,6 +663,7 @@ export default {
       this.selectBook = ''
       this.clearBook()
       this.bookAll = false
+      this.isallchecked = false
       this.bookList = []
       this.showModal2 = false
       this.$refs.paged.$refs.criteria.search()
@@ -652,6 +672,7 @@ export default {
       this.selectBook = ''
       this.clearBook()
       this.bookAll = false
+      this.isallchecked = false
       this.bookList = []
       this.showModal3 = false
       this.$refs.paged.$refs.criteria.search()
@@ -661,7 +682,7 @@ export default {
         this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
         this.showModal2 = true
         this.freshCheckBook()
         return
@@ -673,7 +694,7 @@ export default {
         this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
         this.showModal3 = true
         this.freshCheckBook()
         return
@@ -685,7 +706,7 @@ export default {
         this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
         let userCondition= ''
         if (this.bookList.length < 1) {
           console.log('bookCondition', this.bookCondition)
@@ -712,6 +733,7 @@ export default {
         this.$showMessage('从安检册删除所选用户成功')
         this.selectBook = ''
         this.bookAll = false
+        this.isallchecked = false
         this.clearBook()
         this.bookList = []
         this.showModal3 = false
@@ -725,7 +747,7 @@ export default {
         this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
         this.showModal = true
         return
       }
@@ -777,6 +799,7 @@ export default {
           this.clearBook()
           this.bookList = []
           this.bookAll = false
+          this.isallchecked = false
           this.freshCheckBook()
           this.$refs.paged.$refs.criteria.search()
         }
@@ -786,6 +809,7 @@ export default {
       console.log('66666666666', val)
       console.log(this.model.rows)
       this.bookAll = false
+      this.isallchecked = false
       this.bookList = []
       if (this.$refs.paged.$refs.criteria.model.f_orgid){
         this.$refs.paged.$refs.criteria.search()
@@ -793,6 +817,7 @@ export default {
     },
     cancel () {
       this.bookAll = false
+      this.isallchecked = false
       this.bookList = []
       this.clearBook()
       this.showModal = false
@@ -811,6 +836,20 @@ export default {
         }
       }
     },
+    pageCheckModel (row) {
+      //全选
+      if (this.isallchecked) {
+        console.log('row', this.isallchecked, JSON.stringify(row))
+        return true
+      } else {
+        if (this.bookList.findIndex(res => res === row.f_userinfo_id) !== -1) {
+          console.log('row1111', JSON.stringify(row))
+          return true
+        } else {
+          return false
+        }
+      }
+    },
     checkChange (row, e) {
       console.log('e', e.target.checked)
       if (e.target.checked) {
@@ -820,6 +859,14 @@ export default {
       }
       // console.log('aaaaa', JSON.stringify(this.bookList))
     },
+    pageCheckChange (row, e) {
+      console.log('e', e.target.checked)
+      if (e.target.checked) {
+        this.bookList.push(row.f_userinfo_id)
+      } else {
+        this.bookList.splice(this.bookList.findIndex(res => res === row.f_userinfo_id), 1)
+      }
+    },
     getRes (obj) {
       this.checkBook.f_orgid = obj.resids[0]
     },
@@ -832,6 +879,7 @@ export default {
     selfSearch (args) {
       this.isSearch = true
       this.bookAll = false
+      this.isallchecked = false
       this.bookList = []
       // if (this.$refs.paged.$refs.criteria.model.f_orgid){
       //   args.condition += `f_orgid in ${this.$refs.paged.$refs.criteria.model.f_orgid}`
@@ -874,7 +922,20 @@ export default {
       })
     }
   },
-
+  watch: {
+    "isallchecked"(val){
+      if (val) {
+        // 全选
+        this.$refs.grid.model.rows.forEach((row=>{
+          this.bookList.push(row.f_userinfo_id)
+        }))
+      } else {
+        // 取消全选
+        this.isallchecked = false
+        this.bookList = []
+      }
+    }
+  },
   ready () {
     // 获取片区
     this.getSliceArea()