safecheck-client 3.0.34-1 → 3.0.34-100

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

@@ -1082,7 +1082,7 @@ export default {
         let msg = ''
         for (let a = 0; a < checkResults.data.length; a++) {
           for (let datumKey in checkResults.data[a]) {
-            msg += datumKey + ':' + checkResults.data[a][datumKey] + ';'
+            msg += datumKey + ','
           }
         }
         this.data.f_defect_text = msg
@@ -1664,7 +1664,11 @@ export default {
             if(this.data.f_safecheck_type=='复检') {
               codata.f_is_fujian = '已复检'
             }
-            this.showModal3 = true
+            if(codata.f_defect_content.includes('正常')){
+              this.quotaSave('延期生效')
+            }else {
+              this.showModal3 = true
+            }
             $("#savebut").removeClass("noclickbut");
           } else {
             this.$showMessage('保存成功！')

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

@@ -56,6 +56,10 @@
             </div>
             <div class="form-group col-sm-4" >
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
+              <export-excel-safe :data="$parent.$parent.searchData"
+                                 :field="$parent.$parent.excelHeaders"
+                                 :choose-col="true"
+                                 sqlurl="rs/logic/SafeExportExcel" sql-name="FetchUserFileByOrgNoRuHuSXQ" template-name='安检筛选用户信息导出'></export-excel-safe>
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.createAndSend()">下发</button>
             </div>
@@ -111,7 +115,7 @@
                       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">
@@ -123,12 +127,24 @@
                       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">
                     </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>
@@ -269,7 +285,31 @@ import {toStandardDateString} from "../../../components/Util";
 export default {
   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 {
+      searchData: {
+        condition: "1=1",
+        orderitem: "f_residential_area,f_building,f_unit,f_floor,f_room",
+        SafeCheckSX:""
+      },
+      excelHeaders: {
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户姓名',
+        'f_user_type': '用户类型',
+        'f_residential_area': '小区名称',
+        'f_last_check_date': '最后一次安检日期',
+        'f_last_check_state': '最后一次安检状态',
+        'f_address': '详细地址'
+      },
+      model: model,
       createPlan:{
         f_safecheck_type:"年度普检",
         checker:"",
@@ -285,14 +325,6 @@ export default {
       yearList:[{label:"2020",value:"2020"},{label:"2021",value:"2021"},{label:"2022",value:"2022"},{label:"2023",value:"2023"},{label:"2024",value:"2024"},{label:"2025",value:"2025"},{label:"2026",value:"2026"},{label:"2027",value:"2027"},{label:"2028",value:"2028"},{label:"2029",value:"2029"},{label:"2030",value:"2030"}],
       monthList:[{label:"1",value:"1"},{label:"2",value:"2"},{label:"3",value:"3"},{label:"4",value:"4"},{label:"5",value:"5"},{label:"6",value:"6"},{label:"7",value:"7"},{label:"8",value:"8"},{label:"9",value:"9"},{label:"10",value:"10"},{label:"11",value:"11"},{label:"12",value:"12"}],
       showCreatePlan:false,
-      model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
-        "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":"''"}),
       a:'1',
       opt:[{label:"测试",value:"测试"}],
       showCondtion:false,
@@ -357,6 +389,7 @@ export default {
           f_filialeid:this.userlogin.orgid,
           f_subscribe_date:'',
           condition:this.model.condition,
+          SafeCheckSX: this.model.SafeCheckSX,
           switchCheckAll:true,
           checkAll:this.checkAll,
           param:this.checkes,
@@ -398,66 +431,45 @@ export default {
       this.excelUserCondtion=true
     },
     selfSearch (args) {
-      console.log(this.bookrow,"6666")
-      //tag)
-      // 判断时间和状态匹配条件
-      let f_last_check_state = ''
-
-      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
-        }
-        for(let i = 0;i<args.model.f_last_check_state.length;i++){
-          if(args.model.f_last_check_state[i] == '未检'){
-            let lscon = args.model.f_check_start ? ` or ui.f_last_check_date <= '${args.model.f_check_start} 00:00:00'` :''
-            lscon += lscon ? (args.model.f_check_end ? ` or ui.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :''): (args.model.f_check_end ? `ui.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :'')
-            if(i == args.model.f_last_check_state.length-1){
-              zzcon += `( ui.f_last_check_state is null or ua.f_last_check_state =''   ${lscon} ) `
-            }else{
-              zzcon += `( ui.f_last_check_state is null or ua.f_last_check_state =''  ${lscon} ) or `
+        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] == '未检') {
+            zzcon += ' tcp.ruhu is null '
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
             }
-          } else{
-            let lscon = args.model.f_check_start ? ` and ui.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-            lscon += lscon ? (args.model.f_check_end ? ` and ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-            if(i == args.model.f_last_check_state.length-1){
-              zzcon += `(ui.f_last_check_state = '${args.model.f_last_check_state[i]}' ${lscon} ) `
-            }else{
-              zzcon += `(ui.f_last_check_state = '${args.model.f_last_check_state[i]}' ${lscon} ) or `
+          } else if (args.model.f_last_check_state[i] == '入户') {
+            zzcon += `tcp.ruhu > 0`
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
+            }
+          } else if (args.model.f_last_check_state[i] == '拒检') {
+            zzcon += `(tcp.jujian > 0 and tcp.ruhu = 0 and tcp.daofang >= 0) `
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
+            }
+          } else if (args.model.f_last_check_state[i] == '到访不遇') {
+            zzcon += `(tcp.daofang > 0 and tcp.ruhu = 0 and tcp.jujian = 0) `
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
             }
           }
         }
         args.condition += `and ( ${zzcon} )`
-      }else if(args.model.f_last_check_state.length == 0 && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )){
-        let lscon = args.model.f_check_start ? ` and ui.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-        lscon += lscon ? (args.model.f_check_end ? ` and ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-        args.condition += lscon
       }else{
-        console.log('这块无条件')
+        //无条件
+        this.model.SafeCheckSX = ` 1 != 1 `
       }
-
-      // if (!Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )){
-      //   if (args.model.f_last_check_state == '未检'){
-      //     var lscon = args.model.f_check_start ? ` or ua.f_last_check_date <= '${args.model.f_check_start} 00:00:00'` :''
-      //     lscon += lscon ? (args.model.f_check_end ? ` or ua.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :''): (args.model.f_check_end ? `ua.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :'')
-      //     args.condition +=`and (ua.f_last_check_state is null or ua.f_last_check_state =''  ${lscon} ) `
-      //   }else  {
-      //     var lscon = args.model.f_check_start ? ` and ua.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-      //     lscon += lscon ? (args.model.f_check_end ? ` and ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-      //     args.condition += `and ua.f_last_check_state = '${args.model.f_last_check_state}' ${lscon}`
-      //   }
-      //
-      // }else if (Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )) {
-      //   var lscon = args.model.f_check_start ? ` and ua.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-      //   lscon += lscon ? (args.model.f_check_end ? ` and ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-      //   args.condition += lscon
-      // }else if (!Util.isEmpty(args.model.f_last_check_state) && Util.isEmpty(args.model.f_check_start) && Util.isEmpty(args.model.f_check_end)){
-      //   this.$showMessage("选择安检状态时，需要选择安检时间区间！")
-      //   return
-      // }else{
-      //   console.log('这块无条件')
-      // }
+      this.searchData.SafeCheckSX =  this.model.SafeCheckSX
       let condition1=`(ui.f_last_check_date is null or ui.f_last_check_date ='')`
       let arge = args.condition.replace('从未安检',condition1)
       args.condition = arge
@@ -517,6 +529,7 @@ export default {
       this.cancel()
       this.checkes=[]
       this.checkAll=false
+      this.searchData.condition = args.condition
       this.model.search(args.condition, args.model, args.condValue)
     },
     showUserCondition(){

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/DefectPaperNew.vue

@@ -175,6 +175,18 @@
                         :multiple="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">是否限购</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :options='$parent.$parent.isOrNo'
+                        v-model='model.f_is_black'
+                        :value.sync="model.f_is_black"
+                        placeholder='是否限购'
+                        condition="f_is_black = '{}'"
+                        :multiple="false">
+              </v-select>
+            </div>
           </div>
           <div class="row" v-show="$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style">
@@ -329,6 +341,18 @@
                         placeholder='隐患类型'
                         :multiple="true">
               </v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">是否限购</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :options='$parent.$parent.isOrNo'
+                        v-model='model.f_is_black'
+                        :value.sync="model.f_is_black"
+                        placeholder='是否限购'
+                        condition="f_is_black = '{}'"
+                        :multiple="false">
+              </v-select>
             </div>
              <div :class="$parent.$parent.style">
                           <label class="font_normal_body">维&ensp;修&ensp;员</label>
@@ -371,6 +395,7 @@
             <th><nobr>完成情况</nobr></th>
             <th><nobr>维修情况</nobr></th>
             <th><nobr>维修员</nobr></th>
+            <th><nobr>限购状态</nobr></th>
             <th><nobr>隐患明细</nobr></th>
           </tr>
         </template>
@@ -392,6 +417,7 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_is_repair}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_repaired}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_repairman}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_is_black}}</td>
           <td style="text-align: center;white-space:nowrap;">{{ $parent.$parent.$parent.trouble(row.f_defect_content)}}</td>
         </template>
       </data-grid>
@@ -522,7 +548,9 @@ export default {
       checker_name:'',
       defectType:[],
       defectLeave:'',
+      is_black:'',
       defectLeaveList:[{label:'全部',value:''},{label:'重大',value:'重大'},{label:'一般',value:'一般'}],
+      isOrNo:[{label:'全部',value:''},{label:'是',value:'是'},{label:'否',value:'否'}],
       repaired:[{label: '全部', value: ''},{label: '未完成', value: '未完成'}, {label: '已完成', value: '已完成'}],
       deals:[{label: '全部', value: ''},{label: '未处理', value: '未处理'}, {label: '已处理', value: '已处理'}],
       f: this.$login.f,
@@ -990,6 +1018,9 @@ export default {
           }
         }
         args.condition += ` )`
+      }
+      if (this.is_black){
+
       }
       this.model.search(args.condition, args.model)
       console.log('zzz',args.condition)