safecheck-client 3.0.35-gongyi-4 → 3.0.35-gongyi-5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.35-gongyi-4",
+  "version": "3.0.35-gongyi-5",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/pc/CheckBookList.vue

@@ -15,12 +15,11 @@
                 condition=" f_checker_name = '{}'">
               </role-selector-safe>
             </div>
-            <div :class="$parent.$parent.style" v-if="$parent.$parent.permission === 'c1'">
+            <div :class="$parent.$parent.style" >
               <label class="font_normal_body">安检科室</label>
               <right-tree-safe islist :userid="$parent.$parent.userid" :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="'选择科室'" :selectData="''" v-ref:f_reciever>
               </right-tree-safe>
-          </div>
-
+            </div>
             <div :class="$parent.$parent.style"   >
               <label class="font_normal_body">开始时间</label>
               <datepicker
@@ -59,8 +58,13 @@
                 condition="f_run_date <=  '{}'">
               </datepicker>
             </div>
-
-
+            <div class="row" v-show="!$parent.$parent.$parent.showItem">
+              <div :class="$parent.$parent.style">
+                <label class="font_normal_body">安检册名</label>
+                <input style="width: 60%" type="text" class="input_search" v-model="model.f_check_book_name"
+                       placeholder="安检册名" condition="f_check_book_name like '%{}%'">
+              </div>
+            </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <export-excel-safe :data="$parent.$parent.exportParameter"
                                  :field="$parent.$parent.excelHeaders"
@@ -78,13 +82,7 @@
 
 
           </div>
-          <div class="row" v-show="!$parent.$parent.$parent.showItem">
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">安检册名</label>
-              <input style="width: 60%" type="text" class="input_search" v-model="model.f_check_book_name"
-                     placeholder="安检册名" condition="f_check_book_name like '%{}%'">
-            </div>
-          </div>
+
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style2" style="margin: 0px">

package/src/components/pc/CheckBookManage.vue

@@ -31,8 +31,8 @@
                 <export-excel-safe :data="$parent.$parent.searchData"
                                    :field="$parent.$parent.excelHeaders"
                                    progress="safeGetExportProgress"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="defectDetails"
-                                   template-name='安检隐患明细'></export-excel-safe>
+                                   sqlurl="rs/logic/SafeExportExcel" sql-name="getUserByCheckBook"
+                                   template-name='用户安检明细'></export-excel-safe>
 
 
                 <button class="button_spacing button_search" @click="search()">查询</button>
@@ -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.bookCheckedAll"></input>本页全选</nobr>
+              </th>
               <th>
                 <nobr>客户姓名</nobr>
               </th>
@@ -292,6 +295,11 @@
                            @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)"></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>
@@ -317,7 +325,7 @@
 <!--            </div>-->
             <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c1' && showModal ">
               <label class="font_normal_body">安检科室</label>
-              <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择科室" :selectData="" v-ref:f_reciever>
+              <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择科室" :selectData="''" v-ref:f_reciever>
               </right-tree>
             </div>
             <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c2' ">
@@ -429,10 +437,18 @@ export default {
     return {
       model: model,
       criteriaShow: false,
-      excelHeaders: {},
+      excelHeaders: {
+        "f_user_name":'客户姓名',
+        "f_userinfo_code":'客户编号',
+        "f_user_type":'客户类型',
+        "f_user_phone":'客户电话',
+        "f_address":'客户地址',
+        "f_check_book_name":'所属安检册'
+      },
       checkBooks: [],
       f_orgid: '',
       bookAll: false,
+      bookCheckedAll:false,
       bookList: [],
       selectBook:'',
       // init:false,
@@ -576,7 +592,7 @@ export default {
        this.$showMessage('请选择安检册')
        return
      }
-     if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+     if (this.isSearch && (this.bookAll || this.bookCheckedAll || this.bookList.length > 0) && this.model.rows.length > 0) {
        let userCondition = ''
        if (this.bookList.length < 1) {
          console.log('bookCondition', this.bookCondition)
@@ -604,6 +620,7 @@ export default {
        this.selectBook = ''
        this.clearBook()
        this.bookAll = false
+       this.bookCheckedAll = false
        this.bookList = []
        this.showModal2 = false
        this.$refs.paged.$refs.criteria.search()
@@ -614,7 +631,7 @@ export default {
         this.$showMessage('请选择安检册')
         return
       }
-      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && (this.bookAll || this.bookCheckedAll || this.bookList.length > 0) && this.model.rows.length > 0) {
         let userCondition = ''
         if (this.bookList.length < 1) {
           console.log('bookCondition', this.bookCondition)
@@ -642,6 +659,7 @@ export default {
         this.selectBook = ''
         this.clearBook()
         this.bookAll = false
+        this.bookCheckedAll = false
         this.bookList = []
         this.showModal3 = false
         this.$refs.paged.$refs.criteria.search()
@@ -651,6 +669,7 @@ export default {
       this.selectBook = ''
       this.clearBook()
       this.bookAll = false
+      this.bookCheckedAll = false
       this.bookList = []
       this.showModal2 = false
       this.$refs.paged.$refs.criteria.search()
@@ -659,6 +678,7 @@ export default {
       this.selectBook = ''
       this.clearBook()
       this.bookAll = false
+      this.bookCheckedAll = false
       this.bookList = []
       this.showModal3 = false
       this.$refs.paged.$refs.criteria.search()
@@ -668,7 +688,7 @@ export default {
         this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && (this.bookAll ||this.bookCheckedAll || this.bookList.length > 0) && this.model.rows.length > 0) {
         this.showModal2 = true
         this.freshCheckBook()
         return
@@ -680,7 +700,7 @@ export default {
         this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
-      if (this.isSearch && ( this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && ( this.bookAll ||this.bookCheckedAll|| this.bookList.length > 0) && this.model.rows.length > 0) {
         this.showModal3 = true
         this.freshCheckBook()
         return
@@ -692,7 +712,7 @@ export default {
         this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && (this.bookAll ||this.bookCheckedAll|| this.bookList.length > 0) && this.model.rows.length > 0) {
         let userCondition= ''
         if (this.bookList.length < 1) {
           console.log('bookCondition', this.bookCondition)
@@ -719,6 +739,7 @@ export default {
         this.$showMessage('从安检册删除所选用户成功')
         this.selectBook = ''
         this.bookAll = false
+        this.bookCheckedAll = false
         this.clearBook()
         this.bookList = []
         this.showModal3 = false
@@ -732,7 +753,7 @@ export default {
         this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+      if (this.isSearch && (this.bookAll ||this.bookCheckedAll || this.bookList.length > 0) && this.model.rows.length > 0) {
         this.showModal = true
         return
       }
@@ -784,6 +805,7 @@ export default {
           this.clearBook()
           this.bookList = []
           this.bookAll = false
+          this.bookCheckedAll = false
           this.freshCheckBook()
           this.$refs.paged.$refs.criteria.search()
         }
@@ -793,6 +815,7 @@ export default {
       console.log('66666666666', val)
       console.log(this.model.rows)
       this.bookAll = false
+      this.bookCheckedAll = false
       this.bookList = []
       if (this.$refs.paged.$refs.criteria.model.f_orgid){
         this.$refs.paged.$refs.criteria.search()
@@ -800,6 +823,7 @@ export default {
     },
     cancel () {
       this.bookAll = false
+      this.bookCheckedAll = false
       this.bookList = []
       this.clearBook()
       this.showModal = false
@@ -807,11 +831,25 @@ export default {
     },
     checkModel (row) {
       if (this.bookAll) {
-        console.log('row', this.bookAll, JSON.stringify(row))
+        //console.log('row', this.bookAll, JSON.stringify(row))
         return true
       } else {
         if (this.bookList.findIndex(res => res === row.f_userinfo_id) !== -1) {
-          console.log('row1111', JSON.stringify(row))
+          //console.log('row1111', JSON.stringify(row))
+          return true
+        } else {
+          return false
+        }
+      }
+    },
+    pageCheckModel(row){
+      if (this.bookCheckedAll){
+        console.log('benye', this.bookAll, JSON.stringify(row))
+        //全选被选中，每行row也被选中
+        return true
+      }else {
+        if (this.bookList.findIndex(res => res === row.f_userinfo_id) !== -1) {
+          //console.log('本页', JSON.stringify(row))
           return true
         } else {
           return false
@@ -825,7 +863,7 @@ export default {
       } else {
         this.bookList.splice(this.bookList.findIndex(res => res === row.f_userinfo_id), 1)
       }
-      // console.log('aaaaa', JSON.stringify(this.bookList))
+       console.log('aaaaa', JSON.stringify(this.bookList))
     },
     getRes (obj) {
       this.checkBook.f_orgid = obj.resids[0]
@@ -839,6 +877,7 @@ export default {
     selfSearch (args) {
       this.isSearch = true
       this.bookAll = false
+      this.bookCheckedAll = 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}`
@@ -898,7 +937,20 @@ export default {
     // this.init=true
     this.freshCheckBook()
     this.getChecker()
-  }
+  },
+  watch: {
+    'bookCheckedAll' (val) {
+      if (val){
+        this.$refs.paged.$refs.grid.model.rows.forEach(row=>{
+          this.bookList.push(row.f_userinfo_id)
+        })
+        console.log('this.bookList', JSON.stringify(this.bookList))
+      }else {
+        this.bookList = []
+        console.log('this.bookList', JSON.stringify(this.bookList))
+      }
+    }
+  },
 }
 </script>
 <style  scoped>