manage-client 3.2.80 → 3.2.83-1

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

@@ -39,6 +39,18 @@
                   <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="infoOperateRecordQuery"
+                                template-name='维护记录导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model"
+                              :field="$parent.$parent.getfield"
+                              titletable="维护记录导出"></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>
@@ -278,7 +290,7 @@
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
-        return exportConfig.pricechangeRecordConfig
+        return exportConfig.InfoOperateRecordConfig
       },
       metertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]

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

@@ -94,7 +94,6 @@
                                           condition="f_state in {} "
                                           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 class="col-sm-2 form-group">
                                 <label class="font_normal_body" title="参数名称:气表类型">气表类型</label>
                                 <v-select :value.sync="model.f_meter_style"
@@ -102,6 +101,8 @@
                                           condition="f_meter_style = '{}'"
                                           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>

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

@@ -3,7 +3,7 @@
         <div class="basic-main" @keyup.enter="search">
             <div class="flex" v-if="!show">
 
-                <criteria-paged :model="model" v-ref:paged>
+                <criteria-paged :model="model" v-ref:paged @sort="sort">
                     <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
                         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
                             <div class="row">
@@ -57,7 +57,7 @@
                             </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>
+                              <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"
@@ -74,19 +74,27 @@
                         <template partial='head'>
                             <tr>
                                 <th>
-                                    <nobr>客户编号</nobr>
+<!--                                    <nobr>客户编号</nobr>-->
+                                  <data-order field="f_userinfo_code" name="客户编号"
+                                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                                 </th>
                                 <th>
                                     <nobr>客户名称</nobr>
                                 </th>
                                 <th>
-                                    <nobr>档案编号</nobr>
+<!--                                    <nobr>档案编号</nobr>-->
+                                  <data-order field="f_userinfo_code" name="档案编号"
+                                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                                 </th>
                                 <th>
-                                    <nobr>旧地址</nobr>
+<!--                                    <nobr>旧地址</nobr>-->
+                                  <data-order field="f_address" name="旧地址"
+                                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                                 </th>
                                 <th>
-                                    <nobr>新地址</nobr>
+<!--                                    <nobr>新地址</nobr>-->
+                                  <data-order field="f_address_new" name="新地址"
+                                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                                 </th>
                                 <th>
                                     <nobr>旧表箱号</nobr>
@@ -95,7 +103,9 @@
                                     <nobr>新表箱号</nobr>
                                 </th>
                                 <th>
-                                    <nobr>操作日期</nobr>
+<!--                                    <nobr>操作日期</nobr>-->
+                                  <data-order field="f_operate_date" name="操作日期"
+                                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                                 </th>
                                 <th>
                                     <nobr>人员</nobr>
@@ -196,7 +206,12 @@
                 data: {},
                 other: [],
                 footer: [],
-                model: new PagedList('rs/sql/movemeterQuery', 20, {}),
+              //排序
+              orderitem:'f_operate_date desc',
+              orderFields: {
+                f_operate_date: 'no'
+              },
+                model: new PagedList('rs/sql/movemeterQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}),
                 criteriaShow: false,
                 // headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
                 // bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
@@ -330,7 +345,25 @@
                 })
                 this.modelval = sortModel
                 console.log('选择的打印的字段', this.modelval)
+            },
+          sort (field, rule) {
+            // 将所有排序方式设为不排序，实现相互排斥
+            for (let key in this.orderFields) {
+              if (key === field) {
+                this.orderFields[key] = rule
+              } else {
+                this.orderFields[key] = 'no'
+              }
             }
+            // 如果新规则不排序，还原为默认排序
+            if (rule === 'no') {
+              this.model.paramSource.orderitem = `'${this.orderitem}'`
+            } else {
+              this.model.paramSource.orderitem = `'${field} ${rule}'`
+            }
+
+            this.search()
+          }
         },
         watch: {
             'all'(val) {
@@ -353,7 +386,8 @@
         },
         computed: {
             getCondition() {
-                return {condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr}
+                return {condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr,
+                  orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
             },
             getfield() {
                 return exportConfig.movemeterConfig

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

@@ -6,32 +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="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="noBusinessQuery"
-                                template-name='非收费业务查询导出'
-                                :choose-col="true"></export-excel>
-
-                  <print-data :model="$parent.model" :field="$parent.$parent.getfield" :sum-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>
@@ -58,6 +32,29 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
                          condition="f_userinfo_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="noBusinessQuery"
+                                template-name='非收费业务查询导出'
+                                :choose-col="true"></export-excel>
+
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield" :sum-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"

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

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
-        <criteria-paged :model="model" v-ref:paged>
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
@@ -188,7 +188,9 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>客户编号</nobr>
+<!--                  <nobr>客户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="客户编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
                 <th>
                   <nobr>档案编号</nobr>
@@ -200,7 +202,9 @@
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-                  <nobr>客户地址</nobr>
+<!--                  <nobr>客户地址</nobr>-->
+                  <data-order field="f_address" name="客户地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
                 <th>
                   <nobr>客户电话</nobr>
@@ -243,7 +247,9 @@
                   <nobr>状态</nobr>
                 </th>
                 <th>
-                  <nobr>收费日期</nobr>
+<!--                  <nobr>收费日期</nobr>-->
+                  <data-order field="f_operate_date" name="收费日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
                 <th>
                   <nobr>服务人员</nobr>
@@ -419,7 +425,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0,hushu:0}),
+        model: new PagedList('rs/sql/otherChargeQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {f_money: 0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -429,6 +435,11 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_typename', 'f_typenumber', 'f_unitprice', 'f_number', 'f_money','f_operate_date', 'f_operator']
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         //默认打印列
         defaultfield: [],
         thead: '',
@@ -594,6 +605,24 @@
       },
       setTypenumber (val) {
         this.typenumberList = this.$appdata.getParam(val)
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
       }
     },
     watch: {
@@ -617,7 +646,9 @@
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
       },
       service_person() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]

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

@@ -5,27 +5,6 @@
         <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">
-                <res-select-group :style="'col-sm-2 form-group'" :show-component="$parent.$parent.showComponent" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <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 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="plotSummaryQuery"
-                                template-name='小区用户分布统计'
-                                :choose-col="true"></export-excel>
-
-                </div>
-              </div>
               <div class="row">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
@@ -60,6 +39,28 @@
 
                   </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="plotSummaryQuery"
+                                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 :style="'col-sm-2 form-group'" :show-component="$parent.$parent.showComponent" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
 
             </div>

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

@@ -7,9 +7,7 @@
           <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="['company', 'department', 'operator']"
-                                  :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>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -52,17 +50,9 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
+
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">扎帐状态</label>
-                  <v-select :value.sync="model.f_state" multiple
-                            title="参数: 扎帐状态查询"
-                            v-model="model.f_state"
-                            :options='$parent.$parent.state' placeholder='请选择'
-                            condition=" f_state in {}"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">操作日期</label>
+                  <label class="font_normal_body">操作&emsp;&emsp;日期</label>
                   <datepicker id="startOperDate" placeholder="开始日期" style="width:60%"
                               v-model="model.startOperDate"
                               :value.sync="model.startOperDate"
@@ -83,6 +73,18 @@
                   >
                   </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">扎帐状态</label>
+                  <v-select :value.sync="model.f_state" multiple
+                            title="参数: 扎帐状态查询"
+                            v-model="model.f_state"
+                            :options='$parent.$parent.state' placeholder='请选择'
+                            condition=" f_state in {}"
+                            close-on-select></v-select>
+                </div>
+                <res-select-group :show-component="['company', 'department', 'operator']"
+                                  :initres="$parent.$parent.initres"
+                                  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>

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

@@ -3,7 +3,7 @@
     <div class="basic-main">
       <div class="flex">
 
-        <criteria-paged :model="model" v-ref:paged>
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
@@ -63,7 +63,7 @@
                   :show-component="['company','department','operator']"
                     :initres="$parent.$parent.initres"
                     @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <div class="col-sm-2 ">
+                <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"
@@ -84,7 +84,9 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>用户编号</nobr>
+<!--                  <nobr>用户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="客户编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
                 <th>
                   <nobr>用户姓名</nobr>
@@ -93,7 +95,9 @@
                   <nobr>用户类型</nobr>
                 </th>
                 <th>
-                  <nobr>用气地址</nobr>
+<!--                  <nobr>用气地址</nobr>-->
+                  <data-order field="f_address" name="用气地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
                 <th>
                   <nobr>气表类型</nobr>
@@ -108,7 +112,9 @@
                   <nobr>操作员</nobr>
                 </th>
                 <th>
-                  <nobr>时间</nobr>
+<!--                  <nobr>时间</nobr>-->
+                  <data-order field="f_operate_date" name="时间"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
               </tr>
 
@@ -185,7 +191,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/privilegeQuery', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/privilegeQuery', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate',orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"},{
           f_privilege_gas:0,
           f_privilege_money:0
         }),
@@ -206,6 +212,11 @@
             'f_operator',
             'f_operate_date']
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         //默认打印列
         defaultfield: [],
         initres: {
@@ -311,6 +322,24 @@
         })
         this.modelval = sortModel
         console.log('选择的打印的字段', this.modelval)
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
       }
     },
     watch: {
@@ -337,7 +366,8 @@
           return {
             startDate: this.$refs.paged.$refs.cri.model.startDate,
             endDate: this.$refs.paged.$refs.cri.model.endDate,
-            condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+            condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+            orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
       },
       getfield() {
         return exportConfig.PrivilegeQuery

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

@@ -32,14 +32,9 @@
                             condition="f_payment in {}"
                             close-on-select></v-select>
                 </div>
-                <res-select-group :initres="$parent.$parent.initres"
-                                  @re-res="$parent.$parent.getRes"
-                                  :show-component="['company','operator']"
-                                  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"
@@ -53,13 +48,12 @@
                               :sum-field="$parent.$parent.getfield"
                               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>-->
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :show-component="['company','operator']" v-ref:sel></res-select-group>
+              </div>
             </div>
           </criteria>
 

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

@@ -195,11 +195,10 @@
               <tr>
                 <th>
                   <nobr>用户编号</nobr>
-                </th>
+<!--                  <data-order field="f_userinfo_code" name="用户编号">-->
+<!--                    :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>-->
+                  </th>
                 <th>
-                  <!--                  <nobr>客户编号</nobr>-->
-                  <!--                  <data-order field="f_userinfo_code" name=""-->
-                  <!--                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>-->
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
@@ -221,7 +220,9 @@
                   <nobr>收票人</nobr>
                 </th>
                 <th>
-                  <nobr>操作日期</nobr>
+<!--                  <nobr>操作日期</nobr>-->
+                  <data-order field="f_operate_date" name="操作日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
                 <th>
                   <nobr>收费类型</nobr>
@@ -230,7 +231,9 @@
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-                  <nobr>客户地址</nobr>
+<!--                  <nobr>客户地址</nobr>-->
+                  <data-order field="f_address" name="客户地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
                 <th>
                   <nobr>客户电话</nobr>