safecheck-client 3.0.33-2 → 3.0.33-22

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

@@ -246,8 +246,8 @@
                     >
                     </v-select>
                   </div>
-                  <!--<div class="form-group col-sm-4" >
-                    <label class="font_normal_body">入户情况:</label>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检筛选:</label>
                     <v-select
                       class="select select_list"
                       :value.sync="model.f_hasHousehold"
@@ -259,7 +259,7 @@
                       value-single
                     >
                     </v-select>
-                  </div>-->
+                  </div>
 
                 </div>
               </div>
@@ -358,7 +358,7 @@
             gasproperties:[],//用气性质
             meter_classifys:[],//气表类型
             entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
-            hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
+            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"}],
             sliceArea:[],
             meterbooks:[],
@@ -399,11 +399,11 @@
           selfSearch (args) {
             //tag)
             args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
-            /*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='入户'`
+            if(args.model.f_hasHousehold=='入户'){
+              args.condition +=` 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,'未入户')!='入户')`
-            }*/
+              args.condition +=` and (ua.F_LAST_CHECK_STATE !='入户' or ua.F_LAST_CHECK_STATE is null)`
+            }
             if(this.uploadCodeCondition){
               args.condition +=` and ${this.uploadCodeCondition}`
             }

package/src/filiale/wensu/pc.js

@@ -1,20 +1,20 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
-  'plan-manage': (resolve) => { require(['./pc/PlanManage'], resolve) },
-  'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
-  'check-detail': (resolve) => { require(['./pc/CheckDetail'], resolve) },
-  'print-material-bill': (resolve) => { require(['./pc/PrintMaterialBill'], resolve) },
-  'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
-  'defect-main-new2': (resolve) => {require(['./pc/DefectMainNew'], resolve)},
-  'role-selector-safe': (resolve) => {require(['./pc/RoleSelector'], resolve)},
-  'new-check-paper': (resolve) => {require(['./pc/NewCheckpaper'], resolve)}
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
+  'plan-manage': (resolve) => { require(['./pc/PlanManage'], resolve) },
+  'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
+  'check-detail': (resolve) => { require(['./pc/CheckDetail'], resolve) },
+  'print-material-bill': (resolve) => { require(['./pc/PrintMaterialBill'], resolve) },
+  'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
+  'defect-main-new2': (resolve) => {require(['./pc/DefectMainNew'], resolve)},
+  'role-selector-safe': (resolve) => {require(['./pc/RoleSelector'], resolve)},
+  'new-check-paper': (resolve) => {require(['./pc/NewCheckpaper'], resolve)}
+}
+exports.specialComp = specialComp
+
+
+
+

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

@@ -63,7 +63,7 @@
           <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_ht_date }}</p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
-          <p class="panel-title col-xs-5 text-left font" style="width: 36%;float: left"><b>上期保费截至日期:</b></p>
+          <p class="panel-title col-xs-5 text-left font" style="width: 36%;float: left"><b>保费截至日期:</b></p>
           <p class="panel-title text-left input-font" style="width: 100%">{{ userinfo.f_ins_stop_date }}</p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0">