manage-client 3.2.83 → 3.2.86

package/src/components/sale/businessquery/ReverseQuery.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">
@@ -99,7 +99,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>
@@ -108,7 +110,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>
@@ -123,7 +127,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>
@@ -238,7 +244,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/reverseQuery', 20, {}, {f_pregas: 0, f_preamount: 0, f_collection: 0}),
+        model: new PagedList('rs/sql/reverseQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_pregas: 0, f_preamount: 0, f_collection: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
         initres: {
@@ -246,6 +252,11 @@
           dep:[],
           user:[],
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         show:false,
         rowdata:{},
         modelval: [],
@@ -371,6 +382,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: {
@@ -394,7 +423,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"}
       },
       getfield() {
         return exportConfig.reverseConfig

package/src/components/sale/businessquery/TransferQuery.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">
@@ -107,7 +107,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>
@@ -116,7 +118,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>
@@ -131,7 +135,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 @@
         footer:[],
         show:false,
         rowdata:{},
-        model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0,hushu:0}),
+        model: new PagedList('rs/sql/transferQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {f_transfer_fees: 0,hushu:0}),
         criteriaShow: false,
         initres: {
           org:[this.$login.f.orgid],
@@ -267,6 +273,11 @@
         config: {
           defaultPrint: ["f_userinfo_code", "f_newuser_name", "f_newuser_phone", "address", "f_state", "f_user_name","f_transfer_fees", "f_operate_date", "f_operator", "f_depname", "f_orgname"]
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         //默认打印列
         defaultfield: [],
         thead: '',
@@ -397,6 +408,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: {
@@ -420,7 +449,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"}
       },
       getfield() {
         return exportConfig.transferConfig

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

@@ -80,7 +80,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>
@@ -89,7 +91,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>
@@ -98,7 +102,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>
@@ -222,11 +228,13 @@
           dep:[],
           user:[],
         },
+        //排序
+        orderitem:'f_open_date desc',
         orderFields: {
-          f_address: 'no'
+          f_open_date: 'no'
         },
         orderDefault: "'f_open_date desc'",
-        model: new PagedList('rs/sql/overDueQuery', 20,{orderitem: "'f_open_date desc'"},{
+        model: new PagedList('rs/sql/overDueQuery', 20,{orderitem: this.orderitem?`${this.orderitem}`:"'f_open_date desc'"},{
           f_latefee_ought:0
         }),
         f_orgid: this.$login.f.orgid,
@@ -238,6 +246,7 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_latefee_ought', 'f_comments', 'f_operate_date', 'f_operator']
         },
+
         //默认打印列
         defaultfield: [],
         thead: '',
@@ -336,6 +345,7 @@
         val.model = this.model.model
         this.$dispatch('deal-msg', val)
       },
+
       stamp() {
         this.all = false
         //默认选择要打印的列
@@ -428,7 +438,8 @@
         con = `${this.$refs.paged.$refs.cri.condition} and f_orgid in ('${this.$login.f.orgid}' )`
       }
       return {
-        condition: con
+        condition: con,
+        orderitem: this.orderitem?`${this.orderitem}`: " f_open_date desc"
       }
     },
     getfield() {

package/src/components/sale/businessquery/priceadjustQuery.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-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
@@ -116,7 +116,9 @@
                   <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>
@@ -125,7 +127,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>
@@ -174,7 +178,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>
@@ -335,7 +341,12 @@
           dep:[],
           user:[]
         },
-        model: new PagedList('rs/sql/surplusQuery', 20, {}, {
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
+        model: new PagedList('rs/sql/surplusQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {
           f_real_amount: 0,
           f_surplus_fee: 0
         }),
@@ -464,6 +475,24 @@
         this.orgCondtionStr = condition
         this.orgname = obj.orgnames[0]
         this.depname = obj.depnames[0]
+      },
+      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()
       }
 
     },
@@ -486,7 +515,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.surplusConfig