safecheck-client 3.0.34-51 → 3.0.34-53

package/src/filiale/siyang/pc.js

@@ -1,21 +1,21 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'plan-manage':(resolve) => { require(['./pc/PlanManage'], resolve) },
-  'check-search-user':(resolve) => { require(['./pc/CheckSearchUser'], resolve) },
-  'check-plan-list':(resolve) => { require(['./pc/checkPlanList'], resolve) },
-  'check-plan-area-list':(resolve) => { require(['./pc/CheckPlanAreaList'], resolve) },
-  'hiddensituation':(resolve) => { require(['./pc/HiddenSituation'], resolve) },
-  'check-book-search-area':(resolve) => { require(['./pc/CheckBookSearchArea'], resolve) },
-  'paper-main':(resolve) => { require(['./pc/PaperList'], resolve) },
-  'new-check-paper':(resolve) => {require(['./pc/NewCheckpaper'], resolve)},
-  'check-user-list':(resolve) => { require(['./pc/checkUserList'], resolve) },
-  'paper-defect-main':(resolve) => { require(['./pc/PaperDefectMain'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'plan-manage':(resolve) => { require(['./pc/PlanManage'], resolve) },
+  'check-search-user':(resolve) => { require(['./pc/CheckSearchUser'], resolve) },
+  'check-plan-list':(resolve) => { require(['./pc/checkPlanList'], resolve) },
+  'check-plan-area-list':(resolve) => { require(['./pc/CheckPlanAreaList'], resolve) },
+  'hiddensituation':(resolve) => { require(['./pc/HiddenSituation'], resolve) },
+  'check-book-search-area':(resolve) => { require(['./pc/CheckBookSearchArea'], resolve) },
+  'paper-main':(resolve) => { require(['./pc/PaperList'], resolve) },
+  'new-check-paper':(resolve) => {require(['./pc/NewCheckpaper'], resolve)},
+  'check-user-list':(resolve) => { require(['./pc/checkUserList'], resolve) },
+  'paper-defect-main':(resolve) => { require(['./pc/PaperDefectMain'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

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

@@ -133,6 +133,18 @@
                       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>
 
                 </div>
               </div>
@@ -419,12 +431,15 @@ export default {
       this.excelUserCondtion=true
     },
     selfSearch (args) {
-      if(args.model.f_last_check_state.length > 0) {
+      if(args.model.f_last_check_state.length == 1 && args.model.f_last_check_state[0] == '入户' && 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.length > 0 && 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.length > 0 && Util.isEmpty(args.model.f_ruhu_end)) {
         let zzcon = ''
-        if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
-          this.$showMessage("选择安检状态时，需要选择安检时间区间！")
-          return
-        }
         this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         for (let i = 0; i < args.model.f_last_check_state.length; i++) {
           if (args.model.f_last_check_state[i] == '未检') {

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

@@ -220,42 +220,42 @@ methods:{
                 //
                 if( this.f_state){
                     if(this.f_state=='入户'){
-                        args.condition=args.condition+" and i.f_state='已检' and f_last_check_state='入户'"
+                        args.condition=args.condition+" and i.f_state='已检' and i.f_last_check_state='入户'"
                     }else if(this.f_state=='未入户'){
                         if(this.f_noruhu && this.f_noruhu.length==1){
                           if(this.f_noruhu[0]=='复访不遇'){
-                            args.condition += "and i.f_state='已检' and f_last_check_state='到访不遇' and f_check_version > 1 "
+                            args.condition += "and i.f_state='已检' and i.f_last_check_state='到访不遇' and i.f_check_version > 1 "
                           }else{
-                            args.condition += this.f_noruhu[0]=='未检'?" and i.f_state='未检'":` and i.f_state='已检' and f_last_check_state='${this.f_noruhu[0]}'`
+                            args.condition += this.f_noruhu[0]=='未检'?" and i.f_state='未检'":` and i.f_state='已检' and i.f_last_check_state='${this.f_noruhu[0]}'`
                           }
                         }else if(this.f_noruhu && this.f_noruhu.length==2){
                             if(this.f_noruhu.indexOf('未检')!=-1){
                               //
                                 if(this.f_noruhu.indexOf('到访不遇')!=-1){
-                                    args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state='到访不遇'))"
+                                    args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and i.f_last_check_state='到访不遇'))"
                                 }else if(this.f_noruhu.indexOf('复访不遇')!=-1) {
-                                  args.condition=args.condition +  " and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state = '到访不遇' AND f_check_version >2))"
+                                  args.condition=args.condition +  " and (i.f_state='未检' or (i.f_state='已检' and i.f_last_check_state = '到访不遇' AND i.f_check_version >2))"
                                 }else{
-                                    args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state='拒检'))"
+                                    args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and i.f_last_check_state='拒检'))"
                                   }
 
                             }else{
                               if(this.f_noruhu.indexOf('复访不遇')!=-1){
                                    if(this.f_noruhu.indexOf('到访不遇')!=-1){
-                                     args.condition=args.condition + "  and (i.f_state='已检' and (f_last_check_state='到访不遇'))"
+                                     args.condition=args.condition + "  and (i.f_state='已检' and (i.f_last_check_state='到访不遇'))"
                                    }else{
-                                     args.condition=args.condition + " and i.f_state='已检' and ((f_last_check_state='到访不遇' and  f_check_version >2) or f_last_check_state='拒检' )"
+                                     args.condition=args.condition + " and i.f_state='已检' and ((i.f_last_check_state='到访不遇' and  f_check_version >2) or i.f_last_check_state='拒检' )"
                                    }
                               }else{
-                                args.condition=args.condition+" and (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检'))"
+                                args.condition=args.condition+" and (i.f_state='已检' and (i.f_last_check_state='到访不遇' or i.f_last_check_state='拒检'))"
                               }
                             }
                         }else{
                           if(this.f_noruhu.indexOf('未检')!=-1){
-                            args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检')))"
+                            args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and (i.f_last_check_state='到访不遇' or i.f_last_check_state='拒检')))"
                           }
                            else{
-                            args.condition=args.condition+" and (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检'))"
+                            args.condition=args.condition+" and (i.f_state='已检' and (i.f_last_check_state='到访不遇' or i.f_last_check_state='拒检'))"
                           }
                         }
 

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

@@ -187,6 +187,18 @@
                       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>
 
                 </div>
               </div>
@@ -387,11 +399,14 @@
             this.excelUserCondtion=true
           },
           selfSearch (args) {
-            if(args.model.f_last_check_state) {
-              if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
-                this.$showMessage("选择安检状态时，需要选择安检时间区间！")
-                return
-              }
+            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 '

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('siyang')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('bayan')
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})