manage-client 3.2.119 → 3.2.120

package/build/dev-server.js

@@ -1,176 +1,176 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// 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://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://61.150.94.253:8400'
-// var fuwu = 'http://203.57.101.233:9001'
-var system = 'http://192.168.50.4:8400'
-//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'
-var proxyTable = {
-  '/rs/logic/exportfile': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: bendi
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: fuwu
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// 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 bendi = 'http://172.168.1.11:9001'
+var fuwu = 'http://121.36.106.17:8400'
+// var fuwu = 'http://203.57.101.233:9001'
+var system = 'http://192.168.50.4:8400'
+//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'
+var proxyTable = {
+  '/rs/logic/exportfile': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

package/package.json

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

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

@@ -371,6 +371,9 @@
                 <th>
                   <nobr>卡号</nobr>
                 </th>
+                <th>
+                  <nobr>气价名称</nobr>
+                </th>
                 <th>
                   <nobr>购气次数</nobr>
                 </th>
@@ -565,6 +568,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_card_id}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_times}}</nobr>
               </td>

package/src/components/sale/config/exportConfig.js

@@ -87,7 +87,7 @@ export default{
   },
   chargeConfig: {
     'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
-    'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数',
+    'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数', 'f_price_name': '气价名称',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
     'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期', 'f_serial_id': '流水号',
     'f_delaypay': '滞纳金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
@@ -292,7 +292,7 @@ export default{
     'f_money': '收款', 'f_payment': '付款方式', 'f_state': '状态', 'f_operate_date': '收费日期'
   },
   cardhandplanConfig: {
-    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_meternumber': '表号',
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_real_amount': '用气量', 'f_total_gas': '总购气量',
     'f_yuliang': '余量', 'f_inputtor': '抄表员', 'f_hand_date': '下发日期', 'f_input_date': '录入日期',
     'f_meter_state': '抄表状态', 'f_operator': '操作员', 'f_depname': '部门'
@@ -376,6 +376,11 @@ export default{
     'f_pregas': '预购气量', 'f_preamount': '预购金额', 'f_collection': '实交金额', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
     'f_hand_number': '抄表次数', 'f_date': '抄表区间', 'f_input_day': '天数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_usetype': '使用类型'
   },
+  notgasConfig: {
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_credentials': '证件类型',
+    'f_idnumber': '证件号码', 'f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_residential_area': '小区',
+    'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_meter_classify': '气表类型','f_oughtamount': '用气量'
+  },
   handRateConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_address': '客户地址',
     'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_classify': '气表类型',

package/src/filiale/WEINAN/MeterQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" 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">
@@ -259,7 +259,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>
@@ -271,7 +272,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>
@@ -315,10 +317,12 @@
                     <nobr>通气人</nobr>
                   </th>
                   <th>
-                    <nobr>通气时间</nobr>
+                    <!--<nobr>通气时间</nobr>-->
+                    <data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
                   </th>
                   <th>
-                    <nobr>建表时间</nobr>
+                    <!--<nobr>建表时间</nobr>-->
+                    <data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
                   </th>
                   <th>
                     <nobr>气表状态</nobr>
@@ -512,7 +516,7 @@
         isSingleUser: null,
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
+        model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
 
@@ -520,6 +524,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_user_id,f_table_state desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
         thead: '',
         tfoot: '',
         initres: {
@@ -766,6 +775,24 @@
           })
         }
       },
+      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: {
       'model.rows.length' () {
@@ -854,7 +881,7 @@
         }
       },
       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() {
         let data = {}

package/src/filiale/gaomi/MeterQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" 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">
@@ -212,7 +212,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>
@@ -224,7 +225,11 @@
                     <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>
                   </th>
                   <th>
                     <nobr>表上余额</nobr>
@@ -265,10 +270,12 @@
                     <nobr>通气人</nobr>
                   </th>
                   <th>
-                    <nobr>通气时间</nobr>
+                    <!--<nobr>通气时间</nobr>-->
+                    <data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
                   </th>
                   <th>
-                    <nobr>建表时间</nobr>
+                    <!--<nobr>建表时间</nobr>-->
+                    <data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
                   </th>
                   <th>
                     <nobr>气表状态</nobr>
@@ -447,7 +454,7 @@
         isSingleUser: null,
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
+        model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
 
@@ -455,6 +462,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_user_id,f_table_state desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
         thead: '',
         tfoot: '',
         initres: {
@@ -674,6 +686,24 @@
           })
         }
       },
+      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: {
       'model.rows.length' () {
@@ -759,7 +789,7 @@
         }
       },
       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() {
         let data = {}

package/src/filiale/gongyi/sale/filesquery/MeterQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" 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">
@@ -195,7 +195,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>
                   </th>
                   <th>
                     <nobr>客户名称</nobr>
@@ -204,7 +204,7 @@
                     <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>
@@ -240,10 +240,10 @@
                     <nobr>通气人</nobr>
                   </th>
                   <th>
-                    <nobr>通气时间</nobr>
+                    <data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
                   </th>
                   <th>
-                    <nobr>建表时间</nobr>
+                    <data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
                   </th>
                   <th>
                     <nobr>气表状态</nobr>
@@ -384,7 +384,7 @@
       return {
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
+        model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
 
@@ -392,6 +392,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_user_id,f_table_state desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
         thead: '',
         tfoot: '',
         initres: {
@@ -549,6 +554,24 @@
         await this.$MagLoadParams.loadParam(this.f_filialeid)
         this.initParams()
       },
+      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) {
@@ -629,7 +652,7 @@
         }
       },
       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() {
         let data = {}

package/src/filiale/macheng/MeterQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" 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">
@@ -255,7 +255,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>
                   </th>
                   <th>
                     <nobr>客户名称</nobr>
@@ -267,7 +267,7 @@
                     <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>
@@ -496,7 +496,7 @@
         isSingleUser: null,
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
+        model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
 
@@ -504,6 +504,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_user_id,f_table_state desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
         thead: '',
         tfoot: '',
         initres: {
@@ -750,6 +755,24 @@
           })
         }
       },
+      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: {
       'model.rows.length' () {
@@ -835,7 +858,7 @@
         }
       },
       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() {
         let data = {}

package/src/filiale/meihekou/UserQuery.vue

@@ -56,6 +56,13 @@
                               condition="f_user_state = '{}'"
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户类型</label>
+                    <v-select :value.sync="model.f_user_type"
+                              v-model="model.f_user_type" condition="f_user_type = '{}'"
+                              :options='$parent.$parent.userTypes' placeholder='请选择'
+                              close-on-select></v-select>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人数&nbsp;&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_people_num"
@@ -756,6 +763,9 @@
         }
         return [{label: '全部', value: ''}, ...rs]
       },
+      userTypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
       userstates() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
       }

package/src/filiale/qingtongxia/MeterQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" 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">
@@ -219,7 +219,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>
                   </th>
                   <th>
                     <nobr>客户名称</nobr>
@@ -231,7 +231,7 @@
                     <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>
@@ -269,10 +269,10 @@
                     <nobr>通气人</nobr>
                   </th>
                   <th>
-                    <nobr>通气时间</nobr>
+                    <data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
                   </th>
                   <th>
-                    <nobr>建表时间</nobr>
+                    <data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
                   </th>
                   <th>
                     <nobr>气表状态</nobr>
@@ -447,7 +447,7 @@
         isSingleUser: null,
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
+        model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
 
@@ -455,6 +455,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_user_id,f_table_state desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
         thead: '',
         tfoot: '',
         initres: {
@@ -674,6 +679,24 @@
           })
         }
       },
+      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: {
       'model.rows.length' () {
@@ -759,7 +782,7 @@
         }
       },
       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() {
         let data = {}

package/src/filiale/tongchuan/MeterQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" 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">
@@ -266,7 +266,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>
                   </th>
                   <th>
                     <nobr>客户名称</nobr>
@@ -281,7 +281,7 @@
                     <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>
@@ -325,10 +325,10 @@
                     <nobr>通气人</nobr>
                   </th>
                   <th>
-                    <nobr>通气时间</nobr>
+                    <data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
                   </th>
                   <th>
-                    <nobr>建表时间</nobr>
+                    <data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
                   </th>
                   <th>
                     <nobr>气表状态</nobr>
@@ -512,7 +512,7 @@
         isSingleUser: null,
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
+        model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
 
@@ -520,6 +520,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_user_id,f_table_state desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
         thead: '',
         tfoot: '',
         initres: {
@@ -767,6 +772,24 @@
           })
         }
       },
+      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  getpcd(){
         let HttpReset = new HttpResetClass()
         console.log('开始获取区域')
@@ -840,7 +863,7 @@
           }
           this.updateParams()
         }
-      },
+      }
     },
     computed: {
       authArr () {
@@ -876,7 +899,7 @@
         }
       },
       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() {
         let data = {}

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-