safecheck-client 3.0.34-1 → 3.0.34-100

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

@@ -120,51 +120,6 @@
                     <input type="text" class="input_search" v-model="model.f_unit"
                            style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">
                   </div>
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">开户起始:</label>-->
-<!--                    <datepicker-->
-<!--                      placeholder='请选择'-->
-<!--                      style="width:60%"-->
-<!--                      :disabled-days-of-week="[]"-->
-<!--                      :format="'yyyy-MM-dd'"-->
-<!--                      :show-rest-button="reset"-->
-<!--                      :value.sync="model.f_startfile_time"-->
-<!--                      v-model="model.f_startfile_time"-->
-<!--                      condition="ui.f_createfile_date >= '{} 00:00:00'">-->
-<!--                    </datepicker>-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">开户截止:</label>-->
-<!--                    <datepicker-->
-<!--                      placeholder='请选择'-->
-<!--                      :disabled-days-of-week="[]"-->
-<!--                      style="width:60%"-->
-<!--                      :format="'yyyy-MM-dd'"-->
-<!--                      :show-rest-button="reset"-->
-<!--                      :value.sync="model.f_endfile_time"-->
-<!--                      v-model="model.f_endfile_time"-->
-<!--                      condition="ui.f_createfile_date <= '{} 00:00:00'">-->
-<!--                    </datepicker>-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">表&ensp;箱&ensp;号:</label>-->
-<!--                    <input type="text" class="input_search" v-model="model.f_metertitles"-->
-<!--                           style="width: 60%" placeholder="请选择" condition="uf.f_metertitles='{}'">-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">抄&ensp;表&ensp;册:</label>-->
-<!--                    <v-select-->
-<!--                      class="select select_list"-->
-<!--                      :value.sync="model.f_meter_book_num"-->
-<!--                      v-model="model.f_meter_book_num"-->
-<!--                      :options='$parent.$parent.cbc'-->
-<!--                      placeholder='请选择'-->
-<!--                      condition="uf.f_meter_book_num='{}'"-->
-<!--                      close-on-select-->
-<!--                      value-single-->
-<!--                    >-->
-<!--                    </v-select>-->
-<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">派发情况:</label>
                     <v-select
@@ -194,21 +149,6 @@
                     >
                     </v-select>
                   </div>
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">安检情况:</label>-->
-<!--                    <v-select-->
-<!--                      class="select select_list"-->
-<!--                      :value.sync="model.checkState"-->
-<!--                      v-model="model.checkState"-->
-<!--                      :options='$parent.$parent.checkStateList'-->
-<!--                      placeholder='请选择'-->
-<!--                      condition="{}"-->
-<!--                      :search="false"-->
-<!--                      close-on-select-->
-<!--                      value-single-->
-<!--                    >-->
-<!--                    </v-select>-->
-<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">安检片区:</label>
                     <v-select
@@ -223,31 +163,16 @@
                     >
                     </v-select>
                   </div>
-                  <!--<div class="form-group col-sm-4" >
-                    <label class="font_normal_body">入户情况:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_hasHousehold"
-                      v-model="model.f_hasHousehold"
-                      :options='$parent.$parent.hasHousehold'
-                      placeholder='请选择'
-                      close-on-select
-                      :search="false"
-                      value-single
-                    >
-                    </v-select>
-                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">安检起始:</label>
                     <datepicker
                       placeholder='请选择'
                       style="width:60%;text-align: center"
                       :disabled-days-of-week="[]"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 00:00:00'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_start"
-                      v-model="model.f_check_start"
-                      condition="ui.f_last_check_date >='{} 00:00:00'">
+                      v-model="model.f_check_start">
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
@@ -256,11 +181,22 @@
                       placeholder='请选择'
                       :disabled-days-of-week="[]"
                       style="width:60%;text-align: center"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 23:59:59'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_end"
-                      v-model="model.f_check_end"
-                      condition="ui.f_last_check_date  <='{} 00:00:00'">
+                      v-model="model.f_check_end">
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">入户截止:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      :disabled-days-of-week="[]"
+                      style="width:60%;text-align: center"
+                      :format="'yyyy-MM-dd 23:59:59'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_ruhu_end"
+                      v-model="model.f_ruhu_end">
                     </datepicker>
                   </div>
 
@@ -339,18 +275,20 @@
   import Vue from "vue";
 
     export default {
-        name: "PlanManage",
+        name: "checkUserList",
         title: '计划管理',
         data() {
+          let model = new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
+            "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
+            "f_usertype": "''",
+            "month": "''",
+            "SafeCheckSX": 'this.SafeCheckSX',
+            "SafeCheckCQ": "''",
+            "startday":"''",
+            "endday":"''"})
+          model.SafeCheckSX = '1 = 1'
           return {
-            model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
-              "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
-              "f_usertype": "''",
-              "month": "''",
-              "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
-              "SafeCheckCQ": "''",
-              "startday":"''",
-              "endday":"''"}),
+            model: model,
             a:'1',
             opt:[{label:"测试",value:"测试"}],
             showCondtion:false,
@@ -361,7 +299,6 @@
             meter_gasbrand:[],//气表品牌
             hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
             yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
-            checkStateList:[{label:"全部",value:""},{label:"两年内已检",value:"DATEDIFF(day,isnull(ui.f_last_check_date,'2010-01-01'),GETDATE())<=730"},{label:"两年内未检",value:"DATEDIFF(day,isnull(ui.f_last_check_date,'2010-01-01'),GETDATE())>730"},{label:"从未安检",value:"从未安检"}],
             hasResidentialArea:[{label:"全部",value:""},{label:"有名称",value:"有名称"},{label:"无名称",value:"无名称"}],
             sliceArea:[],
             meterbooks:[],
@@ -462,38 +399,36 @@
             this.excelUserCondtion=true
           },
           selfSearch (args) {
-            //tag)
-           let condition1="(ui.f_last_check_date is null or ui.f_last_check_date ='')"
-           let arge = args.condition.replace('从未安检',condition1)
-            args.condition = arge
-            args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
-            if (!Util.isEmpty(args.model.f_last_check_state)){
-              if (args.model.f_last_check_state == '未检'){
-                args.condition +=" and (ui.f_last_check_state is null or ui.f_last_check_state ='')"
-              }else  {
-                args.condition += `and ui.f_last_check_state = '${args.model.f_last_check_state}'`
+            if( args.model.f_last_check_state == '入户' && args.model.f_ruhu_end) {
+              args.condition += `and DATEADD(YEAR, 2, CAST(ruhuend.f_offsite_time AS datetime)) < '${args.model.f_ruhu_end}'`
+            }
+            if(args.model.f_last_check_state && Util.isEmpty(args.model.f_ruhu_end) && (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end))) {
+              this.$showMessage("选择安检状态时，需要选择安检时间区间！")
+              return
+            }
+            if(args.model.f_last_check_state && Util.isEmpty(args.model.f_ruhu_end)) {
+              this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
+              if (args.model.f_last_check_state == '未检') {
+                args.condition += ' and  tcp.ruhu is null '
+              } else if (args.model.f_last_check_state == '入户') {
+                args.condition += ` and tcp.ruhu > 0`
+              } else if (args.model.f_last_check_state == '拒检') {
+                args.condition += ` and tcp.jujian > 0 and tcp.ruhu = 0 and tcp.daofang = 0 `
+              } else if (args.model.f_last_check_state == '到访不遇') {
+                args.condition += ` and tcp.daofang > 0 and tcp.ruhu = 0 and tcp.jujian = 0 `
               }
+            }else{
+              //无条件
+              this.model.SafeCheckSX = ` 1 != 1 `
             }
-            //(ua.f_residential_area is not null or ua.f_residential_area !='')
-            // (ua.f_residential_area is null or ua.f_residential_area ='')
+            args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
             if (args.model.f_residential_area == "无名称"){
               args.condition +=" and (ua.f_residential_area is null or ua.f_residential_area ='')"
             }else if (args.model.f_residential_area == "有名称"){
               args.condition +=" and (ua.f_residential_area is not null and ua.f_residential_area !='')"
             }
             console.log('查询条件',args)
-            /*if(args.model.f_hasHousehold=='已入户'){
-              args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
-            }else if(args.model.f_hasHousehold=='未入户'){
-              args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
-            }*/
             if(args.model.checkBook){
-             /* let arr=args.model.checkBook.split('-')
-              if(arr[1] == '用户'){
-                args.condition +=` and ua.f_check_book_id=${arr[0]}`
-              }else{
-                args.condition +=` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
-              }*/
               let uas = []
               let areas = []
               for (let item of args.model.checkBook) {
@@ -680,6 +615,7 @@
                       f_filialeid:this.userlogin.orgid,
                       f_subscribe_date:'',
                       condition:this.model.condition,
+                      SafeCheckSX: this.model.SafeCheckSX,
                       switchCheckAll:true,
                       checkAll:this.checkAll,
                       param:this.checkes,

package/src/filiale/weinan/pc.js

@@ -3,6 +3,7 @@ import Vue from "vue";
 
 let specialComp = {
   'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
+  'device-change': (resolve) => { require(['./pc/DeviceChange'], resolve) },
   'check-noplan': (resolve) => {require(['./pc/CheckNoPlan'], resolve)},
   'select-check-noplan': (resolve) => { require(['./pc/SelectCheckNoPlan'], resolve) },
    'print-material-bill-noplan': (resolve) => { require(['./pc/PrintMaterialBillNoplan'], resolve)},

package/src/filiale/wuan/android/SafecheckOrderV.vue

@@ -1375,8 +1375,10 @@ export default {
         if(HostApp.__this__.role == 'inspect'
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
+          if (!this.data.f_onsite_time){
+            HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
+          }
           //tag
-          HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
           HostApp.__this__.tick()
         }
       }
@@ -1556,6 +1558,7 @@ export default {
       this.$set('data.f_state',this.item.f_state)
       //tag
       // 用户信息
+      this.$set('data.f_contract_id', this.item.f_plan_meters[0].f_contract_id)
       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_userinfoid', this.item.f_userinfoid)
@@ -2235,3 +2238,4 @@ export default {
   padding: 13px 16px;
 }
 </style>
+

package/src/filiale/wuan/android/SafecheckUserInfo.vue

@@ -13,6 +13,10 @@
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_user_name }}</p>
         </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>合同编号:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_contract_id}}</p>
+        </div>
         <div class="col-xs-12" style="padding: 2px 0">
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户类型:</b></p>
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_check_type }}
@@ -240,9 +244,6 @@ export default {
         }
       }
     }
-    for (let i in this.userinfo) {
-      //tag + '：' + JSON.stringify(this.userinfo[i]))
-    }
     this.safecheckStateReady()
   },
   methods: {
@@ -409,7 +410,9 @@ export default {
     start() {
       this.$parent.$parent.isStrat = true
       this.$set('action', !this.action)
-      this.$set('f_onsite_time', Util.toStandardTimeString())
+      if (!this.f_onsite_time){
+        this.$set('f_onsite_time', Util.toStandardTimeString())
+      }
     },
     safecheckStateReady() {
       //tag
@@ -441,7 +444,9 @@ export default {
       //tag
       if (this.f_onsite_time) {
         this.$parent.$parent.isStrat = true
-        this.$parent.$parent.data.f_onsite_time = Util.toStandardTimeString()
+        if (!this.$parent.$parent.data.f_onsite_time){
+          this.$parent.$parent.data.f_onsite_time = this.f_onsite_time
+        }
       }
       if (this.$parent.$parent.role == 'repair') {
         this.$set('style__', 'divmask')