manage-client 3.2.80 → 3.2.83

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

@@ -6,44 +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 :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_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="span" style="float:right;">
-                  <!--<read-idcard></read-idcard>-->
-                  <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="areaGeneralQuery"
-                                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>
-
-                  <!--<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%"
@@ -83,6 +45,41 @@
                   <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>-->
+                  <!--<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="span" style="float:right;">
+                  <!--<read-idcard></read-idcard>-->
+                  <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="areaGeneralQuery"
+                                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>
+                  <!--<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_phone"-->
@@ -98,8 +95,6 @@
                   <!--<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_type"

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

@@ -7,30 +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="BalanceTable"
-                                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%"
@@ -38,7 +14,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              >
+                  >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -48,7 +24,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                             >
+                  >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -56,17 +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="u.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="BalanceTable"
+                                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="u.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/BusinesQuery.vue

@@ -7,17 +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">
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">公&emsp;&emsp;司</label>
-                  <right-tree @re-res="getorg"
-                              :initresid='initres.org'></right-tree>
-                </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="f_userinfo_code = '{}' " placeholder="用户编号">
-                </div>
-
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -38,7 +27,23 @@
                               condition="f_operate_date <= '{}'">
                   </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="f_userinfo_code = '{}' " placeholder="用户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">付款方式</label>
+                  <v-select id="f_payment"
+                            v-model="model.f_payment"
+                            placeholder='请选择'
+                            condition="f_payment in {}"
+                            multiple="true"
+                            :value.sync="model.f_payment"
+                            :options='$parent.$parent.payments'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
 
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
@@ -52,16 +57,17 @@
                   <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">
+              <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=" f_user_name like '%{}%'" placeholder='用户名称'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">操作人</label>
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;操作人</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_operator"
                          condition=" f_operator like '%{}%'" placeholder='操作人'>
                 </div>
@@ -80,6 +86,12 @@
                   <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">公&emsp;&emsp;司</label>-->
+                  <!--<right-tree @re-res="getorg"-->
+                              <!--:initresid='initres.org'></right-tree>-->
+                <!--</div>-->
+                <res-select-group :show-component="$parent.$parent.resshow" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes"  v-ref:sel></res-select-group>
               </div>
 
             </div>
@@ -112,9 +124,15 @@
                 <th>
                   <nobr>操作日期</nobr>
                 </th>
+                <th>
+                  <nobr>付款方式</nobr>
+                </th>
                 <th>
                   <nobr>组织名称</nobr>
                 </th>
+                <th>
+                  <nobr>支付渠道</nobr>
+                </th>
                 <th>
                   <nobr>部门名称</nobr>
                 </th>
@@ -149,9 +167,15 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bank_type}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_depname}}</nobr>
               </td>
@@ -230,8 +254,9 @@
         tfoot: '',
         orgrestype:'organization',
         defaultfield: [],
+        resshow:['company'],
         initres: {
-          org:[this.$login.f.orgid],
+          org:[this.$login.f.orgid]
         },
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee',  'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
@@ -287,8 +312,19 @@
           this.$refs.paged.$refs.cri.model[key] = []
         })
       },
-      getRes(obj) {
-        this.orgCondtionStr = obj
+      // getRes(obj) {
+      //   this.orgCondtionStr = obj
+      // },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(condition,obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
       },
       stamp() {
         this.all = false
@@ -361,6 +397,9 @@
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
+      payments() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+      },
       getfield() {
         return exportConfig.businesConfig
       }

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

@@ -91,7 +91,9 @@
     <tabs header="团缴查询" v-if="permission('团缴查询')">
       <group-charge-query v-if="show.includes('团缴查询')" @deal-msg="dealMsg" :data="data"></group-charge-query>
     </tabs>
-
+    <tabs header="气费阶梯明细" v-if="permission('气费阶梯明细')">
+      <selling-charge-price v-if="show.includes('气费阶梯明细')" @deal-msg="dealMsg" :data="data"></selling-charge-price>
+    </tabs>
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

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

@@ -15,9 +15,9 @@
     <tabs header="小区汇总（机表）" v-if="permission('小区汇总（机表）')">
       <residential-query v-if="show.includes('小区汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
     </tabs>
-    <tabs header="小区欠费汇总（机表）" v-if="permission('小区欠费汇总（机表）')">
-      <residential-query v-if="show.includes('小区欠费汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
-    </tabs>
+    <!--<tabs header="小区欠费汇总（机表）" v-if="permission('小区欠费汇总（机表）')">-->
+      <!--<residential-arrears-query v-if="show.includes('小区欠费汇总（机表）')"  @deal-msg="dealMsg"></residential-arrears-query>-->
+    <!--</tabs>-->
     <tabs header="收费员汇总表" v-if="permission('收费员汇总表')">
       <sell-people-query v-if="show.includes('收费员汇总表')" @deal-msg="dealMsg"></sell-people-query>
     </tabs>
@@ -84,6 +84,12 @@
     <tabs header="操作员日结列表" v-if="permission('操作员日结列表')">
       <proceeds-oper v-if="show.includes('操作员日结列表')"  @deal-msg="dealMsg"></proceeds-oper>
     </tabs>
+    <tabs header="抄表情况记录表" v-if="permission('抄表情况记录表')">
+      <handplan-info v-if="show.includes('抄表情况记录表')"  @deal-msg="dealMsg"></handplan-info>
+    </tabs>
+    <tabs header="未抄表用户报表" v-if="permission('未抄表用户报表')">
+      <unhand-business @deal-msg="dealMsg"></unhand-business>
+    </tabs>
   </tab-button>
 
 </template>

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

@@ -7,30 +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" :show-component="$parent.$parent.showComponent"  @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="CommunityPaymen"
-                                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%"
@@ -63,6 +39,30 @@
                             close-on-select search="true">
                   </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>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="CommunityPaymen"
+                                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" :show-component="$parent.$parent.showComponent"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
               </div>
             </div>
           </criteria>

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

@@ -7,8 +7,21 @@
           <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="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" 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>
@@ -25,21 +38,7 @@
                 </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_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>
+                <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>

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

@@ -103,9 +103,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_othereason"
                          condition="f_othereason like '%{}%'" placeholder='其他原因'>
                 </div>
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-              </div>
-              <div class="row">
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
                   <v-select class="select_list select"
@@ -127,6 +124,7 @@
                     <input type="text" style="width: 36%;" placeholder="室号" class="input_search" v-model="model.f_room" condition="f_room = '{}'" />
                   </div>
                 </div>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>

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

@@ -56,38 +56,16 @@
               </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='客户名称'
-                         :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
-                </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"
-                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                  <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 = '{}'" placeholder='表号'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">操作类型</label>
-                  <v-select :value.sync="model.f_operat_type"
-                            v-model="model.f_operat_type"
-                            :options='$parent.$parent.operattype' placeholder='请选择'
-                            condition="f_operat_type = '{}'"
-                            close-on-select></v-select>
+                  <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 = '{}'" placeholder='卡号'>
                 </div>
-              </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 = '{}'" 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 = '{}'" placeholder='卡号'>
-              </div>
-              <div class="row">
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
                   <v-select class="select_list select"
@@ -109,6 +87,26 @@
                     <input type="text" style="width: 36%;" placeholder="室号" class="input_search" v-model="model.f_room" condition="f_room = '{}'" />
                   </div>
                 </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='客户名称'
+                         :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
+                </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"
+                         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_operat_type"
+                            v-model="model.f_operat_type"
+                            :options='$parent.$parent.operattype' placeholder='请选择'
+                            condition="f_operat_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>