manage-client 3.2.87 → 3.2.88-1

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 () {

package/src/components/sale/businessquery/SendbookQuery.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">
@@ -76,7 +76,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>
@@ -91,10 +92,12 @@
                                     <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>
+                                    <!--<nobr>发折日期</nobr>-->
+                                    <data-order field="f_send_date" name="发折日期" :order.sync="$parent.$parent.$parent.orderFields.f_send_date"></data-order>
                                 </th>
                                 <th>
                                     <nobr>人员</nobr>
@@ -185,13 +188,13 @@
     }
     export default {
         props:['data'],
-        title: '停用查询',
+        title: '发折查询',
         data() {
             return {
                 data: {},
                 other: [],
                 footer: [],
-                model: new PagedList('rs/sql/sendbookQuery', 20, {}),
+                model: new PagedList('rs/sql/sendbookQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
                 criteriaShow: false,
                 headData: ["客户编号", "客户名称", "操作人", "操作日期", "停用状态", "停用原因", "其他停用原因", "同步状态"],
                 bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
@@ -202,6 +205,11 @@
                 printshow: false,
                 all: false,
                 fields: {},
+                //排序
+                orderitem:'f_userinfo_code desc',
+                orderFields: {
+                  f_userinfo_code: 'no'
+                },
                 config: {
                     defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_othereason', 'f_state', 'f_operate_date', 'f_operat_type', 'f_operator']
                 },
@@ -327,6 +335,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: {
@@ -350,7 +376,7 @@
         },
         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}
             },
             getfield() {
                 return exportConfig.sendbookConfig

package/src/components/sale/businessquery/SuspiciousUserQuery.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">
@@ -110,7 +110,8 @@
                   <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>
@@ -128,7 +129,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>
@@ -146,13 +148,15 @@
                   <nobr>当前表购气量</nobr>
                 </th>
                 <th>
-                  <nobr>开户时间</nobr>
+                  <!--<nobr>开户时间</nobr>-->
+                  <data-order field="f_open_date" name="开户时间" :order.sync="$parent.$parent.$parent.orderFields.f_open_date"></data-order>
                 </th>
                 <th>
                   <nobr>最后购气量</nobr>
                 </th>
-              <th>
-                  <nobr>最后购气日期</nobr>
+                <th>
+                  <!--<nobr>最后购气日期</nobr>-->
+                  <data-order field="f_operate_date" name="最后购气日期" :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
               </tr>
             </template>
@@ -230,9 +234,14 @@ import {HttpResetClass, PagedList} from 'vue-client'
         other: [],
         footer: [],
         criteriaShow: false,
-        model: new PagedList('rs/sql/suspiciousUserQuery', 50, {}),
+        model: new PagedList('rs/sql/suspiciousUserQuery', 50, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
         orgCondtionStr: '',
         getfield: '',
+        //排序
+        orderitem:'f_userinfo_code desc',
+        orderFields: {
+          f_userinfo_code: 'no'
+        },
         show:false,
         rowdata:{},
         residentialArea: '',
@@ -380,6 +389,24 @@ import {HttpResetClass, PagedList} from 'vue-client'
         })
         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: {
@@ -404,7 +431,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
     computed: {
       getCondition() {
         let result = {
-          condition: ''
+          condition: '',
+          orderitem:this.orderitem
         }
         result.condition = this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
         return result

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

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search">
       <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">
@@ -80,17 +80,25 @@
               </div>
             </div>
           </criteria>
-
-          <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid :optional="true">
+          <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid>
             <template partial='head'>
-              <th><nobr>气价编号</nobr></th>
+              <th>
+                <!--<nobr>气价编号</nobr>-->
+                <data-order field="f_price_id" name="气价编号" :order.sync="$parent.$parent.$parent.orderFields.f_price_id"></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_perform_date" name="执行日期" :order.sync="$parent.$parent.$parent.orderFields.f_perform_date"></data-order>
+              </th>
+              <th>
+                <!--<nobr>截止日期</nobr>-->
+                <data-order field="f_end_date" name="截止日期" :order.sync="$parent.$parent.$parent.orderFields.f_end_date"></data-order>
+              </th>
               <th><nobr>版本号</nobr></th>
               <th><nobr>状态</nobr></th>
               <th><nobr>气价信息</nobr></th>
@@ -145,7 +153,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/gasPriceQuery', 20, {}, ),
+        model: new PagedList('rs/sql/gasPriceQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_price_id desc'`} ),
         criteriaShow: false,
         bodyData: ["f_userinfo_code", "f_user_name", "f_orgname", "f_depname", "f_operator"],
         orgCondtionStr: '',
@@ -155,6 +163,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_price_id desc',
+        orderFields: {
+          f_price_id: 'no'
+        },
         thead: '',
         tfoot: '',
         defaultfield: [],
@@ -310,6 +323,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: {
@@ -333,7 +364,7 @@
     },
     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}
       },
       getfield() {
         console.log('export',exportConfig.gasPriceConfig)

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

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search">
       <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">
@@ -116,7 +116,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>
@@ -125,7 +126,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>
@@ -140,10 +142,12 @@
                   <nobr>新价格</nobr>
                 </th>
                 <th>
-                  <nobr>原价执行日期</nobr>
+                  <!--<nobr>原价执行日期</nobr>-->
+                  <data-order field="oldprice_performdate" name="原价执行日期" :order.sync="$parent.$parent.$parent.orderFields.oldprice_performdate"></data-order>
                 </th>
                 <th>
-                  <nobr>新价执行日期</nobr>
+                  <!--<nobr>新价执行日期</nobr>-->
+                  <data-order field="newprice_performdate" name="新价执行日期" :order.sync="$parent.$parent.$parent.orderFields.newprice_performdate"></data-order>
                 </th>
                 <th>
                   <nobr>片区</nobr>
@@ -167,7 +171,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></th>
               </tr>
@@ -275,12 +280,17 @@
         //f_price_name:[],
         gasproperties:[],
         data: {},
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
           user:[]
         },
-        model: new PagedList('rs/sql/pricechangeRecordQuery', 20, {}, ),
+        model: new PagedList('rs/sql/pricechangeRecordQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`} ),
         criteriaShow: false,
         orgCondtionStr: '',
         // 下拉框
@@ -290,7 +300,7 @@
         sumsmodel: {},
         showupload:false,
         selected:{},
-        f_filialeid: this.$login.f.f_orgid,
+        f_filialeid: this.$login.f.f_orgid
       }
     },
     ready() {
@@ -372,6 +382,24 @@
           this.gasproperties =[{label: '全部', value: ''}]
         }
       },
+      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()
+      }
 
     },
     events:{
@@ -393,6 +421,7 @@
         return {
           operateDate: this.$refs.paged.$refs.cri.model.operateDate,
           performDate: this.$refs.paged.$refs.cri.model.performDate,
+          orderitem:this.orderitem,
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {

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

@@ -130,7 +130,7 @@
             </template>
             <template partial='body'>
               <td style="text-align: center;">
-                <nobr>{{row.f_userinfo_id}}</nobr>
+                <nobr>{{row.f_userinfo_code}}</nobr>
               </td>
               <td style="text-align: center;"><nobr>
                 <nobr>{{row.f_user_name}}</nobr>