safecheck-client 3.0.30-7 → 3.0.30-71

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

@@ -120,7 +120,10 @@ import {HttpResetClass} from 'vue-client'
         this.allUsers.forEach(user => {
           // if (resids.indexOf(user.orgid) != -1) {
           //   if (typeof user.name == "string"){
-              this.users.push({label: user.name, value: user.name})
+          if(user.state == '在职'){
+            this.users.push({label: user.name, value: user.name})
+          }
+
           //   }
           // }
         })

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

@@ -206,6 +206,46 @@
                     >
                     </v-select>
                   </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_start_time"
+                      v-model="model.f_start_time"
+                    >
+                    </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_end_time"
+                      v-model="model.f_end_time"
+                    >
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4">
+                    <label class="font_normal_body">安检状态:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_last_check_state"
+                      v-model="model.f_last_check_state"
+                      :options='$parent.$parent.entry_status'
+                      placeholder='请选择'
+                      :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
@@ -317,6 +357,7 @@
             userStates:[],//用户状态
             gasproperties:[],//用气性质
             meter_classifys:[],//气表类型
+            entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{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:[],
@@ -366,6 +407,15 @@
             if(this.uploadCodeCondition){
               args.condition +=` and ${this.uploadCodeCondition}`
             }
+            if(args.model.f_last_check_state){
+              args.condition += ` and ua.f_last_check_state  = '${args.model.f_last_check_state}'`
+            }
+            if(args.model.f_start_time){
+              args.condition += ` and ua.f_last_check_date >='${args.model.f_start_time} 00:00:00' `
+            }
+            if(args.model.f_end_time){
+              args.condition += ` and ua.f_last_check_date <='${args.model.f_end_time} 23:59:59' `
+            }
             this.cancel()
             this.checkes=[]
             this.checkAll=false

package/src/filiale/wensu/pc.js

@@ -9,7 +9,8 @@ let specialComp = {
   '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)}
+  'role-selector-safe': (resolve) => {require(['./pc/RoleSelector'], resolve)},
+  'new-check-paper': (resolve) => {require(['./pc/NewCheckpaper'], resolve)}
 }
 exports.specialComp = specialComp
 

package/src/filiale/wenxi/pc/DefectPaper.vue

@@ -362,7 +362,7 @@
         </h4>
       </div>
       <div slot="modal-body" class="modal-body">
-        <plan-chooser :f.sync="this.$login.f" v-ref:chooser></plan-chooser>
+        <plan-chooser :f.sync="$login.f" v-ref:chooser></plan-chooser>
       </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center">
         <button class="button_search" @click="ok">确认</button>