safecheck-client 4.0.2-31 → 4.0.2-33

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

@@ -20,14 +20,29 @@
               >
               </v-select>
             </div>
-            <div class="form-group col-sm-4"  v-if="$parent.$parent.f_state=='未入户'" >
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">有无计划</label>
               <v-select style="width:60% "
                         class="select select_list"
-                        :value.sync="$parent.$parent.f_noruhu"
-                        v-model="$parent.$parent.f_noruhu"
-                        :options='$parent.$parent.noChecks'
-                        placeholder='请选择状态'
-                        :multiple="true"
+                        :value.sync="$parent.$parent.f_no_checkplan"
+                        v-model="$parent.$parent.f_no_checkplan"
+                        :options='$parent.$parent.no_checkplans'
+                        placeholder='有无计划'
+                        close-on-select
+                        value-single
+              >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">入户状态</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_last_check_state"
+                        v-model="$parent.$parent.f_last_check_state"
+                        :options='$parent.$parent.entry_status'
+                        placeholder='入户状态'
+                        close-on-select
+                        value-single
               >
               </v-select>
             </div>
@@ -97,7 +112,9 @@ export default {
   data () {
     return {
       model: new PagedList('api/af-safecheck/sql/planItemNew', 20),
-      checkState:[{label:'全部',value:''},{label:'入户',value:'入户'},{label:'未入户',value:'未入户'}],
+      checkState:[{label:'全部',value:''},{label:'已检',value:'已检'},{label:'未检',value:'未检'}],
+      entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
+      no_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{label: '全部', value: ''}],
       noChecks:[{label:'未检',value:'未检'},{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'}],
       excelHeaders: {
         //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果
@@ -116,6 +133,8 @@ export default {
       },
       area:[{label:'全部',value:''}],
       f_state:'',
+      f_no_checkplan:'',
+      f_last_check_state:'',
       f_noruhu:'',
       f_residential_area:'',
       f_building:'',
@@ -163,35 +182,25 @@ export default {
         if (this.checkend){
           args.condition += `and f_last_check_date<='${this.checkend}'`
         }
-        if( this.f_state){
-          if(this.f_state=='入户'){
-            args.condition=args.condition+" and i.f_state='已检' and f_last_check_state='入户'"
-          }else if(this.f_state=='未入户'){
-            if(this.f_noruhu && this.f_noruhu.length==1){
-              args.condition += this.f_noruhu[0]=='未检'?" and i.f_state='未检'":` and i.f_state='已检' and 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='到访不遇'))"
-                }else{
-                  args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state='拒检'))"
-                }
-              }else{
-                args.condition=args.condition+" and (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检'))"
-              }
-            }else{
-              args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检')))"
-            }
-
-          }
-
-        }
         if (this.f_residential_area){
           args.condition += ` and i.f_residential_area like'%${this.f_residential_area}%'`
         }
         if (this.f_building){
           args.condition += ` and i.f_building='${this.f_building}'`
         }
+        if (this.f_state){
+          args.condition += ` and i.f_state='${this.f_state}'`
+        }
+        if (this.f_last_check_state){
+          args.condition += ` and i.f_last_check_state='${this.f_last_check_state}'`
+        }
+        if (this.f_no_checkplan){
+          if (this.f_no_checkplan == '有计划安检'){
+            args.condition += ` and i.f_plan_name != '无计划' `
+          }else {
+            args.condition += ` and i.f_plan_name = '无计划' `
+          }
+        }
         this.model.search(args.condition, args.model)
       }
     }