safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/src/components/report/ReportSql1.vue

@@ -0,0 +1,345 @@
+<template>
+  <div class="flex-row">
+    <work-busy :is-busy="is_search"></work-busy>
+    <div class="basic-main">
+      <div class="form-horizontal select-overspread container-fluid auto">
+        <div class="row">
+          <div class="col-sm-3" style="width: 20%">
+            <label class="font_normal_body"
+                   style="line-height: 20px;">&nbsp;公&nbsp;&nbsp;&nbsp;&nbsp;司&nbsp;</label>
+            <right-tree :userid.sync='userid' style="width: 60%;" :source.sync='source'
+                        @re-res="getRes"></right-tree>
+          </div>
+
+          <div class="col-sm-3" style="width: 20%">
+            <label class="font_normal_body" style="line-height: 20px;">统计年份</label>
+            <datepicker placeholder="结束日期" style="width:60%" v-model="yearDate" :value.sync="yearDate"
+                        :format="'yyyy'" :show-reset-button="true" :select-year="true">
+            </datepicker>
+          </div>
+          <div class="col-sm-4" style="width: 20%">
+            <label for="endDate" class="font_normal_body">统计类型:</label>
+            <v-select placeholder='统计类型' class="select select_list" style="width: 60%" :value.sync="type"
+                      :value-single="true" :options='types' v-model="type" close-on-select clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-3" style="width: 20%">
+            <div class="span" style="text-align: center;">
+              <button class="button_search" @click="search()">查询</button>
+              <button class="button_search" @click="exportexcel()" v-el:cx>导出Excel</button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="table-responsive" style="width:100%; height:92%; overflow:scroll;white-space: nowrap"
+           id="planid">
+        <table class="table table-bordered" style="width:2000px; height:100%; text-align:center">
+          <thead>
+          <tr>
+            <th>公司</th>
+            <th>应检数</th>
+            <th>1月{{ type }}数</th>
+            <th>1月{{ type }}率</th>
+            <th>2月{{ type }}数</th>
+            <th>2月{{ type }}率</th>
+            <th>3月{{ type }}数</th>
+            <th>3月{{ type }}率</th>
+            <th>4月{{ type }}数</th>
+            <th>4月{{ type }}率</th>
+            <th>5月{{ type }}数</th>
+            <th>5月{{ type }}率</th>
+            <th>6月{{ type }}数</th>
+            <th>6月{{ type }}率</th>
+            <th>7月{{ type }}数</th>
+            <th>7月{{ type }}率</th>
+            <th>8月{{ type }}数</th>
+            <th>8月{{ type }}率</th>
+            <th>9月{{ type }}数</th>
+            <th>9月{{ type }}率</th>
+            <th>10月{{ type }}数</th>
+            <th>10月{{ type }}率</th>
+            <th>11月{{ type }}数</th>
+            <th>11月{{ type }}率</th>
+            <th>12月{{ type }}数</th>
+            <th>12月{{ type }}率</th>
+            <th>合计{{ type }}数</th>
+            <th>合计{{ type }}率</th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr v-for="(index, item) in resData">
+            <td>{{ item.name }}</td>
+            <td>{{ item.countnum }}</td>
+            <td>{{ item.jan }}</td>
+            <td>{{ item.jan_lv }}</td>
+            <td>{{ item.feb }}</td>
+            <td>{{ item.feb_lv }}</td>
+            <td>{{ item.mar }}</td>
+            <td>{{ item.mar_lv }}</td>
+            <td>{{ item.apr }}</td>
+            <td>{{ item.apr_lv }}</td>
+            <td>{{ item.may }}</td>
+            <td>{{ item.may_lv }}</td>
+            <td>{{ item.jun }}</td>
+            <td>{{ item.jun_lv }}</td>
+            <td>{{ item.jul }}</td>
+            <td>{{ item.jul_lv }}</td>
+            <td>{{ item.aug }}</td>
+            <td>{{ item.aug_lv }}</td>
+            <td>{{ item.sep }}</td>
+            <td>{{ item.sep_lv }}</td>
+            <td>{{ item.oct }}</td>
+            <td>{{ item.oct_lv }}</td>
+            <td>{{ item.nov }}</td>
+            <td>{{ item.nov_lv }}</td>
+            <td>{{ item.dec }}</td>
+            <td>{{ item.dec_lv }}</td>
+            <td>{{ item.yearnum }}</td>
+            <td>{{ item.yearnum_lv }}</td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Datepicker from 'vue-client/src/vue-strap/src/Datepicker'
+import XLSX from "xlsx";
+
+
+export default {
+  title: '安检率报表（公司）',
+  data() {
+    return {
+      type: '到户',
+      types: [{ label: '到户', value: '到户' }, { label: '入户', value: '入户' }],
+      userid: this.$login.f.id,
+      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+      f_filialeid_id: `('${this.$login.f.orgid}')`, //分公司id
+      yearDate: (new Date()).getFullYear().toString(), //统计年份
+      f_safecheck_types: [{ label: '年度普检', value: '年度普检' }, { label: '专项计划', value: '专项计划' }],//安检类型
+      f_safecheck_type: '年度普检',//安检类型
+      f_check_types: [{ label: '所有用户类型', value: '' }, { label: '民用', value: '民用' }, { label: '非民用', value: '非民用' }],
+      f_check_type: '民用',
+      is_search: false,
+      resData: [],
+      thisYear: 'XXX',//当前展示数据的年份
+      f_orgname: '', //选择的分公司名称
+      thisf_orgname: 'XXX公司',//当前展示数据的分公司名称
+      thissafecheck_type: 'XXX',//当前展示数据的计划类型
+      sumuserinfo: '', //截止到去年为止总用户数
+      excelHeaders: {
+        'mon': '月份',
+        'checkcount': '完成数',
+        'checkcompletion': '完成率',
+        'sumcheckcount': '累计完成数',
+        'sumcheckcompletion': '累计完成率',
+        'novisit': '到访不遇数',
+        'novisitcompletion': '到访不遇率'
+      },
+      searchData: {
+        f_filialeid_id: this.f_filialeid_id,
+        f_safecheck_type: this.f_safecheck_type,
+        yearDate: this.yearDate,
+        f_check_type: this.f_check_type
+      }
+    }
+  },
+  components: {
+    Datepicker
+  },
+  methods : {
+
+    exportexcel() {
+      let tableData = [];
+      this.resData.forEach(item => {
+        let row = {
+          "公司": item.name,
+          "应检数": item.countnum,
+          [`1月${this.type}数`]: item.jan,
+          [`1月${this.type}率`]: `${((item.jan_lv || 0).replace('%', ''))}%`,
+          [`2月${this.type}数`]: item.feb,
+          [`2月${this.type}率`]: `${((item.feb_lv || 0).replace('%', ''))}%`,
+          [`3月${this.type}数`]: item.mar,
+          [`3月${this.type}率`]: `${((item.mar_lv || 0).replace('%', ''))}%`,
+          [`4月${this.type}数`]: item.apr,
+          [`4月${this.type}率`]: `${((item.apr_lv || 0).replace('%', ''))}%`,
+          [`5月${this.type}数`]: item.may,
+          [`5月${this.type}率`]: `${((item.may_lv || 0).replace('%', ''))}%`,
+          [`6月${this.type}数`]: item.jun,
+          [`6月${this.type}率`]: `${((item.jun_lv || 0).replace('%', ''))}%`,
+          [`7月${this.type}数`]: item.jul,
+          [`7月${this.type}率`]: `${((item.jul_lv || 0).replace('%', ''))}%`,
+          [`8月${this.type}数`]: item.aug,
+          [`8月${this.type}率`]: `${((item.aug_lv || 0).replace('%', ''))}%`,
+          [`9月${this.type}数`]: item.sep,
+          [`9月${this.type}率`]: `${((item.sep_lv || 0).replace('%', ''))}%`,
+          [`10月${this.type}数`]: item.oct,
+          [`10月${this.type}率`]: `${((item.oct_lv || 0).replace('%', ''))}%`,
+          [`11月${this.type}数`]: item.nov,
+          [`11月${this.type}率`]: `${((item.nov_lv || 0).replace('%', ''))}%`,
+          [`12月${this.type}数`]: item.dec,
+          [`12月${this.type}率`]: `${((item.dec_lv || 0).replace('%', ''))}%`,
+          [`合计${this.type}数`]: item.yearnum,
+          [`合计${this.type}率`]: `${((item.yearnum_lv || 0).replace('%', ''))}%`
+        };
+        tableData.push(row);
+      });
+      // 使用 XLSX 写入自定义数据
+      let ws = XLSX.utils.json_to_sheet(tableData);
+      let wb = XLSX.utils.book_new();
+      XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
+      XLSX.writeFile(wb, '安检率报表（公司）.xlsx');
+    },
+    getRes(obj) {
+      console.log(obj)
+      this.f_filialeid_id = this.$login.convertToIn(obj.resids);
+      this.f_orgname = obj.res[0]
+      // this.model.f_filialeid_id = this.$login.convertToIn(obj.resids);
+    },
+    // 执行查询
+    async search() {
+      this.is_search = true
+      setTimeout(()=>{
+        this.is_search = false
+      },5000)
+      let newdate = {
+        f_filialeid_id: this.f_filialeid_id,
+        yearDate: this.yearDate,
+        condition: this.type === '入户' ? `f_entry_status = '入户' AND f_safecheck_type in ('年度普检','专项计划') AND f_check_type = '民用'` : `1 = 1 AND f_safecheck_type in ('年度普检','专项计划') AND f_check_type = '民用'`
+      }
+      this.searchData = newdate;//导出
+      let res = await this.$resetpost("/api/af-safecheck/sql/ReportSql1?pageNo=1&pageSize=999999",
+        {"data": newdate},
+        {resolveMsg : '查询汇总成功！', rejectMsg : '查询汇总失败！'})
+      let sum = {
+        "jul": 0,
+        "oct": 0,
+        "feb": 0,
+        "apr": 0,
+        "jun": 0,
+        "dec": 0,
+        "may": 0,
+        "countnum": 0,
+        "aug": 0,
+        "nov": 0,
+        "jan": 0,
+        "name": "合计",
+        "yearnum": 0,
+        "mar": 0,
+        "sep": 0
+      }
+       if (res.data) {
+         for (let i = 0; i < res.data.length; i++) {
+           for (let datumKey in res.data[i]) {
+             switch (datumKey) {
+               case 'jul':
+                 sum.jul += res.data[i][datumKey]
+                 break;
+               case 'oct':
+                 sum.oct += res.data[i][datumKey]
+                 break;
+               case 'feb':
+                 sum.feb += res.data[i][datumKey]
+                 break;
+               case 'apr':
+                 sum.apr += res.data[i][datumKey]
+                 break;
+               case 'jun':
+                 sum.jun += res.data[i][datumKey]
+                 break;
+                 case 'dec':
+                 sum.dec += res.data[i][datumKey]
+                 break;
+               case 'may':
+                 sum.may += res.data[i][datumKey]
+                 break;
+               case 'countnum':
+                 sum.countnum += res.data[i][datumKey]
+                 break;
+               case 'aug':
+                 sum.aug += res.data[i][datumKey]
+                 break;
+               case 'nov':
+                 sum.nov += res.data[i][datumKey]
+                 break;
+               case 'jan':
+                 sum.jan += res.data[i][datumKey]
+                 break;
+               case 'mar':
+                 sum.mar += res.data[i][datumKey]
+                 break;
+               case 'sep':
+                 sum.sep += res.data[i][datumKey]
+                 break;
+               case 'yearnum':
+                 sum.yearnum += res.data[i][datumKey]
+                 break;
+             }
+           }
+         }
+         res.data.push(sum)
+         this.resData = this.calculateMonthlyRates(res.data)
+         console.log(this.resData)
+       }
+      this.is_search = false
+    },
+    calculateMonthlyRates(data) {
+      data.forEach(item => {
+        const months = ["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec", "yearnum"];
+        months.forEach(month => {
+          if (item.hasOwnProperty(month)) {
+            let rate = (item[month] / item.countnum) * 100; // 计算率（百分比）
+            item[`${month}_lv`] = `${rate.toFixed(2)}%`; // 保留两位小数并添加到对象中
+          }
+        });
+      });
+      return data;
+    }
+  },
+  computed: {
+    excelTitle() {
+      return `${this.thisf_orgname + this.thisYear + '年度' + this.thissafecheck_type}完成情况统计表`
+    }
+  },
+  ready() {
+    this.searchData = {
+      f_filialeid_id: this.f_filialeid_id,
+      f_safecheck_type: this.f_safecheck_type,
+      yearDate: this.yearDate,
+      f_check_type: this.f_check_type
+    }
+  },
+  watch: {
+    'f_filialeid_id': function (val) {
+      this.searchData.f_filialeid_id = val
+    },
+    'f_safecheck_type': function (val) {
+      this.searchData.f_safecheck_type = val
+      if (this.f_safecheck_type === '年度普检' && this.f_check_type !== '民用') {
+        this.$showMessage("年度普检只能选择民用用户类型，已为您自动切换为民用类型")
+        this.f_check_type = '民用'
+      }
+    },
+    'yearDate': function (val) {
+      this.searchData.yearDate = val
+    },
+    'f_check_type': function (val) {
+      if (this.f_safecheck_type === '年度普检' && this.f_check_type !== '民用') {
+        this.$showMessage("年度普检只能选择民用用户类型，已为您自动切换为民用类型")
+        this.f_check_type = '民用'
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tableinfo {
+  text-align: center;
+  background-color: #00A3F0;
+  color: #0c2e4d;
+}
+</style>

package/src/components/report/SafePlanSale.vue

@@ -71,7 +71,7 @@
     title: '安检率报表',
     data () {
 
-      let model =  new DataModel('rs/report/safechecksale',{startDate: 'this.model.startDate', endDate: 'this.model.endDate',f_subcompany: 'this.f_subcompany'})
+      let model =  new DataModel('api/af-safecheck/report/safechecksale',{startDate: 'this.model.startDate', endDate: 'this.model.endDate',f_subcompany: 'this.f_subcompany'})
       model.f_subcompany = ''
       return {
         filialeNameStr:'',

package/src/components/report/SafePlanStatistics.vue

@@ -71,7 +71,7 @@
     title: '安检情况报表',
     data () {
 
-      let model =  new DataModel('rs/report/safesituation',{startDate: 'this.model.startDate', endDate: 'this.model.endDate',f_subcompany: 'this.f_subcompany',plantype:'this.plantype[0]'})
+      let model =  new DataModel('api/af-safecheck/report/safesituation',{startDate: 'this.model.startDate', endDate: 'this.model.endDate',f_subcompany: 'this.f_subcompany',plantype:'this.plantype[0]'})
       model.f_subcompany = ''
       model.plantype = ['']
       return {

package/src/components/rongcheng/AddPlanItem.vue

@@ -171,7 +171,7 @@
   export default {
     title: '安检员B',
     data () {
-      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area"',f_check_type:'this.f_check_type[0]',
         f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
       model.f_sign = ['']
       model.f_user_type = ''
@@ -206,7 +206,7 @@
       }
     },
     ready () {
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
         console.log(JSON.stringify(res))
       if(res.data.code == 200){
         this.model.myCycle = res.data.civil.value
@@ -230,7 +230,7 @@
         info.f_state = '未检'
         info.f_no_checkplan = '无计划安检'
         console.log("----------INFO---------"+JSON.stringify(info))
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
           console.log(JSON.stringify(response))
           info['f_plan_meters'] = response.data
           var pardate = {
@@ -239,17 +239,8 @@
             safe:true
           }
            this.$dispatch('gotoson',pardate)
-          if(info.f_user_type=='民用'){
-            this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', this.reload)
-          }else if(info.f_user_type=='非民用'){
-            this.$goto('safecheck-order-v-cli', {item: info, role: 'inspect'}, 'self', this.reload)
-          }else{
-            this.$showMessage('当前用户类型不明确，请联系管理员！')
-          }
-
+          this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', this.reload)
 
-        }).catch((err)=>{
-          this.$showMessage('网络异常，请稍后再试！')
         })
       }
     }

package/src/components/rongcheng/AspiratedCurrentCreate.vue

@@ -186,23 +186,7 @@
                        v-model=model.f_meter_no condition="f_meter_no like '%{}%'" />
               </div>
             </div>
-            <div class="row app-row" v-if="$parent.$parent.criteriaShow">
-              <div class="col-xs-4">
-                <img src="../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label for="f_plan_name" class="font text-left">所属区域：</label>
-              </div>
-              <v-select
-                id="f_small_area"
-                :value.sync="model.f_small_area"
-                class="input-font"
-                :options='$parent.$parent.smallAreaOptions'
-                placeholder='小区域'
-                :width="'60%'"
-                v-model="model.f_small_area"
-                condition="f_small_area = '{}'"
-                close-on-select clear-button>
-              </v-select>
-            </div>
+
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
                 <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -509,7 +493,7 @@
    let select = function * (self) {
     let http = new HttpResetClass()
     http.load('POST', `${self.$androidUtil.getProxyUrl()}/rs/search`, {
-      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($送气人员$) != -1))',
+      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
       userid: Vue.user.id
     }, {resolveMsg: null, rejectMsg: null}).then((res) => {
       console.log('获取安检员', res)
@@ -529,7 +513,7 @@
         check:'',
         plan:'',
         planid:'',
-        model:Vue.android? new LocalPagedList('androidGetuserinfoAsp',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
         showModal: false,
         showModal2:false,
         showModal3:false,
@@ -575,7 +559,6 @@
         residentialAreaOptions: [],
         buildOptions: [],
         unitOptions: [],
-        smallAreaOptions: [],
         planNameOptions: [],
         upcomingCount: 0,
         doneCount: 0,
@@ -587,7 +570,6 @@
        this.getAllArea()
        this.getAllPlanName()
       this.selfSearch()
-      this.getAllSmall_area()
       let gen = select(this)
        co(gen)
     },
@@ -649,7 +631,7 @@
         this.check=''
       },
       async okput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
 
           condition:`it.id='`+this.needid+`'`,
             f_plan_id:this.planid,
@@ -662,7 +644,7 @@
         await this.getNewOrder()
       },
       async manyokput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
             columnName:"it.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -682,7 +664,7 @@
           condition=`f_plan_name like '%`+this.plan+`%'`+` and f_safecheck_type='送气类型'`
         }
 
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {data:{
             condition:condition,
             f_filialeids:this.f_filialeids,
             groupitem:'',
@@ -715,9 +697,9 @@
         this.showModal3 = true
       },
       reload(){
-        //this.getAllArea()
-        //this.getAllPlanName()
-        this.$refs.paged.loadPage(this.model.pageIndex)
+        this.getAllArea()
+        this.getAllPlanName()
+        this.selfSearch()
       },
       cancelReserve (idx, id) {
         if(Vue.android){
@@ -766,19 +748,17 @@
         var _this = this
         console.log('进入inspect')
         if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ) {
-          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
+          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
           console.log(JSON.stringify(response))
             row['f_plan_meters'] = response.data
             var pardate = {
              _this:_this,
-              title:'送气计划',
+              title:'安检计划',
               safe:true
             }
             _this.$dispatch('gotoson',pardate)
             console.log('进入safecheck-order-v')
-            _this.$goto('AspiratedOrderV', {f_plan_id: row.f_plan_id, item: row, role: 'inspect'}, 'self', _this.reload)
-          }).catch((err)=>{
-            this.$showMessage('网络异常，请稍后再试！')
+            _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect'}, 'self', _this.reload)
           })
       }else(
           this.$showMessage("该安检单已被上传！")
@@ -798,31 +778,14 @@
       selfSearch () {
         this.getPlanCount()
         let condition = ""
-        if(this.$refs.paged.$refs.cri.model.f_residential_area){
-          if(this.$refs.paged.$refs.cri.model.f_residential_area.toString().trim()){
-            condition += " and ti.f_residential_area = '"+this.$refs.paged.$refs.cri.model.f_residential_area+"'"
-          }
-        }
-        if(this.$refs.paged.$refs.cri.model.f_building){
-          if(this.$refs.paged.$refs.cri.model.f_building.toString().trim()){
-            condition += " and ti.f_building = '"+this.$refs.paged.$refs.cri.model.f_building+"'"
-          }
-        }
-        if(this.$refs.paged.$refs.cri.model.f_unit){
-          if(this.$refs.paged.$refs.cri.model.f_unit.toString().trim()){
-            condition += " and ti.f_unit = '"+this.$refs.paged.$refs.cri.model.f_unit+"'"
-          }
-        }
-        if(this.$refs.paged.$refs.cri.model.f_plan_name){
-          if(this.$refs.paged.$refs.cri.model.f_plan_name.toString().trim()){
-            condition += " and f_plan_name = '"+this.$refs.paged.$refs.cri.model.f_plan_name +"'"
-          }
-        }
-        if(this.$refs.paged.$refs.cri.model.f_small_area){
-          if(this.$refs.paged.$refs.cri.model.f_small_area.toString().trim()){
-            condition += " and f_small_area = '"+this.$refs.paged.$refs.cri.model.f_small_area +"'"
-          }
-        }
+        if(this.$refs.paged.$refs.cri.model.f_residential_area)
+          condition += " and ti.f_residential_area like '%"+this.$refs.paged.$refs.cri.model.f_residential_area+"%'"
+        if(this.$refs.paged.$refs.cri.model.f_building)
+          condition += " and ti.f_building like '%"+this.$refs.paged.$refs.cri.model.f_building+"%'"
+        if(this.$refs.paged.$refs.cri.model.f_unit)
+          condition += " and ti.f_unit like '%"+this.$refs.paged.$refs.cri.model.f_unit+"%'"
+        if(this.$refs.paged.$refs.cri.model.f_plan_name)
+          condition += " and f_plan_name like '%"+this.$refs.paged.$refs.cri.model.f_plan_name +"%'"
         // if(this.$refs.paged.$refs.cri.model.f_plan_year)
         //   condition += " and f_plan_year = '"+this.$refs.paged.$refs.cri.model.f_plan_year +"'"
         // if(this.$refs.paged.$refs.cri.model.f_plan_month)
@@ -869,20 +832,6 @@
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
-      getAllSmall_area(){
-        let criteria = {
-          items: 'f_small_area',
-          tablename: 't_check_plan_item',
-          condition: `f_residential_area IS NOT NULL AND f_residential_area != '' AND f_state <> '已检'`,
-          groupitem: 'f_small_area'
-        }
-        let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
-        console.log('result ===> ' + JSON.stringify(result))
-        if(result.code == 200){
-          result.data.rows.forEach(item => this.smallAreaOptions.push({label:item.f_small_area,value:item.f_small_area}))
-        }
-        console.log('this.residentialAreaOptions ===> ' + JSON.stringify(this.smallAreaOptions))
-      },
       getAllArea(){
         this.residentialAreaOptions = []
         this.buildOptions = []
@@ -916,7 +865,7 @@
           items: 'f_building',
           tablename: 't_check_plan_item',
           condition: `f_building IS NOT NULL AND f_building != '' AND f_state <> '已检' AND f_residential_area = '${f_residential_area}'`,
-          groupitem: `f_building order by CAST(REPLACE(f_building,'#','') as int)`
+          groupitem: 'f_building'
         }
         let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
         if(result.code == 200){