manage-client 3.2.87 → 3.2.88

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

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search" v-if="!show">
       <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">
@@ -78,7 +78,8 @@
             <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>
@@ -108,7 +109,8 @@
                   <nobr>详情</nobr>
                 </th>
                 <th>
-                  <nobr>缴费日期</nobr>
+                  <!--<nobr>缴费日期</nobr>-->
+                  <data-order field="f_charge_date" name="缴费日期" :order.sync="$parent.$parent.$parent.orderFields.f_charge_date"></data-order>
                 </th>
 
                 <th>
@@ -244,7 +246,7 @@
         other:[],
         footer:[],
         data: {},
-        model: new PagedList('rs/sql/gaslossQuery', 20, {}, {
+        model: new PagedList('rs/sql/gaslossQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}, {
           f_collection: 0
         }),
         initres: {
@@ -265,6 +267,11 @@
         f_filialeid: this.$login.f.f_orgid,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_userinfo_code desc',
+        orderFields: {
+          f_userinfo_code: 'no'
+        },
         thead: '',
         tfoot: '',
         showupload:false,
@@ -432,6 +439,24 @@
           }
         })
         this.modelval = sortModel
+      },
+      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: {
@@ -494,6 +519,7 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
+          orderitem: this.orderitem,
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {

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

@@ -46,7 +46,7 @@
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
                                 :defaultselect="$parent.$parent.defaultexport"
-                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
+                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='团缴查询导出'
                                 :choose-col="true">
                   </export-excel>
 
@@ -107,7 +107,8 @@
                   <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>
@@ -134,7 +135,8 @@
                   <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>

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

@@ -140,6 +140,14 @@
                         close-on-select >
               </v-select>
             </div>
+            <div class="col-sm-2" >
+              <label  for="f_user_state" class="font_normal_body">客户状态</label>
+              <v-select :value.sync="model.f_user_state"
+                        v-model="model.f_user_state"
+                        :options='$parent.$parent.userstate' placeholder='请选择'
+                        condition="f_user_state = '{}'"
+                        close-on-select></v-select>
+            </div>
             <div class="col-sm-2 ">
               <label for="f_table_state"class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表状态</label>
               <v-select id="f_table_state"
@@ -201,6 +209,7 @@
             <th><nobr>档案编号</nobr></th>
             <th><nobr>表号</nobr></th>
             <th><nobr>客户名称</nobr></th>
+            <th><nobr>客户状态</nobr></th>
             <th><nobr>地址</nobr></th>
             <th><nobr>用户类型</nobr></th>
             <th><nobr>用气性质</nobr></th>
@@ -230,6 +239,7 @@
           <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
           <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
@@ -293,7 +303,8 @@
         filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+        getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+          "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
           "delivery_date":"最后购气日期",
           "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构"},
@@ -326,14 +337,16 @@
         if(val == '卡表') {
           this.url = 'rs/sql/inspectList_sellinggas'
           this.sqlName = 'inspectList_sellinggas'
-          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期",
             "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构"}
         }if(val == '物联网表'){
           this.url = 'rs/sql/getwulw_listgas'
           this.sqlName = 'getwulw_listgas'
-          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期",
             "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构"}
@@ -341,7 +354,8 @@
         if(val == '机表'){
           this.url = 'rs/sql/handinspectList_sellinggas'
           this.sqlName = 'handinspectList_sellinggas'
-          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后抄表日期",
             "sellcishu":"期间抄表次数","sellpregas":"期间抄表气量","f_orgname":"组织机构"}
@@ -478,6 +492,9 @@
       usertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
+      userstate() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('客户状态')]
+      },
       tablestate () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
       },

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

@@ -23,6 +23,14 @@
                         close-on-select >
               </v-select>
             </div>
+            <div class="col-sm-2" >
+              <label  for="f_user_state" class="font_normal_body">客户状态</label>
+              <v-select :value.sync="model.f_user_state"
+                        v-model="model.f_user_state"
+                        :options='$parent.$parent.userstate' placeholder='请选择'
+                        condition="f_user_state = '{}'"
+                        close-on-select></v-select>
+            </div>
             <div class="col-sm-2 flex-row" style="white-space: nowrap">
               <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)" >未购天数</label>
               <label class="font_normal_body" v-else>未抄天数</label>
@@ -35,17 +43,6 @@
               </div>
 
             </div>
-            <div class="col-sm-2 ">
-              <label class="font_normal_body">截止时间</label>
-              <datepicker id="endDate" placeholder="截止时间"
-                          v-model="model.endDate"
-                          style="width:60%"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
 
             <div class="span" style="float:right;">
               <button class="btn button_search" @click="search()">查询</button>
@@ -63,6 +60,28 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 ">
+              <label class="font_normal_body">起始时间</label>
+              <datepicker id="startDate" placeholder="起始时间"
+                          v-model="model.startDate"
+                          style="width:60%"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 ">
+              <label class="font_normal_body">截止时间</label>
+              <datepicker id="endDate" placeholder="截止时间"
+                          v-model="model.endDate"
+                          style="width:60%"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
             <div class="col-sm-2 ">
               <label for="f_meter_classify"class="font_normal_body">气表类型</label>
               <v-select id="f_meter_classify"
@@ -75,9 +94,8 @@
                         close-on-select >
               </v-select>
             </div>
-
             <div class="col-sm-2 ">
-              <label for="f_table_state"class="font_normal_body">&emsp;表状态</label>
+              <label for="f_table_state" class="font_normal_body">&emsp;表状态</label>
               <v-select id="f_table_state"
                         style="width:60%"
                         v-model="model.f_table_state"
@@ -88,28 +106,24 @@
                         close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-2 flex-row" style="white-space: nowrap" >
+            <div class="col-sm-2" >
               <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)">总购次数</label>
               <label class="font_normal_body" v-else>抄表次数</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.cishumin"
+                <input type="text" style="width:25%" class="input_search" v-model="model.cishumin"
                        condition="cishu >= {} " placeholder="">
                 <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.cishumax"
+                <input type="text" style="width:25%" class="input_search" v-model="model.cishumax"
                        condition="cishu <= {} " placeholder="">
-              </div>
             </div>
-            <div class="col-sm-2 flex-row" style="white-space: nowrap" >
+            <div class="col-sm-2">
               <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '卡表'">总购气量</label>
               <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '机表'">总用气量</label>
               <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '物联网表'">总购金额</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.pregasmin"
+                <input type="text" style="width:25%" class="input_search" v-model="model.pregasmin"
                        condition="pregas >= {} " placeholder="">
                 <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.pregasmax"
+                <input type="text" style="width:25%" class="input_search" v-model="model.pregasmax"
                        condition="pregas <= {} " placeholder="">
-              </div>
             </div>
 
             <div class="col-sm-2">
@@ -141,12 +155,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">
+            <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">
+            <div class="col-sm-2  form-group">
               <label class="font_normal_body">客户电话</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
                      condition="f_user_phone like '%{}%'" placeholder="客户电话">
@@ -166,7 +180,9 @@
             <th><nobr>档案编号</nobr></th>
             <th><nobr>表号</nobr></th>
             <th><nobr>客户名称</nobr></th>
+            <th><nobr>客户状态</nobr></th>
             <th><nobr>地址</nobr></th>
+            <th><nobr>建档日期</nobr></th>
             <th><nobr>用户类型</nobr></th>
             <th><nobr>用气性质</nobr></th>
             <th><nobr>表具状态</nobr></th>
@@ -194,7 +210,9 @@
           <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
           <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
@@ -251,11 +269,12 @@
         filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
+        getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称",
+          "f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址","f_createfile_date":"建档日期","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
           "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
           "diffday":"未购气总天数"},
-        model: new PagedList('rs/sql/inspectList', 50,{endDate:'this.model.endDate'},{pregas: 0}),
+        model: new PagedList('rs/sql/inspectList', 50,{startDate:'this.model.startDate',endDate:'this.model.endDate'},{pregas: 0}),
         rows: null,
         //orgid:'',
         show:false,
@@ -273,21 +292,27 @@
         if (val === '卡表') {
           this.model.url = this.url = 'rs/sql/inspectList'
           this.sqlName = 'inspectList'
-          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址",
+            "f_createfile_date":"建档日期","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
             "diffday":"累计未购气天数"}
         }else if (val === '机表') {
           this.model.url = this.url = 'rs/sql/handinspectList'
           this.sqlName = 'handinspectList'
-          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址",
+            "f_createfile_date":"建档日期","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后抄表日期","cishu":"总抄表次数","pregas":"抄表气量",
             "diffday":"累计未抄表天数"}
         } else if (val === '物联网表') {
           this.model.url = this.url = 'rs/sql/getWebMeterList'
           this.sqlName = 'getWebMeterList'
-          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址",
+            "f_createfile_date":"建档日期", "f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购金额",
             "diffday":"累计未购气天数"}
@@ -377,6 +402,7 @@
           if(key != 'startDate' && key != 'endDate')
             this.$refs.paged.$refs.cri.model[key] = []
         })
+        this.$refs.paged.$refs.cri.model.startDate =  this.$login.toStandardDateString()
         this.$refs.paged.$refs.cri.model.endDate =  this.$login.toStandardDateString()
       }
     },
@@ -387,6 +413,9 @@
       usertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
+      userstate() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('客户状态')]
+      },
       tablestate () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
       },
@@ -399,7 +428,8 @@
         let result = {
           condition: '',
           diffDay:' 1=1 ',
-          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate
         }
         result.condition = this.$refs.paged.$refs.cri.condition + this.filialeCodeStr
 

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

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
-        <criteria-paged :model="model"  v-ref:paged >
+        <criteria-paged :model="model"  v-ref:paged @sort="sort">
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-inline auto" partial>
               <div class="row">
@@ -107,18 +107,30 @@
           <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid :classname="$parent.classname">
             <template partial='head'>
               <tr>
-                <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>
+                </th>
                 <th><nobr>客户名称</nobr></th>
                 <th><nobr>档案编号</nobr></th>
                 <th><nobr>客户类型</nobr></th>
-                <th><nobr>客户地址</nobr></th>
+                <th>
+                  <!--<nobr>客户地址</nobr>-->
+                  <data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                </th>
                 <th><nobr>客户电话</nobr></th>
                 <th><nobr>气表类型</nobr></th>
                 <th><nobr>旧气价名称</nobr></th>
                 <th><nobr>新气价名称</nobr></th>
                 <th><nobr>变更类型</nobr></th>
-                <th><nobr>变更时间</nobr></th>
-                <th><nobr>执行时间</nobr></th>
+                <th>
+                  <!--<nobr>变更时间</nobr>-->
+                  <data-order field="f_operate_date" name="变更时间" :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                </th>
+                <th>
+                  <!--<nobr>执行时间</nobr>-->
+                  <data-order field="f_perform_date" name="执行时间" :order.sync="$parent.$parent.$parent.orderFields.f_perform_date"></data-order>
+                </th>
                 <th><nobr>变更操作员</nobr></th>
                 <th><nobr>是否同步成功</nobr></th>
                 <th><nobr>附件</nobr></th>
@@ -213,7 +225,7 @@ export default {
   title: '气价变更查询',
   data() {
     return {
-      model: new PagedList('rs/sql/priceDetailQuery', 30, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
+      model: new PagedList('rs/sql/priceDetailQuery', 30, {startDate: 'this.model.startDate', endDate: 'this.model.endDate',orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
       data: {},
       other:[],
       footer:[],
@@ -225,6 +237,11 @@ export default {
       printshow: false,
       all: false,
       fields: {},
+      //排序
+      orderitem:'f_userinfo_code desc',
+      orderFields: {
+        f_userinfo_code: 'no'
+      },
       initres: {
         org:[this.$login.f.orgid],
         dep:[],
@@ -260,7 +277,7 @@ export default {
     getPricenames() {
       this.price = []
       let priceArr = []
-      debugger
+      //debugger
       this.$MagGetSaleParam.prices.forEach((item) => {
         let temp = {}
         temp.label = item.f_price_name
@@ -363,6 +380,24 @@ export default {
       })
       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: {
@@ -392,7 +427,8 @@ export default {
       return {
         condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
         startDate: this.$refs.paged.$refs.cri.model.startDate,
-        endDate: this.$refs.paged.$refs.cri.model.endDate
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        orderitem:this.orderitem
       }
     },
     getfield() {

package/src/components/sale/businessquery/PrickBillQuery.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">
@@ -101,10 +101,12 @@
                   <nobr>系统金额</nobr>
                 </th>
                 <th>
-                  <nobr>扎帐归属时间</nobr>
+                  <!--<nobr>扎帐归属时间</nobr>-->
+                  <data-order field="f_end_date" name="扎帐归属时间" :order.sync="$parent.$parent.$parent.orderFields.f_end_date"></data-order>
                 </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>
@@ -201,12 +203,17 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/PrickBillQuery', 20),
+        model: new PagedList('rs/sql/PrickBillQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_end_date desc'`}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
         printshow: false,
         all: false,
+        //排序
+        orderitem:'f_end_date desc',
+        orderFields: {
+          f_end_date: 'no'
+        },
         fields: {},
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_last_balance', 'f_charge_money', 'f_pre_deduct_money', 'f_balance']
@@ -296,6 +303,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: {
@@ -320,7 +345,8 @@
     computed: {
       getCondition () {
         return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem:this.orderitem
         }
       },
       state () {