safecheck-client 3.0.33-13 → 3.0.33-132

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

@@ -22,13 +22,13 @@
               <v-select
                 class="select select_list"
                 :width="'95%'"
-                :value.sync="model.f_area"
-                v-model="model.f_area"
+                :value.sync="model.f_check_book_id"
+                v-model="model.f_check_book_id"
                 :options='$parent.$parent.areaList'
                 :timeout="500"
                 @select-search="$parent.$parent.select_search"
                 placeholder='安检册筛选'
-                condition="ua.f_residential_area = '{}'"
+                condition="ua.f_check_book_id ='{}'"
                 close-on-select
                 value-single
               >
@@ -81,35 +81,33 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">片&ensp;&ensp;&ensp;&ensp;区:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_book_slice_area"
-                      v-model="model.f_book_slice_area"
-                      :options='$parent.$parent.sliceArea'
-                      @change="$parent.$parent.slice_areaChange(model.f_book_slice_area)"
-                      placeholder='请选择'
-                      condition="ua.f_slice_area  ='{}'"
-                      close-on-select
-                      value-single
-                    >
+                  <div class="col-sm-3 form-group">
+                    <label class="font_normal_body">街道/乡镇</label>
+                    <v-select :value.sync="model.f_street_id" :value-single="true"
+                              :options='$parent.$parent.streetslist' placeholder='请选择'
+                              condition=" area.f_street_id = '{}'"
+                              v-model='model.f_street_id'
+                              @change="$parent.$parent.streetChange"
+                              close-on-select :search="true" >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">区/县:</label>
-                    <input type="text" class="input_search" v-model="model.f_pcd"
-                           style="width: 60%" placeholder="小区名称" condition="f_pcd like '%{}%'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">街道/乡镇:</label>
-                    <input type="text" class="input_search" v-model="model.f_street"
-                           style="width: 60%" placeholder="街道/乡镇" condition="f_street like '%{}%'">
+                  <div class="col-sm-3 form-group">
+                    <label class="font_normal_body">片区/行政村</label>
+                    <v-select :value.sync="model.f_community_id" v-model='model.f_community_id'
+                              :options='$parent.$parent.communitylist' placeholder='片区/管理站' filer-key="name"
+                              condition="ua.f_community_id = '{}'"
+                              @change="$parent.$parent.communityChange"
+                              close-on-select v-ref:slice>
+                    </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">小区名称:</label>
-                    <input type="text" class="input_search" v-model="model.f_residential_area"
-                           style="width: 60%" placeholder="小区名称" condition="f_residential_area like '%{}%'">
+                  <div  class="col-sm-3 form-group">
+                    <label class="font_normal_body">小区/自然村</label>
+                    <v-select :value.sync="model.f_residential_area_id" :value-single="true"
+                              :options='$parent.$parent.areaslist' placeholder='请选择'
+                              condition="ua.f_residential_area_id = '{}'"
+                              v-model='model.f_residential_area_id'
+                              close-on-select>
+                    </v-select>
                   </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">派发情况:</label>
@@ -381,7 +379,11 @@
         checkAll:false,
         checkes:[],
         excelUserCondtion:false,
-        uploadCodeCondition:''
+        uploadCodeCondition:'',
+        streetslist:[],
+        communitylist:[],
+        areaslist:[],
+        f_filialeids: this.$login.f.orgid,
       }
     },
     props:["selectplan","userlogin"],
@@ -394,8 +396,182 @@
       this.setConList()
       this.loadpage()
       this.getCommunity()
+      this.initpcds(` f_orgid = '${this.userlogin.orgid}'`)
+      this.initstreets(` f_orgid = '${this.userlogin.orgid}' `)
+      this.initareas(` f_orgid = '${this.userlogin.orgid}'`)
     },
     methods: {
+      // 初始化省市区,添加街道
+      async initpcds (pconditon) {
+        this.pcdslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_pcd',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_pcd,
+            value: row.id,
+            data: row,
+            id: row.id
+          }
+        })
+        this.pcdslist = redata
+        console.log("xxxxxxxxxxxxxx")
+        console.log(this.pcdslist)
+        console.log("redataxxxxxxxx")
+      },
+      // 初始化街道 添加小区
+      async initstreets (pconditon) {
+        this.streetslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_street',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_street,
+            value: row.id,
+            data: row,
+            id: row.id
+          }
+        })
+        this.streetslist = redata
+        console.log("xxxxxxxxxxxxxx")
+        console.log(this.streetslist)
+        console.log("redataxxxxxxxx")
+      },
+      // 初始化小区添加小区
+      async initareas (pconditon) {
+        // if(this.usertype){
+        //   pconditon=pconditon+` and  f_special='1' `
+        // }
+        this.areaslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_area',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row) => {
+          redata.push({
+            label: row.f_residential_area,
+            value: row.id,
+            data: row,
+            id: row.id
+          })
+        })
+        this.areaslist = redata
+      },
+      //小区变化
+      areaChange(val){
+        console.log("小区变化",val)
+        // 选择小区后级联出省市区和街道
+        let selectArea // 选中的小区数据
+        for (let row of this.areaslist) {
+          if (val == row.value) {
+            selectArea = row.data
+            break
+          }
+        }
+        if (selectArea) {
+          this.model.f_street_id = selectArea.f_street_id
+          this.model.f_pcd_id = selectArea.f_pcd_id
+          this.model.f_community_id = selectArea.f_community_id
+          console.log( this.model.f_community_id)
+
+          this.initstreets(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_street_id}' `)
+          this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
+          if(selectArea.f_community_id){
+            this.initcommunity(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_community_id}' `)
+          }
+          // this.model.f_slice_area = selectArea.f_slice_area
+          // 拼接地址
+          this.model.f_address = `${selectArea.f_street}${selectArea.f_community}${selectArea.f_residential_area}`
+          console.log( this.model.f_community_id)
+        }
+        this.$nextTick(() => {
+          this.$resetValidation()
+        })
+      },
+      // 片区变化 f_area_code
+      async areasChange (val) {
+        console.log('街道变化', val)
+        if (this.streetslist[0]) {
+          var street = ''
+          this.streetslist.forEach((item) => {
+            if (item.id === val) {
+              street = item.label
+            }
+          })
+          // this.model.f_address = street
+        }
+        if (val) {
+          // 那就把[小区]重新组织一下
+          await this.initareas(` f_area_code ='${val}' `)
+          if (this.$refs.paged.$refs.criteria.model.f_residential_area_id) {
+            if (this.findbyid(this.areaslist, this.$refs.paged.$refs.criteria.model.f_residential_area_id)) {
+              let street_id = this.findbyid(this.areaslist,this.$refs.paged.$refs.criteria.model.f_residential_area_id).f_street_id
+              if (street_id != val) {
+                this.$refs.paged.$refs.criteria.model.f_residential_area_id = ''
+              }
+            } else {
+              this.$refs.paged.$refs.criteria.model.f_residential_area_id = ''
+            }
+          }
+        }
+      },
+      //街道变化
+      //初始化街道 添加小区
+      async initcommunity(pconditon){
+        this.communitylist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_community',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_community_name,
+            value: row.id,
+            data:row,
+            id:row.id
+          }
+        })
+        this.communitylist=redata
+      },
+      async streetChange(val){
+        if(val){
+          await this.initcommunity(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
+        }
+      },
+      async  communityChange(val){
+        console.log(val)
+        if(val){
+          await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
+        }
+      },
       getCommunity(){
         this.community=[]
         new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
@@ -518,19 +694,23 @@
           value: ''
         }, ...this.$appdata.getParam('气表类型')] : [{label: '全部', value: ''}]
       },
-      select_search(text){
-        //tag
-        let pcdText=text?` and f_residential_area like '%${text}%'`:''
-        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
-          //tag)
-          if(res.data.length>0){
-            this.areaList=[]
-            this.areaList.push({label:"全部",value:""})
-            res.data.forEach((result)=>{
-              this.areaList.push({label:result.f_residential_area,value:result.f_residential_area})
-            })
+      select_search(){
+        this.areaList = []
+        new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+          data: {
+            items: 'id,f_check_book_name',
+            tablename: 't_check_book',
+            condition: `f_orgid = '${this.userlogin.orgid}'`,
+            orderitem: 'id desc'
           }
-          //tag)
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          this.areaList.push({label: '全部', value: ''})
+          res.data.forEach(ress => {
+            this.areaList.push({
+              label: ress.f_check_book_name,
+              value: ress.id
+            })
+          })
         })
       },
       //获取抄表册

package/src/filiale/hanzhong/pc/CheckHiddenDanger.vue

@@ -183,7 +183,7 @@
   //后台查询数据
   let getData = function* (self) {
     let load = new HttpResetClass()
-    load.load('POST', 'rs/sql/CheckStatusQuery', {data: {startDate:self.startDate,f_orgstr: self.orgid, endDate: self.endDate,plan_type:self.plan_type}},
+    load.load('POST', 'rs/sql/CheckStatusQuery', {data: {startDate:self.startDate,f_orgstr: self.orgid, endDate: self.endDate,plan_type:self.plan_type,f_safecheck_type:self.f_safecheck_type}},
       {resolveMsg: null, rejectMsg: null})
       .then((res) => {
       let echartData = res.data
@@ -202,7 +202,7 @@
 
     let getData1 = function* (self) {
       let Http = new HttpResetClass()
-      Http.load('POST','rs/sql/HiddenLevel', {data: {startDate:self.startDate,f_orgstr: self.orgid, endDate: self.endDate,plan_type:self.plan_type}},
+      Http.load('POST','rs/sql/HiddenLevel', {data: {startDate:self.startDate,f_orgstr: self.orgid, endDate: self.endDate,plan_type:self.plan_type,f_safecheck_type:self.f_safecheck_type}},
         {resolveMsg: null, rejectMsg: null})
         .then((res) => {
         let legendname = []    //分类名,横坐标分类,隐患级别
@@ -259,7 +259,8 @@
         endDate: Util.toStandardDateString(),
         xc: '',
         plan_types:[{label:'全部',value:''},{label:'年度安检单',value:'false'},{label:'首次通气单',value:'true'}],
-        plan_type:''
+        plan_type:'',
+        f_safecheck_type:''
       }
     },
     props:{
@@ -304,19 +305,21 @@
         this.$emit('echarts-changed', this.echarts)
       },
       setstatustable() {
-        this.model = new PagedList('rs/sql/QueryCheckStatus', 20, {startDate: 'this.startDate',endDate: 'this.endDate', orgid: 'this.orgid',plan_type:'this.plan_type'},{rh:'',dfby:'',wsy:'',jj:''})
+        this.model = new PagedList('rs/sql/QueryCheckStatus', 20, {startDate: 'this.startDate',endDate: 'this.endDate', orgid: 'this.orgid',plan_type:'this.plan_type',f_safecheck_type: 'this.f_safecheck_type'},{rh:'',dfby:'',wsy:'',jj:''})
         this.model.startDate = this.startDate
         this.model.endDate = this.endDate
         this.model.orgid = this.orgid
         this.model.plan_type = this.plan_type
+        this.model.f_safecheck_type = this.f_safecheck_type
         this.model.search('1=1')
       },
       setleveltable() {
-        this.model1 = new PagedList('rs/sql/QueryHiddenLevel', 20, {startDate: 'this.startDate',endDate: 'this.endDate', orgid: 'this.orgid',plan_type:'this.plan_type'},{a:'',b:'',c:'',ac:'',bc:'',cc:''})
+        this.model1 = new PagedList('rs/sql/QueryHiddenLevel', 20, {startDate: 'this.startDate',endDate: 'this.endDate', orgid: 'this.orgid',plan_type:'this.plan_type',f_safecheck_type: 'this.f_safecheck_type'},{a:'',b:'',c:'',ac:'',bc:'',cc:''})
         this.model1.startDate = this.startDate
         this.model1.endDate = this.endDate
         this.model1.orgid = this.orgid
         this.model1.plan_type = this.plan_type
+        this.model1.f_safecheck_type = this.f_safecheck_type
         this.model1.search('1=1')
       },
       //隐患饼状图
@@ -575,6 +578,13 @@
       },
       'plan_type' (val) {
         console.log("我是watch")
+        this.f_safecheck_type = ''
+        if (this.plan_type == 'false') {
+          this.f_safecheck_type = '年度普检'
+        }
+        if (this.plan_type == 'true') {
+          this.f_safecheck_type = '首次通气'
+        }
         this.searchdata()
         this.searchdata1()
       },

package/src/filiale/hanzhong/pc/CheckSafeDetail.vue

@@ -149,7 +149,7 @@ let getData = function* (self) {
   console.log('self.plan_type', self.plan_type)
   console.log('self.orgid', self.orgid)
   self.set()
-  load.load('POST', 'rs/sql/YearCountRate', {data: {year: self.year, orgid: self.orgid, plan_type: self.plan_type}},
+  load.load('POST', 'rs/sql/YearCountRate', {data: {year: self.year, orgid: self.orgid, plan_type: self.plan_type,f_safecheck_type:self.f_safecheck_type}},
     {resolveMsg: null, rejectMsg: null})
     .then((res) => {
       let legendname = []
@@ -222,6 +222,7 @@ export default {
       // orgid:'2586252.6314787',
       year: (new Date()).getFullYear(),
       plan_type: '',
+      f_safecheck_type:'',
       xc: '',
       plan_types: [{label: '全部', value: ''}, {label: '年度安检单', value: 'false'}, {label: '首次通气单', value: 'true'}]
     }
@@ -271,11 +272,13 @@ export default {
       this.model = new PagedList('rs/sql/YearCountRate', 20, {
         year: 'this.year',
         orgid: 'this.orgid',
-        plan_type: 'this.plan_type'
+        plan_type: 'this.plan_type',
+        f_safecheck_type: 'this.f_safecheck_type'
       })
       this.model.year = this.year
       this.model.orgid = this.orgid
       this.model.plan_type = this.plan_type
+      this.model.f_safecheck_type = this.f_safecheck_type
       this.model.search('1=1')
     },
     set(legendname, zongliangArray, yijianArray) {
@@ -435,6 +438,13 @@ export default {
     },
     'plan_type'(val) {
       console.log("我是plan_type")
+      this.f_safecheck_type = ''
+      if (this.plan_type == 'false') {
+        this.f_safecheck_type = '年度普检'
+      }
+      if (this.plan_type == 'true') {
+        this.f_safecheck_type = '首次通气'
+      }
       this.searchdata()
     },
     'f_filialeids'(){

package/src/filiale/hanzhong/pc/CheckSafeStatus.vue

@@ -92,7 +92,7 @@
   let getData = function * (self) {
     let load = new HttpResetClass()
     self.set()
-    load.load('POST','rs/sql/CheckComplete', {data: {year:self.year,orgid:self.orgid,plan_type:self.plan_type}},
+    load.load('POST','rs/sql/CheckComplete', {data: {year:self.year,orgid:self.orgid,plan_type:self.plan_type,f_safecheck_type:self.f_safecheck_type}},
       {resolveMsg: null, rejectMsg: null})
       .then((res) => {
       let legendname = []
@@ -158,7 +158,8 @@
         year:(new Date()).getFullYear(),
         xc: '',
         plan_types:[{label:'全部',value:''},{label:'年度安检单',value:'false'},{label:'首次通气单',value:'true'}],
-        plan_type:''
+        plan_type:'',
+        f_safecheck_type:''
       }
     },
     props:{
@@ -203,10 +204,11 @@
         this.$emit('echarts-changed', this.echarts)
       },
       settable() {
-        this.model= new PagedList('rs/sql/CheckComplete',20, {year:'this.year',orgid:'this.orgid',plan_type:'this.plan_type'})
+        this.model= new PagedList('rs/sql/CheckComplete',20, {year:'this.year',orgid:'this.orgid',plan_type:'this.plan_type',f_safecheck_type: 'this.f_safecheck_type'})
         this.model.year = this.year
         this.model.orgid = this.orgid
         this.model.plan_type = this.plan_type
+        this.model.f_safecheck_type = this.f_safecheck_type
         this.model.search('1=1')
       },
       set(scaledata,legendname,zongliangArray,yijianArray) {
@@ -370,6 +372,13 @@
         this.searchdata()
       },
       'plan_type' (val) {
+        this.f_safecheck_type = ''
+        if (this.plan_type == 'false') {
+          this.f_safecheck_type = '年度普检'
+        }
+        if (this.plan_type == 'true') {
+          this.f_safecheck_type = '首次通气'
+        }
         console.log("我是plan_type")
         this.searchdata()
       },

package/src/filiale/hanzhong/pc/CheckSearchUser.vue

@@ -218,6 +218,18 @@
                         :options='$parent.$parent.entry_status'
               ></v-select>
             </div>
+            <div :class="$parent.$parent.style"  v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">计划类型</label>
+              <v-select class="select_list select"
+                        placeholder='请选择'
+                        :value.sync="model.f_safe_type" v-model="model.f_safe_type"
+                        :options='$parent.$parent.safe_types'
+                        filer-key="name"
+                        condition="f_safe_type = '{}'"
+                        close-on-select clear-button
+                        :value-single="true">
+              </v-select>
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -520,6 +532,7 @@ export default {
         f_defect_content: 'this.f_defect_content'
       }),
       entry_status:[{label: '入户', value: '入户'}, {label: '拒检', value: '拒检'}, {label: '到访不遇', value: '到访不遇'}],
+      safe_types:this.$appdata.getParam('计划类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('计划类型')]:[{label: '全部', value: ''}],
       f_defect_content:"CASE WHEN CHARINDEX( '\"result\":\"正常\"', tp.f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( tp.f_defect_content, len( tp.f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END",
       orgstrs: [{label: '全部', value: ''}],
       checkersid: [],

package/src/filiale/hanzhong/pc/CheckUserList.vue

@@ -221,7 +221,7 @@
                       :show-rest-button="reset"
                       :value.sync="model.f_start_time"
                       v-model="model.f_start_time"
-                      condition="ui.f_last_check_date >='{} 00:00:00'">
+
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
@@ -234,7 +234,7 @@
                       :show-rest-button="reset"
                       :value.sync="model.f_end_time"
                       v-model="model.f_end_time"
-                      condition="ui.f_last_check_date  <='{} 23:59:59'">
+
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4">
@@ -246,7 +246,6 @@
                       v-model="model.f_last_check_state"
                       :options='$parent.$parent.entry_status'
                       placeholder='请选择'
-                      condition="ui.f_last_check_state  = '{}'"
                       :search="false"
                       close-on-select
                       value-single
@@ -485,13 +484,7 @@
         this.excelUserCondtion=true
       },
       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='入户'`
-        }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,'未入户')!='入户')`
-        }*/
         if(args.model.checkBook){
           let arr=args.model.checkBook.split('-')
           if(arr[1] == '用户'){
@@ -500,8 +493,34 @@
             args.condition +=` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
           }
         }
-        if (args.model.f_last_check_state == '未检'){
-          args.condition = args.condition.replace("ui.f_last_check_state  = '未检'"," ui.f_last_check_state is null or ui.f_last_check_date is null ")
+        // if (args.model.f_last_check_state == '未检'){
+        //   args.condition += ` and ui.f_last_check_date <='${args.model.f_start_time}' or ui.f_last_check_date  >='${args.model.f_start_time}' and ( ui.f_last_check_date is null or ui.f_last_check_state is null or ui.f_last_check_date ='' ) `
+        // }else if(args.model.f_last_check_state == '') {
+        //   args.model.f_start_time ==''?
+        //   args.condition +=`  and ui.f_last_check_date >='${args.model.f_start_time}' and ui.f_last_check_date  <='${args.model.f_start_time}' `
+        // }else {
+        //   args.condition +=` and ui.f_last_check_state = ${args.model.f_last_check_state?args.model.f_last_check_state:''} and ui.f_last_check_date >='${args.model.f_start_time}' and ui.f_last_check_date  <='${args.model.f_start_time}' `
+        // }
+        if (!Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_start_time) || !Util.isEmpty(args.model.f_end_time) )){
+          if (args.model.f_last_check_state == '未检'){
+            var lscon = args.model.f_start_time ? ` or ui.f_last_check_date <= '${args.model.f_start_time} 00:00:00'` :''
+            lscon += lscon ? (args.model.f_end_time ? ` or ui.f_last_check_date >= '${args.model.f_end_time} 23:59:59'` :''): (args.model.f_end_time ? `ui.f_last_check_date >= '${args.model.f_end_time} 23:59:59'` :'')
+            args.condition +=`and (ui.f_last_check_state is null or ui.f_last_check_state =''  ${lscon} ) `
+          }else  {
+            var lscon = args.model.f_start_time ? ` and ui.f_last_check_date >= '${args.model.f_start_time} 00:00:00'` :''
+            lscon += lscon ? (args.model.f_end_time ? ` and ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'') : (args.model.f_end_time ? ` ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'')
+            args.condition += `and ui.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_start_time) || !Util.isEmpty(args.model.f_end_time) )) {
+          var lscon = args.model.f_start_time ? ` and ui.f_last_check_date >= '${args.model.f_start_time} 00:00:00'` :''
+          lscon += lscon ? (args.model.f_end_time ? ` and ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'') : (args.model.f_end_time ? ` ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'')
+          args.condition += lscon
+        }else if (!Util.isEmpty(args.model.f_last_check_state) && Util.isEmpty(args.model.f_start_time) && Util.isEmpty(args.model.f_end_time)){
+          this.$showMessage("选择安检状态时，需要选择安检时间区间！")
+          return
+        }else{
+          console.log('这块无条件')
         }
         if(this.uploadCodeCondition){
           args.condition +=` and ${this.uploadCodeCondition}`

package/src/filiale/hanzhong/pc/CheckerSafeDetail.vue

@@ -129,7 +129,7 @@
     console.log('self.plan_type',self.plan_type)
     console.log('self.orgid',self.orgid)
     self.set()
-    load.load('POST','rs/sql/YearCheckerCountRate', {data: {orgid:self.orgid,plan_type:self.plan_type,f_start_time:self.f_start_time,f_end_time:self.f_end_time}},
+    load.load('POST','rs/sql/YearCheckerCountRate', {data: {orgid:self.orgid,plan_type:self.plan_type,f_start_time:self.f_start_time,f_end_time:self.f_end_time,f_safecheck_type:self.f_safecheck_type}},
       {resolveMsg: null, rejectMsg: null})
       .then((res) => {
         let checkerArrray = []
@@ -202,6 +202,7 @@
         // orgid:'2586252.6314787',
         year:(new Date()).getFullYear(),
         plan_type:'',
+        f_safecheck_type:'',
         f_start_time:'',
         f_end_time:'',
         xc: '',
@@ -250,12 +251,13 @@
         this.$emit('echarts-changed', this.echarts)
       },
       settable() {
-        this.model= new PagedList('rs/sql/YearCheckerCountRate',20, {year:'this.year',orgid:'this.orgid',plan_type:'this.plan_type',f_start_time:'this.f_start_time',f_end_time:'this.f_end_time'})
+        this.model= new PagedList('rs/sql/YearCheckerCountRate',20, {year:'this.year',orgid:'this.orgid',plan_type:'this.plan_type',f_start_time:'this.f_start_time',f_end_time:'this.f_end_time',f_safecheck_type: 'this.f_safecheck_type'})
         this.model.year = this.year
         this.model.orgid = this.orgid
         this.model.f_start_time = this.f_start_time
         this.model.f_end_time = this.f_end_time
         this.model.plan_type = this.plan_type
+        this.model.f_safecheck_type = this.f_safecheck_type
         this.model.search('1=1')
       },
       set(checkerArrray,ruhuArray,dfbyArray,jjArray,wsytrqArray) {
@@ -458,6 +460,13 @@
       },
       'plan_type' (val) {
         console.log("我是plan_type")
+        this.f_safecheck_type = ''
+        if (this.plan_type == 'false') {
+          this.f_safecheck_type = '年度普检'
+        }
+        if (this.plan_type == 'true') {
+          this.f_safecheck_type = '首次通气'
+        }
         this.searchdata()
       },
       'f_filialeids'(){