manage-client 3.2.80 → 3.2.83

package/src/components/sale/businessquery/SuspiciousUserQuery.vue

@@ -6,9 +6,25 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"
-                                  :show-component="['company','department','operator']"
-                                  v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">小区名称</label>
+                  <v-select :value.sync="model.f_residential_area"
+                            class="select_list select"
+                            enter-push
+                            multiple = "true"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            condition="f_residential_area = '{}'"
+                            close-on-select>
+
+                  </v-select>
+                </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_userinfo_code"
@@ -34,11 +50,10 @@
               </div>
 
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
-                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
-                </div>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"
+                                  :show-component="['company','department','operator']"
+                                  v-ref:sel></res-select-group>
+
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -52,20 +67,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_wgqmonth"
                          condition="f_wgqmonth = '{}' " placeholder="未购气月数">
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">小区名称</label>
-                  <v-select :value.sync="model.f_residential_area"
-                            class="select_list select"
-                            enter-push
-                            multiple = "true"
-                            v-model="model.f_residential_area"
-                            style="width: 60%"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                            condition="f_residential_area = '{}'"
-                            close-on-select>
-
-                  </v-select>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表品牌</label>
                   <v-select :value.sync="model.gasbrand"
@@ -78,8 +79,8 @@
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">最后购气小于</label>
-                  <datepicker id="startDate" placeholder="最后购气时间" style="width:60%"
+                  <label for="startDate" class="font_normal_body">最后购气大于</label>
+                  <datepicker id="startDate" placeholder="最后购气时间大于" style="width:60%"
                               v-model="model.startDate"
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
@@ -88,8 +89,8 @@
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">最后购气大于</label>
-                  <datepicker id="endDate" placeholder="最后购气时间" style="width:60%"
+                  <label for="endDate" class="font_normal_body">最后购气小于</label>
+                  <datepicker id="endDate" placeholder="最后购气时间小于" style="width:60%"
                               v-model="model.endDate"
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"

package/src/components/sale/businessquery/TransferQuery.vue

@@ -7,23 +7,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <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" :footer="$parent.$parent.footer"
-                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="transferQuery" template-name='过户查询导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                               :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 for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -54,6 +37,24 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
                          condition="f_olduserinfo_code = '{}' " 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" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile" sql-name="transferQuery" template-name='过户查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                               :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">
+                <res-select-group :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>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"

package/src/components/sale/businessquery/UnhandBusiness.vue

@@ -0,0 +1,324 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div 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 for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              format="yyyy-MM-dd HH:mm:ss"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              format="yyyy-MM-dd HH:mm:ss"
+                              :show-reset-button="true">
+                  </datepicker>
+                </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_userinfo_code"
+                         condition="u.f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <!--<div class="col-sm-2 form-group">-->
+                  <!--<label class="font_normal_body">抄表状态</label>-->
+                  <!--<v-select :value.sync="model.f_meter_state" v-model="model.f_meter_state"-->
+                            <!--:options='$parent.$parent.meterstate' placeholder='请选择'-->
+                            <!--condition="f_meter_state = '{}'"-->
+                            <!--close-on-select>-->
+                  <!--</v-select>-->
+                <!--</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>
+                  <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>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="UnhandBusiness"
+                                template-name='未抄表用户报表导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model"
+                              :field="$parent.$parent.getfield"
+                              titletable="未抄表用户报表导出"></print-data>
+                </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_user_name"
+                           condition="u.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"
+                           placeholder="地址"  condition="f_user_phone='{}'">
+                  </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_address"
+                           placeholder="地址"  condition="f_address like '%{}%'">
+                  </div>
+                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :show-component="['company','department','operator']" v-ref:sel></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>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">{{row.f_userinfo_code}}</td>
+              <td style="text-align: center;">{{row.f_user_name}}</td>
+              <td style="text-align: center;">{{row.f_olduserinfo_code}}</td>
+              <td style="text-align: center;">{{row.f_street}}</td>
+              <td style="text-align: center;">{{row.f_residential_area}}</td>
+              <td style="text-align: center;">{{row.f_address}}</td>
+              <td style="text-align: center;">{{row.f_user_phone}}</td>
+              <td style="text-align: center;">{{row.f_user_type}}</td>
+              <td style="text-align: center;">{{row.f_meternumber}}</td>
+              <td style="text-align: center;">{{row.f_total_gas}}</td>
+              <td style="text-align: center;">{{row.f_balance_amount}}</td>
+              <td style="text-align: center;"><nobr>{{row.f_meter_state}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </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.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+
+    await self.$MagLoadParams.loadParam()
+
+  }
+
+
+  export default {
+    title: '未抄表用户报表',
+    data() {
+      return {
+        rows: null,
+        other: [],
+        footer: [],
+        criteriaShow: false,
+        model: new PagedList('rs/sql/UnhandBusiness', 50,
+          {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
+        orgCondtionStr: '',
+        getfield: '',
+        show:false,
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        defaultfield: []
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      getotherfooter() {
+        this.other = [];
+        this.footer = [];
+        let exportdata = this.getCondition;
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData = [], exportfield = this.getfield;
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        //部门和人员变为全选
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      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()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+    },
+    computed: {
+      getCondition() {
+        let result = {
+          condition: this.$refs.paged.$refs.cri.condition + this.orgCondtionStr,
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate
+        }
+        return result
+      },
+      meterstate() {
+        return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('抄表状态')]
+      },
+      getfield() {
+        return exportConfig.UnhandBusinessConfig
+      }
+    }
+  }
+</script>
+<style media="screen">
+  .divtext {
+    min-width: 50px;
+    max-width: 200px;
+    border: 1px solid green;
+    display: inline-block;
+  }
+</style>

package/src/components/sale/businessquery/UserSellHeadDetail.vue

@@ -7,32 +7,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-
-
-
-                <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>
-
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="userSellHandDetaill"
-                                template-name='用户余额分析导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="用户余额分析打印"
-                              :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 for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -40,7 +14,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              >
+                  >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -50,7 +24,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                             >
+                  >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -58,16 +32,39 @@
                   <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" title="旧客户编号">档案编号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
                          condition="f_olduserinfo_code = '{}' " 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>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="userSellHandDetaill"
+                                template-name='用户余额分析导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="用户余额分析打印"
+                              :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">
+                <res-select-group :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>
+                  <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>
                   <v-select :value.sync="model.f_user_type"

package/src/components/sale/businessquery/YingShouMingXi.vue

@@ -53,19 +53,19 @@
                                                :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 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" title="参数名称:用户类型">客户类型</label>
-                                    <v-select :value.sync="model.f_user_type"
-                                              @change="$parent.$parent.userTypeChange()"
-                                              :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                                              condition="f_user_type = '{}'"
-                                              close-on-select></v-select>
-                                </div>
+                              <res-select-group :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                              <div class="col-sm-2 form-group">
+                                  <label class="font_normal_body" title="参数名称:用户类型">客户类型</label>
+                                  <v-select :value.sync="model.f_user_type"
+                                            @change="$parent.$parent.userTypeChange()"
+                                            :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">用气性质</label>
                                 <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
@@ -73,11 +73,6 @@
                                           condition="f_gasproperties = '{}'"
                                           close-on-select></v-select>
                               </div>
-                              <res-select-group
-                                :initres="$parent.$parent.initres"
-                                :show-component="['company','department','operator']"
-                                @re-res="$parent.$parent.getRes"
-                                v-ref:sel></res-select-group>
                               <div class="col-sm-2 form-group">
                                 <label class="font_normal_body" title="参数名称:气表类型">气表类型</label>
                                 <v-select :value.sync="model.f_meter_style"

package/src/components/sale/businessquery/YonghuJieyu.vue

@@ -26,7 +26,6 @@
                   >
                   </datepicker>
                 </div>
-                <res-select-group :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <!--                <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"-->
@@ -49,9 +48,12 @@
                                  :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 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">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+              </div>
             </div>
           </criteria>
           <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid :classname="$parent.classname">

package/src/components/sale/businessquery/gasPriceQuery.vue

@@ -6,7 +6,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <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>
                   <v-select :value.sync="model.f_price_name" v-model='model.f_price_name'
@@ -77,8 +76,8 @@
                             close-on-select style="width:60%" :value-single="true"
                             v-el:cc></v-select>
                 </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>
-
             </div>
           </criteria>