manage-client 3.2.24 → 3.2.28

package/src/components/sale/filesquery/ArchivesManage.vue

@@ -9,6 +9,9 @@
     <tabs header="表具设备查询" v-if="permission('表具设备查询')">
       <equipment-query v-if="show.includes('表具设备查询')"></equipment-query>
     </tabs>
+    <tabs header="点火查询" v-if="permission('点火查询')">
+      <fire-query v-if="show.includes('点火查询')"></fire-query>
+    </tabs>
     <tabs header="综合档案信息查询" v-if="permission('综合档案信息查询')">
       <record-info-query v-if="show.includes('综合档案信息查询')"></record-info-query>
     </tabs>

package/src/components/sale/filesquery/FireQuery.vue

@@ -0,0 +1,473 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <div style="flex:1;" class="flex" v-if="!show">
+          <criteria-paged :model="model" v-ref:paged>
+            <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+              <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+                <div class="row">
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">客户编号</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                            condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">客户名称</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                            condition="f_user_name like '%{}%'" placeholder="客户名称">
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">客户电话</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                            condition="f_user_phone like '%{}%'" placeholder="客户电话">
+                  </div>
+                  <div class="span" style = "float:right;">
+                    <button class="button_search button_spacing" @click="search()">查询</button>
+                    <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                    <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+<!--                    <export-excel :data="$parent.$parent.getCondition"-->
+<!--                                  :field="$parent.$parent.getExportField"-->
+<!--                                  :header="$parent.$parent.other"-->
+<!--                                  v-if="$parent.$parent.authArr.includes('档案查询导出')"-->
+<!--                                  sqlurl="rs/logic/exportfile" sql-name="deviceQuery" template-name='表具设备查询导出'  :choose-col="true"></export-excel>-->
+<!--                    <print-data :sum-field="$parent.$parent.getExportField" :model="$parent.model" :field="$parent.$parent.getExportField"-->
+<!--                                :defaultfield="$parent.$parent.defaultfield"-->
+<!--                                titletable="表具设备查询"-->
+<!--                                :sumsmodel="$parent.$parent.sumsmodel"></print-data>-->
+                    <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                  </div>
+                </div>
+                <div class="row" v-show="$parent.$parent.criteriaShow">
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">客户地址</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                            condition="f_address like '%{}%'" placeholder='客户地址'>
+                  </div>
+<!--                  <div class="col-sm-2 form-group" >-->
+<!--                    <label class="font_normal_body">客户状态</label>-->
+<!--                    <v-select :value.sync="model.f_user_state"-->
+<!--                              v-model="model.f_user_state"-->
+<!--                              :options='$parent.$parent.userstates' placeholder='请选择'-->
+<!--                              condition="f_user_state = '{}'"-->
+<!--                              close-on-select></v-select>-->
+<!--                  </div>-->
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">客户类型</label>
+                    <v-select :value.sync="model.f_user_type"
+                              :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                              condition="f_user_type = '{}'"
+                              close-on-select></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">表&emsp;&emsp;号</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                            condition="f_meternumber like '%{}%'" placeholder='表号'>
+                  </div>
+
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                            condition="f_card_id like '%{}%'" placeholder='表号'>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body" title="交付日期大于">交付日期</label>
+                    <datepicker  placeholder="交付日期大于" style="width:60%"
+                                 v-model="model.f_input_start_date"
+                                 :value.sync="model.f_input_start_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_deliver_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body" title="交付日期小于">交付日期</label>
+                    <datepicker  placeholder="交付日期小于" style="width:60%"
+                                 v-model="model.f_input_end_date"
+                                 :value.sync="model.f_input_end_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_deliver_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body" >抄表员&emsp;</label>
+                    <v-select :value.sync="model.f_inputtor"
+                              v-model="model.f_inputtor"
+                              :options='$parent.$parent.inputtores' placeholder='请选择'
+                              condition="f_inputtor = '{}'"
+                              close-on-select :search="false">
+                    </v-select>
+                  </div>
+                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
+                </div>
+              </div>
+            </criteria>
+
+            <data-grid  :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
+              <template partial='head'>
+                <tr>
+                <!--  民用-->
+                  <th><nobr>客户编号</nobr></th>
+                  <th><nobr>客户名称</nobr></th>
+                  <th><nobr>客户电话</nobr></th>
+                  <th><nobr>客户地址</nobr></th>
+                  <th><nobr>客户状态</nobr></th>
+
+                  <th><nobr>表号</nobr></th>
+                  <th><nobr>卡号</nobr></th>
+                  <th><nobr>气表品牌</nobr></th>
+                  <th><nobr>气表型号</nobr></th>
+                  <th><nobr>表向</nobr></th>
+
+                  <th><nobr>镀锌管</nobr></th>
+                  <th><nobr>三通</nobr></th>
+                  <th><nobr>对丝</nobr></th>
+                  <th><nobr>弯头</nobr></th>
+                  <th><nobr>表前阀</nobr></th>
+
+                  <th><nobr>管卡</nobr></th>
+                  <th><nobr>灶前阀</nobr></th>
+                  <th><nobr>胶管</nobr></th>
+                  <th><nobr>自闭阀</nobr></th>
+                  <th><nobr>燃气具</nobr></th>
+
+                  <th><nobr>报警器</nobr></th>
+                  <th><nobr>热水器</nobr></th>
+                  <th><nobr>壁挂锅炉</nobr></th>
+                  <th><nobr>型号</nobr></th>
+
+                  <!--  非民用-->
+                  <th><nobr>非民用气表品牌</nobr></th>
+                  <th><nobr>非民用气表型号</nobr></th>
+                  <th><nobr>流量计范围</nobr></th>
+                  <th><nobr>控制器品牌</nobr></th>
+                  <th><nobr>控制器型号</nobr></th>
+
+                  <th><nobr>控制器出厂日期</nobr></th>
+                  <th><nobr>控制器表编码</nobr></th>
+                  <th><nobr>控制器表封号</nobr></th>
+                  <th><nobr>燃气具类型</nobr></th>
+                  <th><nobr>燃气具品牌</nobr></th>
+
+                  <th><nobr>燃气具型号</nobr></th>
+                  <th><nobr>报警控制箱品牌、数量</nobr></th>
+                  <th><nobr>探测器数量</nobr></th>
+                  <!--公共-->
+                  <th><nobr>设施检验结论</nobr></th>
+                  <th><nobr>交付日期</nobr></th>
+                  <th><nobr>操作人</nobr></th>
+                  <th><nobr>操作日期</nobr></th>
+                </tr>
+              </template>
+              <template partial='body'>
+                <td style="text-align: center;"><nobr>
+                  <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+                </nobr> </td>
+                <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></td>
+
+                <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_meter_style}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_aroundmeter}}</nobr></td>
+
+                <td style="text-align: center;"><nobr>{{row.f_galvanize_pipe}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_tee}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_nipple}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_elbow}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_bqf_type}}</nobr></td>
+
+                <td style="text-align: center;"><nobr>{{row.f_pipe_strap}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_zqf}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_sebific_duct}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_zbf}}</nobr></td>
+
+                <td style="text-align: center;"><nobr>{{row.f_gas_appliance}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_geyser}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_bgl}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_bgl_style}}</nobr></td>
+
+
+                <td style="text-align: center;"><nobr>{{row.f_fire_gasbrand}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_fire_gasmodel}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_llj_scope}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_control_brand}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_control_model}}</nobr></td>
+
+                <td style="text-align: center;"><nobr>{{row.f_control_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_control_code}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_control_number}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_appliance_type}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_appliance_brand}}</nobr></td>
+
+                <td style="text-align: center;"><nobr>{{row.f_appliance_model}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_alarm_info}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_detector_number}}</nobr></td>
+
+                <td style="text-align: center;"><nobr>{{row.f_fic}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_deliver_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
+              </template>
+              <template partial='foot'>
+
+              </template>
+            </data-grid>
+          </criteria-paged>
+
+          <table class="table-hover">
+            <tr style="position: relative" class="table-bordered">
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">暂无合计字段</td>
+            </tr>
+          </table>
+
+          <modal :show.sync="printshow" v-ref:modal backdrop="false">
+            <header slot="modal-header" class="modal-header text-center">
+              <h4 class="modal-title">打印列选择</h4>
+              <input type="checkbox" class="" id="f_generations" v-model="all">
+              <label for="f_generations" class="font-size">全选</label>
+            </header>
+            <article slot="modal-body">
+              <div class="auto col-sm-11 col-md-offset-1"  style="margin-top: 10px;">
+                <div class="col-sm-3" v-for="f in fields">
+                  <input type="checkbox" class="" :id="'water-owe-details-'+$index" v-model="modelval" :value="$key">
+                  <label :for="'water-owe-details-'+$index" class="font-size">{{f}}</label>
+                </div>
+              </div>
+            </article>
+            <footer slot="modal-footer" class="modal-footer">
+              <center>
+                <button v-show="printshow" type="button" class="btn btn-default" @click='close()'>取消</button>
+                <button v-show="printshow" type="button" class="btn btn-success" @click='print()'>打印</button>
+                <print-table :model='model' v-show="false" v-ref:print
+                             :top='40' :left='60' :right='40' :bottom='60'
+                             :thead="thead" :tfoot='tfoot' :attach="yangsen"
+                             :fields="modelval" :printpage="true">
+                </print-table>
+              </center>
+            </footer>
+          </modal>
+        </div>
+        <div class="flex" v-if="show">
+          <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+        </div>
+      </div></div></div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+
+  let readySomething = async function (self) {
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    self.$MagGetSaleParam.initinputtor();
+    self.getinputtores();
+    // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+    // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+    // await self.$refs.paged.$refs.cri.search()
+  }
+  export default {
+    title: '表具用气查询',
+    data() {
+      return {
+        other:[],
+        footer:[],
+        model: new PagedList('rs/sql/fireQuery', 20),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+        defaultfield: [],
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone']
+        },
+        show:false,
+        rowdata:{},
+        // 下拉框参数
+        inputtores:[],
+        usertypes:this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+        userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
+        deviceTypes: this.$appdata.getParam('设备类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')] : [],
+        // brand: this.$appdata.getParam('设备品牌') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备品牌')] : [],
+        watchpurchases: this.$appdata.getParam('购买方式') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('购买方式')] : [],
+        pipetype:  this.$appdata.getParam('管道类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('管道类型')] : [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        // 合计数据
+        sumsmodel: {}
+      }
+    },
+    ready(){
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      async getinputtores () {
+        // 获取抄表员
+        let rs = []
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
+        }
+        this.inputtores = [{label: '全部', value: ''}, ...rs]
+      },
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
+        this.other = [];
+        this.footer = [];
+        let exportdata = this.getCondition;
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        // let footerData = [], exportfield = this.getExportField;
+        // footerData.push("合计");
+        // let self = this;
+        // for (var field in self.sumsmodel) {
+        //   footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        // }
+        // this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      selfSearch (args) {
+        if (!this.orgCondtionStr) {
+          args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
+        } else {
+          args.condition = `${args.condition}` + this.orgCondtionStr
+        }
+
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        console.log('合计字段',this.sumsmodel)
+      },
+      clear(){
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj
+      },
+      stamp () {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段',this.fields)
+        this.printshow = true
+        this.put()
+      },
+      put () {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>设备查询统计报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      print () {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      close () {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval () {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      }
+    },
+    watch:{
+      'all' (val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+      'modelval.length' () {
+        this.put()
+      },
+    },
+    computed:{
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
+      getCondition(){
+        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr}
+      },
+      getfield(){
+        let data = {}
+        this.bodyData.forEach((value, index)=>{
+          data[this.bodyData[index]] = this.headData[index]
+        })
+        //合计字段打印
+        this.tfoot = `<tr><th colspan=${this.modelval.length}>全表汇总信息: `
+        if(this.sumsmodel){
+          Object.keys(this.sumsmodel).forEach((key) => {
+            this.tfoot += this.fields[key] + '合计: ' + `<font color="blue">${this.sumsmodel[key]} </font>`
+          })
+        }else{
+          this.tfoot += '暂无'
+        }
+        this.tfoot += '</th></tr>'
+        return data
+      },
+      getExportField() {
+        return exportConfig.deviceConfig
+      }
+    }
+  }
+</script>

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -70,11 +70,12 @@
                             v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
                     >
                   </div>
-                  <div class="col-sm-2">
-                    <label class="font_normal_body">公&emsp;&emsp;司</label>
-                    <right-tree @re-res="$parent.$parent.getorg"
-                                :initresid='$parent.$parent.orgid'></right-tree>
-                  </div>
+<!--                  <div class="col-sm-2">-->
+<!--                    <label class="font_normal_body">公&emsp;&emsp;司</label>-->
+<!--                    <right-tree @re-res="$parent.$parent.getorg"-->
+<!--                                :initresid='$parent.$parent.orgid'></right-tree>-->
+<!--                  </div>-->
+                  <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
 <!--                  <div class="col-sm-2 form-group">-->
 <!--                    <label class="font_normal_body">组织机构</label>-->
 <!--                    <res-select :initresid="$parent.$parent.orgid"-->
@@ -360,6 +361,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
     components: {UserGasEcharts},
     data() {
       return {
+        resshow:['company','slicearea'],
         model: new PagedList('rs/sql/webmeter_getUserGasList', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
           f_oughtamount: 0,
           f_oughtfee: 0,
@@ -423,7 +425,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
         orgCondtionStr: '(' + this.$login.f.orgid + ')',
         orgid:[this.$login.f.orgid],
-        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
+        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}],
+        zonesdata:''
       }
     },
     ready() {
@@ -495,6 +498,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
         else
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+        if(this.zonesdata){
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
+        }
         args.condition = this.condition
         this.model.search(args.condition, args.model)
       },
@@ -522,6 +528,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
       },
       getRes(obj) {
         this.orgCondtionStr = plugins.convertToIn(obj)
+        if(obj.indexOf("f_zones = ")>0){
+          this.zonesdata = obj.substring(obj.indexOf("f_zones = "))
+        }else{
+          this.zonesdata='';
+        }
       },
       getorg(obj) {
         this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'