safecheck-client 3.0.35-3 → 3.0.35-31

package/src/components/pc/SecurityCheckLedger.vue

@@ -0,0 +1,113 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">小区名称</label>
+                <input type="text" class="input_search" v-model="model.f_residential_area"
+                       style="width: 60%" placeholder="小区名称" condition="ta.f_residential_area like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
+                <export-excel-safe :data="$parent.$parent.searchData"
+                              :field="$parent.$parent.excelHeaders"
+                              :choose-col="true"
+                              sqlurl="rs/logic/SafeExportExcel" sql-name="securityCheckLedger" template-name='安检台账'></export-excel-safe>
+                <button class="button_spacing button_search" @click="search()">查询</button>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>小区名称</nobr>
+              </th>
+              <th>
+                <nobr>小区用户数</nobr>
+              </th>
+              <th>
+                <nobr>所属计划</nobr>
+              </th>
+              <th>
+                <nobr>计划内用户数</nobr>
+              </th>
+              <th>
+                <nobr>计划下发时间</nobr>
+              </th>
+              <th>
+                <nobr>执行时间</nobr>
+              </th>
+              <th>
+                <nobr>执行周期</nobr>
+              </th>
+              <th>
+                <nobr>周期单位</nobr>
+              </th>
+              <th>
+                <nobr>距离下周期时间（天）</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center">{{row.f_residential_area}}</td>
+            <td style="text-align: center">{{row.area_num}}</td>
+            <td style="text-align: center">{{row.f_plan_name}}</td>
+            <td style="text-align: center">{{row.plan_num}}</td>
+            <td style="text-align: center">{{row.f_issue_time}}</td>
+            <td style="text-align: center">{{row.first_check_date}}</td>
+            <td style="text-align: center">{{row.zq_value}}</td>
+            <td style="text-align: center">{{row.dw_value}}</td>
+            <td style="text-align: center">{{row.difference_day}}</td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+export default {
+  title: '安检台账',
+  data() {
+    return {
+      model: new PagedList('rs/sql/securityCheckLedger', 20),
+      searchData: {
+        condition: "1=1"
+      },
+      excelHeaders: {
+        'f_residential_area': '小区名称',
+        'area_num': '小区用户数',
+        'f_plan_name': '所属计划',
+        'plan_num': '计划内用户数',
+        'f_issue_time': '计划下发时间',
+        'first_check_date': '执行时间',
+        'zq_value': '执行周期',
+        'dw_value': '周期单位',
+        'difference_day': '距离下周期时间（天）'
+      }
+      }
+    },
+    methods: {
+      selfSearch(args) {
+        this.model.search(args.condition, args.model, args.condValue)
+      }
+    },
+    ready() {
+
+    },
+  watch: {
+    'model.condition'(val) {
+      if (val) {
+        this.searchData.condition = val
+      }
+    }
+  }
+
+  }
+</script>

package/src/components/planmanage/PlanManage.vue

@@ -251,6 +251,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" v-show="createPlan.isShare=='是' && ismulchecker">
+              <label class="font_normal_body">安&ensp;检&ensp;员:</label>
+              <v-select
+                class="select select_list"
+                :value.sync="createPlan.checkers"
+                v-model="createPlan.checkers"
+                :options='checker'
+                placeholder='请选择'
+                :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -350,6 +362,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='是' && ismulchecker">
+              <label class="font_normal_body">安&ensp;检&ensp;员:</label>
+              <v-select
+                class="select select_list"
+                :value.sync="upCheckPlan.checkers"
+                v-model="upCheckPlan.checkers"
+                :options='checker'
+                placeholder='请选择'
+                :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -396,6 +420,7 @@
         title: '计划管理',
         data() {
           return {
+            ismulchecker:this.$appdata.getSingleValue('计划安检员多选')?true:false,
             a:'1',
             opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
             currentorder:'按时间降序',
@@ -410,7 +435,9 @@
               f_checker_id:'',
               isShare:'',
               f_checker:'',
-              checker:{}
+              f_checkerstr:'',
+              checker:{},
+              checkers:[]
             },
             isSend:false,
             createPlan:{
@@ -421,7 +448,9 @@
               f_issued:'否',
               f_checker_id:null,
               checker:{},
+              checkers:[],
               f_checker:null,
+              f_checkerstr:null,
               f_safecheck_type:'',
             },
             planCondition:{},
@@ -523,6 +552,12 @@
             return
           }
           if(this.createPlan.isShare=="是"){
+              if(this.ismulchecker && this.createPlan.checkers.length > 0){
+                this.createPlan.checkers.forEach((value) => {
+                  this.createPlan.f_checkerstr += `${value.name},`
+                })
+                this.createPlan.f_checkerstr = this.createPlan.f_checkerstr.slice(0, -1)
+              }
             this.createPlan.f_checker_id=null
             this.createPlan.f_checker=null
           }else{
@@ -545,7 +580,9 @@
               f_issued:'否',
               f_checker_id:null,
               checker:{},
+              checkers:[],
               f_checker:null,
+              f_checkerstr:null,
               f_safecheck_type:'',
               f_create_operator:''
           }
@@ -608,7 +645,7 @@
         //按条件查询所有安检计划
         async loadCheckPlan() {
           this.isSend=true
-          this.checkplan.check.checkes=[]
+          this.checkplan.check.checkescheckes=[]
           let fieldValue=''
           switch(this.currentorder){
             case "按时间降序":
@@ -677,6 +714,12 @@
           console.log(this.upCheckPlan)
 
           if(this.upCheckPlan.isShare=="是"){
+            if(this.ismulchecker && this.upCheckPlan.checkers.length > 0){
+              this.upCheckPlan.checkers.forEach((value) => {
+                this.upCheckPlan.f_checkerstr += `${value.name},`
+              })
+              this.upCheckPlan.f_checkerstr = this.upCheckPlan.f_checkerstr.slice(0, -1)
+            }
             this.upCheckPlan.f_checker_id=null
             this.upCheckPlan.f_checker=null
           }else{
@@ -686,6 +729,8 @@
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
             data:{
+              checkers:this.createPlan.checkers,
+              f_checkerstr:this.createPlan.f_checkerstr,
               f_checker:this.upCheckPlan.f_checker,
               f_safecheck_type:this.upCheckPlan.f_safecheck_type,
               f_checker_id:this.upCheckPlan.f_checker_id,

package/src/components/report/CheckPlanAreaList.vue

@@ -172,12 +172,21 @@
             <td style="text-align:center">{{row.f_buyu}}</td>
             <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
-            <!--<td style="text-align: center;">-->
-            <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
-            <!--</td>-->
           </tr>
         </template>
-        <template partial='foot'></template>
+        <template partial="foot">
+          <tr>
+            <td  style="text-align:center"><strong>合计：</strong></td>
+            <td  style="text-align:center" :colspan="$parent.$parent.$parent.nameForSql.length"></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total}}</strong></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_weijian}}</strong></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_yijian}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_ruhu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_buyu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_jujian}}</strong></nobr></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total>0?(model.sums.f_yijian/model.sums.f_plan_total*100).toFixed(2)+'%':0}}</strong></td>
+          </tr >
+        </template>
       </data-grid>
     </criteria-paged>
   </div>
@@ -194,7 +203,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
+        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
@@ -437,7 +446,18 @@
         }
         //tag
         this.model.rows=JSON.parse(JSON.stringify(temp))
+      },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1){
+        this.model.sums.f_plan_total = 0
+        this.model.sums.f_weijian = 0
+        this.model.sums.f_yijian = 0
+        this.model.sums.f_ruhu = 0
+        this.model.sums.f_buyu = 0
+        this.model.sums.f_jujian = 0
       }
+    }
     },
     computed:{
       exportParameter(){

package/src/components/rongcheng/AddPlanItem.vue

@@ -168,7 +168,7 @@
                 </div>
                 <div class="col-xs-12">
                   <p class="panel-title col-xs-5 text-left font"><b>隐患情况:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_last_check_result }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_defect_text }}</p>
                 </div>
               </div>
             </div>

package/src/components/rongcheng/AspiratedAreaPlan.vue

@@ -334,6 +334,7 @@
       </div>
       <div slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-default" @click="uploadPic">上传</button>
+        <button type="button" class="btn btn-default" @click="imgUpModalShow = false">取消</button>
       </div>
     </modal>
     <!--<back-page :need-back='true'  @flag="$back()"></back-page>-->

package/src/components/rongcheng/AspiratedPaperFeedbackm.vue

@@ -456,6 +456,10 @@
             let temp = getFile.data[i].f_downloadpath
             if (temp) {
               let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+              if (temp.startsWith('E:')){
+                URL = `rs/image/file/${getFile.data[i].f_filename}`
+              }
+              console.log(URL)
               getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
             }
           }

package/src/components/rongcheng/AspiratedUserInfo.vue

@@ -32,7 +32,7 @@
           <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_address }}</p>
         </div>
         <div class="col-xs-12" style="margin-left: 20px">
-          <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a></p>
+          <p class="panel-title col-xs-7 text-left input-font"><a @click="upuserinfo(userinfo.f_userinfoid)">设备信息维护</a></p>
         </div>
         <!--<div class="col-xs-12">
           <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
@@ -157,13 +157,21 @@
         })
         this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
       },
-      searchDevices(f_userinfo_id) {
+      // searchDevices(f_userinfo_id) {
+      //   this.$dispatch('gotoson', {
+      //     _this: this.$parent.$parent,
+      //     title: '设备查看',
+      //     safe: false
+      //   })
+      //   this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
+      // },
+      upuserinfo (f_userinfo_id) {
         this.$dispatch('gotoson', {
           _this: this.$parent.$parent,
-          title: '设备查看',
+          title: '档案信息变更',
           safe: false
         })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
+        this.$parent.$parent.$goto('PhoneUpUserinfo', {f_userinfo_id: f_userinfo_id, f_source: '安检'})
       },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())

package/src/components/rongcheng/CheckSearchUser.vue

@@ -644,7 +644,7 @@ export default {
         //args.condition += " and ( f_last_check_date > '"+ args.model.f_check_end + " 23:59:00' or  f_last_check_date < '"+ args.model.f_check_start + " 00:00:00' or f_last_check_date is null)"
       } else if(this.SafeCheckXZ == '未入户') {
         args.condition += " and r < 1"
-        args.condition += " and f_last_check_state != '入户'"
+        // args.condition += " and f_last_check_state != '入户'"
         con1 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         con2 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         if(args.model.f_check_state=='到访不遇'){

package/src/components/rongcheng/SafecheckOrderV.vue

@@ -1786,7 +1786,7 @@ export default {
       this.$set('data.f_user_name', this.item.f_user_name)
       this.$set('data.f_user_phone', this.item.f_user_phone)
       this.$set('data.f_used_name', this.item.f_plan_meters[0].f_used_name)
-      this.$set('data.f_rent_phone',this.item.f_plan_meters[0].f_rent_phone)
+      this.$set('data.f_rent_phone',this.item.f_rent_phone)
       this.$set('data.f_remark', '')
       this.$set('data.f_user_phone2',this.item.f_plan_meters[0].f_user_phone2)
       this.$set('data.f_userinfoid', this.item.f_userinfoid)

package/src/components/rongcheng/SafecheckUserInfo.vue

@@ -55,10 +55,10 @@
                      :options="f_usetypes"
                      clear-button></v-select>
         </div>
-        <div class="col-xs-12" style="margin-left: 20px">
-          <!-- <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>-->
-          <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>
-        </div>
+<!--        <div class="col-xs-12" style="margin-left: 20px">-->
+<!--          &lt;!&ndash; <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>&ndash;&gt;-->
+<!--          <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>-->
+<!--        </div>-->
       </div>
       <div class="panel-body">
         <div v-show="false" class="row repair-info-content auto">
@@ -753,14 +753,14 @@
         })
         this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
       },
-      searchDevices(f_userinfo_id) {
-        this.$dispatch('gotoson', {
-          _this: this.$parent.$parent,
-          title: '设备查看',
-          safe: false
-        })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
-      },
+      // searchDevices(f_userinfo_id) {
+      //   this.$dispatch('gotoson', {
+      //     _this: this.$parent.$parent,
+      //     title: '设备查看',
+      //     safe: false
+      //   })
+      //   this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
+      // },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())
         //tag

package/src/filiale/bayan/android/AddPlanItem.vue

@@ -81,6 +81,15 @@
                 <input style="width: 100%" class="search_input input-font" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
               </div>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">区/期：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_area_period" placeholder="请输入" condition="ua.f_area_period like '%{}%'">
+              </div>
+            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -154,10 +163,21 @@
                 </div>
                 <div class="row">
                   <p class="panel-title col-xs-4 text-left font">用户电话</p>
-                  <p class="panel-title col-xs-8 text-left input-font" style="width: 77%">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}
                     <img src="../../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone)'></img></p>
                 </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">租户电话</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_zuhu_phone }}
+                    <img src="../../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_zuhu_phone)'></img></p>
+
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">临时联系电话</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_rent_phone }}
+                    <img src="../../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_rent_phone)'></img></p>
 
+                </div>
                 <div class="row">
                   <p class="panel-title col-xs-4 text-left font">小区名称</p>
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.f_residential_area }}</p>
@@ -180,7 +200,7 @@
                 </div>
                 <div class="row" v-if="row.f_table_state = '停用'">
                   <p class="panel-title col-xs-4 text-left font">原因</p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_table_state }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_black_comments }}</p>
                 </div>
               </div>
             </div>

package/src/filiale/bayan/android/CheckPlanDown.vue

@@ -111,7 +111,7 @@ export default {
       })
       let classes_str = classes_arr.data.map(item => { return `'${item.name}'` }).join()
       if (classes_arr.data && classes_arr.data.length >0){
-        this.condition += ` and ( f_class in (${classes_str})  or f_class  is null)`
+        this.condition += ` and ( f_class in (${classes_str})  or f_class =  '')`
       }
       let outlets_arr = await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
         data: {
@@ -119,7 +119,7 @@ export default {
         }
       })
       if (outlets_arr.data && outlets_arr.data.length >0){
-        this.condition += ` and ( f_outlets in (${outlets_arr.data.map(outlets => { return `'${outlets.name.substring(3)}'` }).join()}) or f_outlets is null )`
+        this.condition += ` and ( f_outlets in (${outlets_arr.data.map(outlets => { return `'${outlets.name.substring(3)}'` }).join()}) or f_outlets = '' )`
       }
     },
     reload() {

package/src/filiale/bayan/android/CurrentCreate.vue

@@ -104,6 +104,16 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_area_period" class="font text-left">区/期：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_area_period" class="search_input input-font"
+                       v-model=model.f_area_period condition="f_area_period like '%{}%'" />
+              </div>
+            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">