manage-client 3.2.83-2 → 3.2.83-jb

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

@@ -91,9 +91,7 @@
     <tabs header="团缴查询" v-if="permission('团缴查询')">
       <group-charge-query v-if="show.includes('团缴查询')" @deal-msg="dealMsg" :data="data"></group-charge-query>
     </tabs>
-    <tabs header="气费阶梯明细" v-if="permission('气费阶梯明细')">
-      <selling-charge-price v-if="show.includes('气费阶梯明细')" @deal-msg="dealMsg" :data="data"></selling-charge-price>
-    </tabs>
+
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

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 @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">
@@ -83,9 +83,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>
@@ -100,9 +98,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>
@@ -111,9 +107,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>
@@ -225,7 +219,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/CancellationQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}),
+        model: new PagedList('rs/sql/CancellationQuery', 20, {}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "操作人", "操作日期", "销户状态", "销户原因", "同步状态"],
         bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_sendsuccess"],
@@ -241,11 +235,6 @@
         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: '',
@@ -328,25 +317,6 @@
         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()
@@ -407,8 +377,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.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 @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">
@@ -110,9 +110,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>
@@ -139,9 +137,7 @@
                   <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>
@@ -256,12 +252,7 @@
     data() {
       return {
         data: {},
-        //排序
-        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"}, {
+        model: new PagedList('rs/sql/cardhandplanQuery', 20, {}, {
           f_real_amount: 0
         }),
         initres: {
@@ -389,24 +380,6 @@
         })
         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: {
@@ -424,8 +397,7 @@
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_input_date desc "}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       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 @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">
@@ -181,9 +181,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>
@@ -195,9 +193,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>
@@ -239,9 +235,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>
@@ -430,7 +424,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        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}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -445,11 +439,6 @@
         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,
@@ -597,25 +586,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) {
@@ -641,9 +612,7 @@
       //   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,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
         return exportConfig.changemeterConfig