manage-client 3.2.83 → 3.2.86

package/build/dev-server.js

@@ -11,13 +11,13 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan='http://119.146.1.106:8300/'
-var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8090'
+var shaoguan='https://qnjtkf.cn:7400'
+var qtx='https://qnjtkf.cn:7400'
+var bendi = 'https://qnjtkf.cn:7400'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://192.168.50.4:8400'
+var fuwu = 'https://qnjtkf.cn:7400'
 // var fuwu = 'http://172.168.1.11:9001'
-var system = 'http://192.168.50.4:8400'
+var system = 'https://qnjtkf.cn:7400'
 //192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -78,7 +78,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
+    target: 'https://qnjtkf.cn:7400'
   },
   '/rs': {
     target: bendi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.83",
+  "version": "3.2.86",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/SellReport/ReportComponrnt/TieAnAccount.vue

@@ -231,7 +231,7 @@ export default {
       f_orgname: this.$login.f.orgs,
       f_depid: this.$login.f.depids,
       f_depname: this.$login.f.deps,
-      f_operatorid: this.$login.f.id,
+      f_operator_id: this.$login.f.id,
       f_operator: this.$login.f.name,
       f_remarks: '',
       reportstr: '',
@@ -260,7 +260,7 @@ export default {
         condition += ' and f_depid = ' + this.f_depid
       }
       if (this.config.isUser) {
-        condition += ' and f_operatorid = ' + this.f_operatorid
+        condition += ' and f_operator_id = ' + this.f_operator_id
       }
       this.condition = condition
       let querys= await this.$resetpost('rs/sql/PrickBillQuery?pageNo=1&pageSize=7',
@@ -282,7 +282,7 @@ export default {
         f_orgname: this.$login.f.orgs,
         f_depid: this.$login.f.depids,
         f_depname: this.$login.f.deps,
-        f_operatorid: this.$login.f.id,
+        f_operator_id: this.$login.f.id,
         f_operator: this.$login.f.name,
         data: {
           id: val.id,
@@ -426,7 +426,7 @@ export default {
           f_orgname: this.f_orgname,
           f_depid: this.f_depid,
           f_depname: this.f_depname,
-          f_operatorid: this.f_operatorid,
+          f_operator_id: this.f_operator_id,
           f_operator: this.f_operator,
           f_remarks: this.f_remarks,
           f_condition: condition + rs.name

package/src/components/sale/businessquery/BusinesQuery.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 >
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">

package/src/components/sale/businessquery/CancellationQuery.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">
@@ -83,7 +83,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>
@@ -98,7 +100,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>
@@ -107,7 +111,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>
@@ -219,7 +225,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/CancellationQuery', 20, {}),
+        model: new PagedList('rs/sql/CancellationQuery', 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_sendsuccess"],
@@ -235,6 +241,11 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         defaultfield: [],
         selected:{},
         tfoot: '',
@@ -317,6 +328,25 @@
         this.printshow = true
         this.put()
       },
+      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()
+      },
+
       put() {
         // 对Modelval进行排序
         this.sortModelval()
@@ -377,7 +407,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.CancellationConfig

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

@@ -1,8 +1,8 @@
 <template>
   <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
+    <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">
@@ -110,7 +110,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>
@@ -137,7 +139,9 @@
                   <nobr>余量</nobr>
                 </th>
                 <th>
-                  <nobr>录入日期</nobr>
+<!--                  <nobr>录入日期</nobr>-->
+                  <data-order field="f_hand_date" name="录入日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></data-order>
                 </th>
                 <th>
                   <nobr>抄表员</nobr>
@@ -252,7 +256,12 @@
     data() {
       return {
         data: {},
-        model: new PagedList('rs/sql/cardhandplanQuery', 20, {}, {
+        //排序
+        orderitem:'f_input_date desc',
+        orderFields: {
+          f_input_date : 'no'
+        },
+        model: new PagedList('rs/sql/cardhandplanQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_input_date desc"}, {
           f_real_amount: 0
         }),
         initres: {
@@ -380,6 +389,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: {
@@ -397,7 +424,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_input_date desc "}
       },
       getfield() {
         return exportConfig.cardhandplanConfig

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

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row"  >
     <div class="basic-main"  @keyup.enter="search" >
       <div class="flex"  :class="{showbottom:showbottomsum}" 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">
@@ -181,7 +181,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>
@@ -193,7 +195,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>
@@ -235,7 +239,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>
@@ -424,7 +430,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -439,6 +445,11 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         show:false,
         rowdata:{},
         showupload:false,
@@ -586,7 +597,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) {
@@ -612,7 +641,9 @@
       //   return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
       // },
       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.changemeterConfig

package/src/components/sale/businessquery/DisableQuery.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">
@@ -133,7 +133,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>
@@ -154,7 +156,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>
@@ -166,7 +170,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>
@@ -288,7 +294,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/disableQuery', 20, {}),
+        model: new PagedList('rs/sql/disableQuery', 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"],
@@ -302,6 +308,11 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_othereason', 'f_state', 'f_operate_date', 'f_operat_type', 'f_operator']
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         thead: '',
         showupload:false,
         selected:{},
@@ -424,7 +435,26 @@
         })
         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) {
@@ -447,7 +477,10 @@
     },
     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.disableConfig

package/src/components/sale/businessquery/EnableQuery.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">
@@ -115,7 +115,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>
@@ -127,7 +129,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>
@@ -139,7 +143,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>
@@ -250,7 +256,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/enableQuery', 20, {}),
+        model: new PagedList('rs/sql/enableQuery', 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"],
@@ -262,6 +268,11 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_enable_reason', 'f_othereason', 'f_state', 'f_operate_date', 'f_operat_type', 'f_operator']
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         //默认打印列
         defaultfield: [],
         initres: {
@@ -269,6 +280,7 @@
           dep: [],
           user: [],
         },
+
         show: false,
         rowdata: {},
         thead: '',
@@ -384,8 +396,27 @@
         })
         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) {
         if (val) {
@@ -407,7 +438,10 @@
     },
     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.enableConfig

package/src/components/sale/businessquery/FillCardQuery.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">
@@ -123,7 +123,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>
@@ -135,7 +137,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>
@@ -156,7 +160,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>
@@ -287,13 +293,18 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillCardQuery', 20, {}, {f_cardfees: 0,hushu:0}),
+        model: new PagedList('rs/sql/fillCardQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_cardfees: 0,hushu:0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费", "补卡日期", "人员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_idnumber', 'f_card_id', 'f_meter_brand', 'f_operate_date', 'f_cardfees', 'f_operator']
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         //默认打印列
         defaultfield: [],
         orgCondtionStr: '',
@@ -444,6 +455,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()
+      },
       async updateParams() {
         await this.$MagLoadParams.loadParam(this.f_filialeid)
         this.initParams()
@@ -478,7 +507,10 @@
     },
     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.fillcardConfig