manage-client 3.2.83-2 → 3.2.83-jb

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

@@ -3,10 +3,11 @@
     <div class="basic-main" @keyup.enter="search" v-if="!show">
       <div class="flex">
 
-        <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <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%"
@@ -32,6 +33,12 @@
                   <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" 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>
@@ -54,32 +61,7 @@
                 </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="handStartDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.handStartDate"
-                              :value.sync="model.handStartDate"
-                              :format="'yyyy-MM-dd 00:00:00'"
-                              :show-reset-button="true"
-                              condition="f_hand_date >= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.handEndDate"
-                              :value.sync="model.handEndDate"
-                              :format="'yyyy-MM-dd 23:59:59'"
-                              :show-reset-button="true"
-                              condition="f_hand_date <= '{}'">
-                  </datepicker>
-                </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>
-                  <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_meter_state"
@@ -136,7 +118,7 @@
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
                   <datepicker id="f_audit_date" placeholder="结束日期" style="width:60%"
                               v-model="model.auditEndDate"
                               :value.sync="model.auditEndDate"
@@ -146,6 +128,7 @@
                   </datepicker>
                 </div>
 
+
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -176,6 +159,27 @@
                             condition="f_price_name = '{}'"
                             close-on-select></v-select>
                 </div>
+
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">下发日期</label>
+                  <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.handStartDate"
+                              :value.sync="model.handStartDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true"
+                              condition="f_hand_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.handEndDate"
+                              :value.sync="model.handEndDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              condition="f_hand_date <= '{}'">
+                  </datepicker>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
                   <v-select :value.sync="model.f_meter_classify" multiple
@@ -313,9 +317,7 @@
             <template partial='head'>
               <tr>
                 <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>
                   <nobr>客户名称</nobr>
@@ -330,9 +332,7 @@
                   <nobr>表册片区</nobr>
                 </th>
                 <th>
-<!--                  <nobr>客户地址</nobr>-->
-                  <data-order field="f_address" name="客户地址"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>客户手机</nobr>
@@ -341,18 +341,14 @@
                   <nobr>表号</nobr>
                 </th>
                 <th>
-<!--                  <nobr>数据年月</nobr>-->
-                  <data-order field="ym_data" name="数据年月"
-                              :order.sync="$parent.$parent.$parent.orderFields.ym_data"></data-order>
+                  <nobr>数据年月</nobr>
                 </th>
                 <th>
-<!--                  <nobr>审核日期</nobr>-->
-                  <data-order field="f_audit_date" name="审核日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_audit_date"></data-order>
+                  <nobr>审核日期</nobr>
                 </th>
                 <th>
                   <nobr>上期底数</nobr>
-                </th>/
+                </th>
                 <th>
                   <nobr>本期底数</nobr>
                 </th>
@@ -384,35 +380,25 @@
                   <nobr>下账状态</nobr>
                 </th>
                 <th>
-<!--                  <nobr>收费时间</nobr>-->
-                  <data-order field="f_sellinggas_operate_date" name="收费时间"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_sellinggas_operate_date"></data-order>
+                  <nobr>收费时间</nobr>
                 </th>
                 <th>
                   <nobr>收费人员</nobr>
                 </th>
                 <th>
-<!--                  <nobr>冲正时间</nobr>-->
-                  <data-order field="f_corrhand_date" name="冲正时间"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_corrhand_date"></data-order>
+                  <nobr>冲正时间</nobr>
                 </th>
                 <th>
                   <nobr>冲正人员</nobr>
                 </th>
                 <th>
-<!--                  <nobr>下发日期</nobr>-->
-                  <data-order field="f_hand_date" name="下发日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></data-order>
+                  <nobr>下发日期</nobr>
                 </th>
                 <th>
-<!--                  <nobr>所属年月</nobr>-->
-                  <data-order field="belongmonth" name="所属年月"
-                              :order.sync="$parent.$parent.$parent.orderFields.belongmonth"></data-order>
+                  <nobr>所属年月</nobr>
                 </th>
                 <th>
-<!--                  <nobr>录入日期</nobr>-->
-                  <data-order field="f_input_date" name="录入日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
+                  <nobr>录入日期</nobr>
                 </th>
                 <th>
                   <nobr>气价名称</nobr>
@@ -743,9 +729,6 @@
    // self.loadMeterBooks()
     self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
-    self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
-
     // 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.$refs.paged.$refs.cri.search()
@@ -766,7 +749,7 @@
         other:[],
         footer:[],
         data: {},
-        model: new PagedList('rs/sql/handplanQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`' z '`}, {
+        model: new PagedList('rs/sql/handplanQuery', 20, {}, {
           f_oughtamount: 0,
           f_oughtfee: 0,
           f_debt_money: 0,
@@ -781,11 +764,6 @@
           f_haircut_gas: 0,
           alloughtfee:0
         }),
-        //排序
-        orderitem:' z ',
-        orderFields: {
-          f_userinfo_code: 'no'
-        },
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -1052,10 +1030,6 @@
           this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
-        if (this.$refs.paged.$refs.cri.model.handStartDate === ''|| this.$refs.paged.$refs.cri.model.handEndDate === '') {
-          this.$showMessage('请选择下发开始时间和下发结束时间!')
-          return
-        }
         this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
         if(this.area.length !== 0){
           let str = JSON.stringify(this.area)
@@ -1118,24 +1092,6 @@
         }
         this.thead += '</tr>'
       },
-      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()
-      },
       print() {
         this.$refs.print.PrintAsFile()
         this.printshow = false
@@ -1238,8 +1194,7 @@
         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,
-          orderitem: this.orderitem?`${this.orderitem}`: "  z "}
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
         return exportConfig.handplanConfig

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

@@ -39,18 +39,6 @@
                   <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>
@@ -290,7 +278,7 @@
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
-        return exportConfig.InfoOperateRecordConfig
+        return exportConfig.pricechangeRecordConfig
       },
       metertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]

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

@@ -94,6 +94,7 @@
                                           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"
@@ -101,8 +102,6 @@
                                           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 @sort="sort">
+                <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">
@@ -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,27 +74,19 @@
                         <template partial='head'>
                             <tr>
                                 <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>
                                     <nobr>客户名称</nobr>
                                 </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>
-<!--                                    <nobr>旧地址</nobr>-->
-                                  <data-order field="f_address" name="旧地址"
-                                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                                    <nobr>旧地址</nobr>
                                 </th>
                                 <th>
-<!--                                    <nobr>新地址</nobr>-->
-                                  <data-order field="f_address_new" name="新地址"
-                                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                                    <nobr>新地址</nobr>
                                 </th>
                                 <th>
                                     <nobr>旧表箱号</nobr>
@@ -103,9 +95,7 @@
                                     <nobr>新表箱号</nobr>
                                 </th>
                                 <th>
-<!--                                    <nobr>操作日期</nobr>-->
-                                  <data-order field="f_operate_date" name="操作日期"
-                                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                                    <nobr>操作日期</nobr>
                                 </th>
                                 <th>
                                     <nobr>人员</nobr>
@@ -206,12 +196,7 @@
                 data: {},
                 other: [],
                 footer: [],
-              //排序
-              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"}),
+                model: new PagedList('rs/sql/movemeterQuery', 20, {}),
                 criteriaShow: false,
                 // headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
                 // bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
@@ -345,25 +330,7 @@
                 })
                 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) {
@@ -386,8 +353,7 @@
         },
         computed: {
             getCondition() {
-                return {condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr,
-                  orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
+                return {condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr}
             },
             getfield() {
                 return exportConfig.movemeterConfig

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

@@ -6,6 +6,32 @@
           <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>
@@ -32,29 +58,6 @@
                   <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 @sort="sort">
+        <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">
@@ -188,9 +188,7 @@
             <template partial='head'>
               <tr>
                 <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>
                   <nobr>档案编号</nobr>
@@ -202,9 +200,7 @@
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-<!--                  <nobr>客户地址</nobr>-->
-                  <data-order field="f_address" name="客户地址"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>客户电话</nobr>
@@ -247,9 +243,7 @@
                   <nobr>状态</nobr>
                 </th>
                 <th>
-<!--                  <nobr>收费日期</nobr>-->
-                  <data-order field="f_operate_date" name="收费日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                  <nobr>收费日期</nobr>
                 </th>
                 <th>
                   <nobr>服务人员</nobr>
@@ -425,7 +419,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {f_money: 0,hushu:0}),
+        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -435,11 +429,6 @@
         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: '',
@@ -605,24 +594,6 @@
       },
       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: {
@@ -646,9 +617,7 @@
     },
     computed: {
       getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       service_person() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]

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

@@ -5,6 +5,27 @@
         <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>
@@ -39,28 +60,6 @@
 
                   </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>