safecheck-client 3.0.35-gongyi-3 → 3.0.35-gongyi-6

package/package.json

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

package/src/components/defect/DefectPaperWeiXiu.vue

@@ -446,8 +446,8 @@
         defectLeave:'',
         defectType:'',
         defectLeaveList:[],
-        headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','隐患总数','已处理数','未处理数','隐患数','隐患情况'],
-        bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_defect_count','f_repair_count','remainder','f_defect_count','f_defect_content']
+        headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','隐患总数','已处理数','未处理数','隐患数','隐患情况','用户类型','安装位置','机表类型','房屋类型'],
+        bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_defect_count','f_repair_count','remainder','f_defect_count','f_defect_content','f_user_type','f_position','F_METER_CLASSIFY','f_house_type']
       }
     },
     props:{

package/src/components/paper/PaperList.vue

@@ -438,7 +438,10 @@
           'f_entry_status': '安检状态',
           'f_offsite_time': '安检时间',
           'f_upload_date':'上传时间',
-          'f_checker_name': '安检员'
+          'f_checker_name': '安检员',
+          'f_position':'安装位置',
+          'F_METER_CLASSIFY':'机表类型',
+          'f_house_type':'房屋类型',
         },
         fun: this.$login.f,
         pcds:[],

package/src/components/pc/CheckBookList.vue

@@ -15,7 +15,7 @@
                 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>
@@ -59,8 +59,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,14 +83,6 @@
 
 
           </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">
               <role-selector-safe

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>
@@ -267,7 +267,7 @@
                 <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>
+                <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookCheckedAll"></input>本页全选</nobr>
               </th>
               <th>
                 <nobr>客户姓名</nobr>
@@ -297,8 +297,7 @@
             </td>
             <td style="text-align: center">
               <nobr>
-                <input type="checkbox" :checked="$parent.$parent.$parent.pageCheckModel(row)"
-                       @change="$parent.$parent.$parent.pageCheckChange(row, $event)"></input>
+                <input type="checkbox" :checked="$parent.$parent.$parent.pageCheckModel(row)"></input>
               </nobr>
             </td>
             <td style="text-align: center">{{ row.f_user_name }}</td>
@@ -326,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' ">
@@ -438,11 +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,
-      isallchecked:false,//本页全选
+      bookCheckedAll:false,
       bookList: [],
       selectBook:'',
       // init:false,
@@ -586,7 +592,7 @@ export default {
        this.$showMessage('请选择安检册')
        return
      }
-     if (this.isSearch && (this.isallchecked || 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)
@@ -614,7 +620,7 @@ export default {
        this.selectBook = ''
        this.clearBook()
        this.bookAll = false
-       this.isallchecked = false
+       this.bookCheckedAll = false
        this.bookList = []
        this.showModal2 = false
        this.$refs.paged.$refs.criteria.search()
@@ -625,7 +631,7 @@ export default {
         this.$showMessage('请选择安检册')
         return
       }
-      if (this.isSearch && (this.isallchecked || 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)
@@ -653,7 +659,7 @@ export default {
         this.selectBook = ''
         this.clearBook()
         this.bookAll = false
-        this.isallchecked = false
+        this.bookCheckedAll = false
         this.bookList = []
         this.showModal3 = false
         this.$refs.paged.$refs.criteria.search()
@@ -663,7 +669,7 @@ export default {
       this.selectBook = ''
       this.clearBook()
       this.bookAll = false
-      this.isallchecked = false
+      this.bookCheckedAll = false
       this.bookList = []
       this.showModal2 = false
       this.$refs.paged.$refs.criteria.search()
@@ -672,7 +678,7 @@ export default {
       this.selectBook = ''
       this.clearBook()
       this.bookAll = false
-      this.isallchecked = false
+      this.bookCheckedAll = false
       this.bookList = []
       this.showModal3 = false
       this.$refs.paged.$refs.criteria.search()
@@ -682,7 +688,7 @@ export default {
         this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.isallchecked || 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
@@ -694,7 +700,7 @@ export default {
         this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.isallchecked || 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
@@ -706,7 +712,7 @@ export default {
         this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.isallchecked || 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)
@@ -733,7 +739,7 @@ export default {
         this.$showMessage('从安检册删除所选用户成功')
         this.selectBook = ''
         this.bookAll = false
-        this.isallchecked = false
+        this.bookCheckedAll = false
         this.clearBook()
         this.bookList = []
         this.showModal3 = false
@@ -747,7 +753,7 @@ export default {
         this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
-      if (this.isSearch && (this.isallchecked || 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
       }
@@ -799,7 +805,7 @@ export default {
           this.clearBook()
           this.bookList = []
           this.bookAll = false
-          this.isallchecked = false
+          this.bookCheckedAll = false
           this.freshCheckBook()
           this.$refs.paged.$refs.criteria.search()
         }
@@ -809,7 +815,7 @@ export default {
       console.log('66666666666', val)
       console.log(this.model.rows)
       this.bookAll = false
-      this.isallchecked = false
+      this.bookCheckedAll = false
       this.bookList = []
       if (this.$refs.paged.$refs.criteria.model.f_orgid){
         this.$refs.paged.$refs.criteria.search()
@@ -817,7 +823,7 @@ export default {
     },
     cancel () {
       this.bookAll = false
-      this.isallchecked = false
+      this.bookCheckedAll = false
       this.bookList = []
       this.clearBook()
       this.showModal = false
@@ -825,25 +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.isallchecked) {
-        console.log('row', this.isallchecked, JSON.stringify(row))
+    pageCheckModel(row){
+      if (this.bookCheckedAll){
+        console.log('benye', this.bookAll, JSON.stringify(row))
+        //全选被选中，每行row也被选中
         return true
-      } else {
+      }else {
         if (this.bookList.findIndex(res => res === row.f_userinfo_id) !== -1) {
-          console.log('row1111', JSON.stringify(row))
+          //console.log('本页', JSON.stringify(row))
           return true
         } else {
           return false
@@ -857,15 +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))
-    },
-    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)
-      }
+       console.log('aaaaa', JSON.stringify(this.bookList))
     },
     getRes (obj) {
       this.checkBook.f_orgid = obj.resids[0]
@@ -879,7 +877,7 @@ export default {
     selfSearch (args) {
       this.isSearch = true
       this.bookAll = false
-      this.isallchecked = 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}`
@@ -922,20 +920,6 @@ 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()
@@ -953,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>

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -456,9 +456,7 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_checker_name }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_state }}</td>
-          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">
-            {{row.f_last_check_result }}
-          </td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{row.f_last_check_result }}</td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -506,7 +504,7 @@ export default {
 
       },
       excelHeaders: {
-        //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果
+        //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果    气表类型   安装位置  房屋类型
 
         'f_userinfo_code': '用户编号',
         'f_user_name': '用户名称',
@@ -519,7 +517,10 @@ export default {
         'f_address': '地址',
         'f_last_check_date': '安检日期',
         'f_last_check_state': '安检状态',
-        'f_last_check_result': '安检结果'
+        'f_last_check_result': '安检结果',
+        'f_position':'安装位置',
+        'F_METER_CLASSIFY':'机表类型',
+        'f_house_type':'房屋类型',
       },
       model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",

package/src/components/report/CheckPlanAreaList.vue

@@ -138,9 +138,11 @@
               <input type="checkbox" id="f_checker_name" value="f_checker_name" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">安检员</label>
               <input type="checkbox" id="f_dep" value="f_dep" v-model="$parent.$parent.nameForSql"/>
-              <label for="f_plan_name">安检科室</label>
+              <label for="f_dep">安检科室</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
-              <label for="f_checker_name">档案数量</label>
+              <label for="f_user_number">档案数量</label>
+              <input type="checkbox" id="f_user_type" value="f_user_type" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_user_type">用户类型</label>
             </div>
           </div>
         </div>
@@ -159,6 +161,7 @@
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')"><nobr>安检员</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_dep')"><nobr>安检科室</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')"><nobr>档案数量</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_type')"><nobr>用户类型</nobr></th>
             <th>
               <nobr>计划总数</nobr>
             </th>
@@ -198,6 +201,7 @@
             <td style="text-align:center" :class="{'td-0':row.f_checker_name==undefined,'td-1':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_dep')">{{row.f_dep}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_type')">{{row.f_user_type}}</td>
             <td style="text-align:center">{{row.f_plan_total}}</td>
             <td style="text-align:center">{{row.f_weijian}}</td>
             <td style="text-align:center"><nobr>{{row.f_yijian}}</nobr></td>
@@ -319,6 +323,8 @@
             this.exportExcelField.f_checker_name='小区名称'
           }if (ff==='f_user_number') {
             this.exportExcelField.f_checker_name='档案数量'
+          }if (ff==='f_user_type'){
+            this.exportExcelField.f_user_type='用户类型'
           }
         }
       },
@@ -372,6 +378,9 @@
         if(this.f_dep){
           args.condition += ` and f_dep  = '${this.f_dep}'`
         }
+        if(this.f_user_type){
+          args.condition += ` and f_user_type  = '${this.f_user_type}'`
+        }
         this.model.f_bv=this.$refs.paged.$refs.cri.model.f_bv?this.$refs.paged.$refs.cri.model.f_bv:''
         this.model.f_rh=this.$refs.paged.$refs.cri.model.f_rh?this.$refs.paged.$refs.cri.model.f_rh:''
         this.$refs.paged.$refs.grid.$el.scrollTop = 0
@@ -386,7 +395,7 @@
 
       // 拼接groupName1
       getGroupName1 () {
-        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_dep','f_user_number']
+        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_dep','f_user_number','f_user_type']
         var newtemp=[]
 
         for (var i=0;i<temp.length;i++){
@@ -423,7 +432,7 @@
         }
         this.listflag=true
         console.log(this.model.rows)
-        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_user_type']
         var newtemp=[]
         for (var i=0;i<temp.length;i++){
           for (var j=0;j<this.nameForSql.length;j++){