safecheck-client 3.0.34-1 → 3.0.34-100

package/src/filiale/shanxian/pc/checkUserList.vue

@@ -216,7 +216,7 @@
                       :show-rest-button="reset"
                       :value.sync="model.f_start_time"
                       v-model="model.f_start_time"
-                      condition="ui.f_last_check_date >='{} 00:00:00'">
+                    >
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
@@ -229,7 +229,7 @@
                       :show-rest-button="reset"
                       :value.sync="model.f_end_time"
                       v-model="model.f_end_time"
-                      condition="ui.f_last_check_date  <='{} 23:59:59'">
+                    >
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
@@ -457,10 +457,10 @@
         this.checkAll=false
         let condition2 = '1=1'
         if(args.model.f_start_time){
-          condition2+=` and f_upload_date > '${args.model.f_start_time} 00:00:00'`
+          condition2+=` and f_offsite_time > '${args.model.f_start_time} 00:00:00'`
         }
         if(args.model.f_end_time){
-          condition2+=` and f_upload_date < '${args.model.f_end_time} 23:59:59'`
+          condition2+=` and f_offsite_time < '${args.model.f_end_time} 23:59:59'`
         }
         const state = args.model.f_last_check_state
         if(state){

package/src/filiale/shanxian/pc.js

@@ -10,8 +10,8 @@ let specialComp = {
   'check-search-user': (resolve) => { require(['./pc/CheckSearchUser'], resolve) },
   'check-detail': (resolve) => { require(['./pc/CheckDetail'], resolve) },
   'check-plan': (resolve) => { require(['./pc/CheckPlan'], resolve) },
-  'hiddensituation': (resolve) => { require(['./pc/HiddenSituation'], resolve) }
-
+  'hiddensituation': (resolve) => { require(['./pc/HiddenSituation'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/shiquan/android/SafecheckDevices.vue

@@ -439,7 +439,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -459,6 +458,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         //tag

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

@@ -0,0 +1,450 @@
+<template>
+  <div class="auto">
+    <criteria-paged :model="model"  v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户编号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font"
+                       v-model=model.f_userinfo_code condition="f_userinfo_code = '{}'" placeholder="请输入用户编号" />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">表 &nbsp;&nbsp; &nbsp;&nbsp; 号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font"
+                       v-model=model.f_meternumber condition="f_meternumber = '{}'" style="width: 70%" placeholder="请输入表号" />
+                <button type="button" name="button" class="btn btn-primary" style="width: 25%" @click="$parent.$parent.scan">扫码</button>
+              </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 class="search_input input-font" v-model="model.f_username" 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" >
+                <v-select :value.sync="$parent.$parent.model.f_user_type" class="input-font"
+                          :options='$parent.$parent.user_types' placeholder='请选择用户类型' :value-single="true"
+                          v-model="$parent.$parent.model.f_user_type" close-on-select clear-button></v-select>
+              </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_districtname" 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">楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_building" 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">单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;元：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_unit" 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_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">表&nbsp;&nbsp;封&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_metertitles" placeholder="请输入表封号" condition="uf.f_metertitles='{}'">
+              </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">电&nbsp;&nbsp;话&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_user_phone" placeholder="请输入电话号" condition="ui.f_user_phone like '%{}%'">
+              </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">卡&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_card_id" placeholder="请输入卡号" condition="uf.f_card_id like '%{}%'">
+              </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">抄&nbsp;&nbsp;表&nbsp;&nbsp;册：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select class="input-font"
+                          placeholder='请选择抄表册'
+                          :value.sync="model.f_meter_book_num"
+                          v-model="model.f_meter_book_num"
+                          :options='$parent.$parent.cbc'
+                          condition="uf.f_meter_book_num='{}'"
+                          close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+
+      <list :model="model" partial='list'>
+        <div partial>
+          <div @click="$parent.$parent.$parent.inspectRepair(row)" class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <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_userinfo_code }}</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_user_name }}</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_meternumber }}</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_user_type }}</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_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}</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>
+                </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_address }}</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_last_check_date }}</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_last_check_state }}</p>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+    <!--<back-page :need-back='true'   @flag="$back()"></back-page>-->
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+import * as Util from '../../Util'
+
+export default {
+  title: '安检员B',
+  data () {
+    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
+      f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
+    model.f_sign = ['']
+    model.f_user_type = ''
+    model.f_user_state =['']
+    model.f_check_type =['']
+    model.myCycle = 0
+    model.fyCycle = 0
+    model.f_filialeid = Vue.user.orgid
+    //model.f_filialeid = 287
+    return {
+      model: model,
+      cbc:[],
+      showModal:false,
+      signs: [
+        {label:'请选择录入状态', value:''},
+        {label:'录入', value:'1'},
+        {label:'非录入', value:'0'},
+      ],
+      ischecks: [
+      ],
+      user_types: [
+        {label: '请选择用户类型', value: ''},
+        {label: '民用', value: '民用'},
+        {label: '非民用', value: '非民用'},
+      ],
+      f_user_states: [
+        {label:'请选择档案状态', value:''},
+        {label:'正常', value:'正常'},
+        {label:'点火', value:'点火'},
+      ],
+      f_check_types: [
+        {label:'请选择安检类型', value:''},
+        {label:'应检', value:'应检'},
+        {label:'超期', value:'超期'},
+      ],
+    }
+  },
+  ready () {
+    // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
+    //   //tag)
+    //   if(res.data.code == 200){
+    //     this.model.myCycle = res.data.civil.value
+    //     this.model.fyCycle = res.data.civilian.value
+    //   }else{
+    //     //this.$showMessage(res.data.msg)
+    //   }
+    //
+    // })
+    // this.getCheckTime()
+    // this.Mreadibook()
+  },
+  computed: {
+    reload(){
+      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+    },
+    selected () {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  },
+  methods:{
+    search(args){
+      args.condition += ` and f_handler_state is null`
+      this.model.search(args.condition, args.model, args.condValue)
+    },
+    inspectRepair(row){
+      var _this = this
+      let http = new HttpResetClass()
+      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/AndroidDealWith`, {data: {condition:  `tcp.f_userinfo_code = '${row.f_userinfo_code}'`,f_filialeids:Vue.user.orgid}},
+        {resolveMsg: null, rejectMsg: null}).then(resp=>{
+        if (resp.data.length>0){
+          this.$showMessage('该用户有隐患未处理，是否先处理隐患？', ['cancel', 'confirm']).then(
+            (response) => {
+              if (response === 'confirm') {
+                var pardate = {
+                  _this:_this,
+                  title:'隐患处理',
+                  safe:true
+                }
+                _this.$dispatch('gotoson',pardate)
+                _this.$goto('android-defect-deal-before-safe', {row: row}, 'self', function () {
+                  _this.inspect(row)
+                })
+              }else {
+                this.inspect(row)
+              }
+            }
+          )
+        }else {
+          this.inspect(row)
+        }
+      }).catch(()=>{
+        this.inspect(row)
+      })
+    },
+    scan(){
+      HostApp.__this__=this,
+        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
+    },
+    getCode(){
+      let datapa = HostApp.getCode().data;
+      let indexnum = datapa.indexOf("]C1")
+      if(indexnum != -1){
+        datapa = datapa.substring(indexnum+3,datapa.length)
+      }
+      this.$refs.paged.$refs.cri.model.f_meternumber=datapa
+    },
+    getCheckTime(){
+      //tag
+      new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
+          items: 'f_circle,f_start_time',
+          tablename: 't_safe_circle',
+          condition: `f_filialeid  = '${Vue.user.orgid}'`,
+          orderitem: 'id'
+        }}).then(res=>{
+        //tag)
+        let  nocheck=''
+        let  ischeck=''
+        if (res.data[0]){
+          if (res.data[0].f_circle=='1'){
+            nocheck=`(ua.f_last_check_date<'${res.data[0].f_start_time}' or ua.f_last_check_date is null)`
+            ischeck=`ua.f_last_check_date>'${res.data[0].f_start_time}'`
+
+          }else{
+            let addtime= (Util.toStandardTimeString().substring(0,4)-res.data[0].f_start_time.substring(0,4))%res.data[0].f_circle
+            //tag
+            let time =(Util.toStandardTimeString().substring(0,4)-addtime)+'-01-01 00:00:00'
+            //tag
+            nocheck=`(ua.f_last_check_date<'${time}' or ua.f_last_check_date is null)`
+            ischeck=`ua.f_last_check_date>'${time}'`
+          }
+          //tag
+          this.ischecks=[
+            {label: '全部', value: ''},
+            {label: '已检', value: ischeck },
+            {label: '未检', value: nocheck},
+          ]
+          //tag
+        }else{
+          this.$showMessage("未配置安检周期")
+        }
+
+      })
+      //tag
+    },
+    inspect (info){
+      if(info.f_last_check_date){
+        this.$showMessage("该用户最后一次安检时间为 "+info.f_last_check_date+" 是否继续对该用户进行安检",['confirm', 'cancel']).then((butt)=>{
+          if(butt=="confirm"){
+            info.id = ''
+            info.f_state = '未检'
+            info.f_no_checkplan = '无计划安检'
+            //tag
+            this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+              //tag)
+              info['f_plan_meters'] = response.data
+              var pardate = {
+                _this:this,
+                tittle:'安检详情',
+                safe:true
+              }
+              this.$dispatch('gotoson',pardate)
+              this.$goto('safecheck-order-v', {item: info, role: 'inspect',parentPage:'AddPlanItem'}, 'self', this.reload)
+
+            })
+          }
+        })
+      }else{
+        info.id = ''
+        info.f_state = '未检'
+        info.f_no_checkplan = '无计划安检'
+        //tag
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+          //tag)
+          info['f_plan_meters'] = response.data
+          var pardate = {
+            _this:this,
+            tittle:'安检详情',
+            safe:true
+          }
+          this.$dispatch('gotoson',pardate)
+          this.$goto('safecheck-order-v', {item: info, role: 'inspect',parentPage:'AddPlanItem'}, 'self', this.reload)
+
+        })
+      }
+    },
+    Mreadibook(){
+      this.cbc=[]
+      let http = new HttpResetClass()
+      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/getMeterBooksData`,
+        {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
+        {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
+        this.cbc = [{label: '全部', value: ''}]
+        //tag
+        //tag)
+        //tag
+        getMeterReadingBooks.data.meterbooks.forEach((res) => {
+          this.cbc.push({label: res.f_book_name, value: res.id})
+          /*if(res.f_book_slice_area){
+            if(this.sliceArea.indexOf(res.f_book_slice_area)<0){
+              this.sliceArea.push(res.f_book_slice_area)
+            }
+          }*/
+        })
+      })
+
+
+    }
+  }
+}
+</script>
+<style scoped>
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+</style>