manage-client 3.2.119 → 3.2.122

package/build/dev-server.js

@@ -13,9 +13,9 @@ var compiler = webpack(config)
 // 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://127.0.0.1:8090'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://61.150.94.253:8400'
+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.
@@ -81,7 +81,7 @@ var proxyTable = {
     target: 'http://127.0.0.1:8080'
   },
   '/rs': {
-    target: fuwu
+    target: bendi
   }
 }
 

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.122",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/SellReport/UserGasFillCard.vue

@@ -185,22 +185,22 @@
               汇总信息
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              卡费:&emsp;{{sumsmodel.cardfee.toFixed(1)}}
+              卡费:&emsp;{{sumsmodel.cardfee.toFixed(2)}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              合计方量:&emsp;{{sumsmodel.f_pregas.toFixed(1)}}
+              合计方量:&emsp;{{sumsmodel.f_pregas.toFixed(2)}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              小计:{{sumsmodel.xiaoji.toFixed(1)}}
+              小计:{{sumsmodel.xiaoji.toFixed(2)}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              现金收入:&emsp;{{(sumsmodel.xianjin-sumsmodel.cardfee).toFixed(1)}}
+              现金收入:&emsp;{{(sumsmodel.xianjin-sumsmodel.cardfee).toFixed(2)}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              转账收入:&emsp;{{sumsmodel.zhuanzhang.toFixed(1)}}&emsp;
+              转账收入:&emsp;{{sumsmodel.zhuanzhang.toFixed(2)}}&emsp;
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              合计金额:&emsp;{{(sumsmodel.f_preamount-sumsmodel.cardfee).toFixed(1)}}
+              合计金额:&emsp;{{(sumsmodel.f_preamount-sumsmodel.cardfee).toFixed(2)}}
             </td>
           </tr>
         </table>

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/businessquery/CollectManage.vue

@@ -90,6 +90,9 @@
     <tabs header="未抄表用户报表" v-if="permission('未抄表用户报表')">
       <unhand-business @deal-msg="dealMsg"></unhand-business>
     </tabs>
+    <tabs header="明细报表查询" v-if="permission('明细报表查询')">
+      <report-detail ></report-detail>
+    </tabs>
   </tab-button>
 
 </template>

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

@@ -248,6 +248,9 @@
                 <th>
                   <nobr>用气金额</nobr>
                 </th>
+                <th>
+                  <nobr>建档日期</nobr>
+                </th>
               </tr>
             </template>
             <template partial='body'>
@@ -332,6 +335,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtfee}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_createfile_date}}</nobr>
+              </td>
             </template>
             <template partial='foot'></template>
           </data-grid>

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

@@ -100,9 +100,12 @@
                 <th>
                   <nobr>系统金额</nobr>
                 </th>
+                <th>
+                  <nobr>扎帐归属开始时间</nobr>
+                </th>
                 <th>
                   <!--<nobr>扎帐归属时间</nobr>-->
-                  <data-order field="f_end_date" name="扎帐归属时间" :order.sync="$parent.$parent.$parent.orderFields.f_end_date"></data-order>
+                  <data-order field="f_end_date" name="扎帐归属结束时间" :order.sync="$parent.$parent.$parent.orderFields.f_end_date"></data-order>
                 </th>
                 <th>
                   <!--<nobr>操作时间</nobr>-->
@@ -135,6 +138,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_report_fee}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_start_date}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_end_date}}</nobr>
               </td>

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

@@ -0,0 +1,256 @@
+<template>
+  <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 partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              format="yyyy-MM-dd HH:mm:ss"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              format="yyyy-MM-dd HH:mm:ss"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
+                  'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="reportDetail"
+                                template-name='报表明细导出'
+                                :choose-col="true"></export-excel>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">支付流水号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_serial_id"
+                           condition="f_serial_id = '{}'" placeholder="支付流水号">
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">客户名称</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                           condition="f_user_name like '%{}%'" placeholder="客户名称">
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户电话</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                           placeholder="用户电话"  condition="f_user_phone='{}'">
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户地址</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                           placeholder="地址"  condition="f_address like '%{}%'">
+                  </div>
+                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :show-component="['company','department','operator']" v-ref:sel></res-select-group>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <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>
+                </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>
+                </th>
+                <th>
+                  <nobr>所属机构</nobr>
+                </th>
+                <th>
+                  <nobr>部门</nobr>
+                </th>
+                <th>
+                  <nobr>操作人</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">{{row.f_userinfo_code}}</td>
+              <td style="text-align: center;">{{row.f_user_name}}</td>
+              <td style="text-align: center;">{{row.f_address}}</td>
+              <td style="text-align: center;">{{row.f_user_phone}}</td>
+              <td style="text-align: center;">{{row.f_user_nature}}</td>
+              <td style="text-align: center;">{{row.f_meternumber}}</td>
+              <td style="text-align: center;">{{row.f_serial_id}}</td>
+              <td style="text-align: center;">{{row.f_type}}</td>
+              <td style="text-align: center;">{{row.f_brand_spec}}</td>
+              <td style="text-align: center;">{{row.f_typenumber}}</td>
+              <td style="text-align: center;">{{row.f_unitprice}}</td>
+              <td style="text-align: center;">{{row.f_number}}</td>
+              <td style="text-align: center;">{{row.f_collection}}</td>
+              <td style="text-align: center;">{{row.f_payment}}</td>
+              <td style="text-align: center;">{{row.f_operate_date}}</td>
+              <td style="text-align: center;">{{row.f_state}}</td>
+              <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
+              <td style="text-align: center;">{{row.f_depname}}</td>
+              <td style="text-align: center;">{{row.f_operator}}</td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+  /**
+   *档案查询列表以及添加操作组件
+   */
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  }
+
+  export default {
+    title: '报表明细',
+    data() {
+      return {
+        rows: null,
+        criteriaShow: false,
+        model: new PagedList('rs/sql/reportDetail', 20,
+          {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
+        orgCondtionStr: '',
+        getfield: '',
+        show:false,
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        defaultfield: []
+      }
+    },
+    ready() {
+      debugger
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        if (this.data) {
+          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
+          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+        }
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      cancel() {
+        this.show = false
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        //部门和人员变为全选
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj
+      }
+    },
+    watch: {
+
+    },
+    computed: {
+      getCondition() {
+        let result = {
+          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
+        }
+
+        return result
+      },
+      getfield() {
+        return exportConfig.reportDetailConfig
+      }
+    }
+  }
+</script>
+

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': '部门'
@@ -372,10 +372,15 @@ export default{
   fmygasConfig: {
     '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_price_value': '气价详情',
+    'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_meter_classify': '气表类型', 'f_price_value': '气价详情', 'f_createfile_date': '建档日期',
     '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': '气表类型',
@@ -661,7 +666,8 @@ export default{
   'f_operator': '操作员', 'f_operate_date': '时间', 'f_meternumber': '表号'
   },
   PrickBillConfig: {
-    'f_report_name': '报表名称', 'f_fee': '扎帐金额', 'f_report_fee': '系统金额', 'f_end_date': '扎帐归属时间',
+    'f_report_name': '报表名称', 'f_fee': '扎帐金额', 'f_report_fee': '系统金额',
+    'f_start_date': '扎帐归属开始时间', 'f_end_date': '扎帐归属结束时间',
     'f_operate_date': '操作时间', 'f_payment': '付款方式', 'f_state': '状态', 'f_orgname': '公司', 'f_depname': '部门',
     'f_operator': '操作员', 'f_remarks': '备注'
   },
@@ -1042,5 +1048,12 @@ export default{
     'itemname':'增值服务类型','yearstartdate':'上次购买时间','yearenddate':'本次购买时间',
     'f_orgname': '所属公司'
   },
+  reportDetailConfig: {
+    'f_userinfo_code': '用户编号', 'f_user_name': '用户名称', 'f_address': '用户地址', 'f_user_phone': '联系方式',
+    'f_user_nature': '用户类型', 'f_meternumber': '表号', 'f_serial_id': '支付流水号',
+    'f_type': '收费类型', 'f_brand_spec': '规格名称', 'f_typenumber': '型号', 'f_unitprice': '单价','f_number': '数量',
+    'f_collection': '收款', 'f_payment': '付款方式', 'f_operate_date': '收费日期', 'f_state': '状态',
+    'f_orgname': '所属机构', 'f_depname': '部门', 'f_operator': '操作人'
+  },
 }
 

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/shaoguan/config/exportConfig.js

@@ -163,7 +163,7 @@ export default{
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',
     'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费','f_actual_arrears':'实际欠费金额','alloughtfee':'已交气量合计',
-    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_rest_date': '所属年月'
+    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_rest_date': '所属年月','f_whether_pay':'是否缴费'
   },
   handplanprintConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户手机', 'f_meternumber': '表号','ym_data': '数据年月',

package/src/filiale/tongchuan/ChargeQuery.vue

@@ -180,9 +180,9 @@
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_id"
-                         condition="f_user_id = '{}'" placeholder='表编号'>
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>

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/src/saleManage.js

@@ -576,6 +576,8 @@ export default function (filiale) {
   Vue.component('handplan-info',(resolve) =>{ require(['./components/sale/businessquery/handplan-info'], resolve)})
   // 未抄表用户报表
   Vue.component('unhand-business',(resolve) =>{ require(['./components/sale/businessquery/UnhandBusiness'], resolve)})
+  // 报表明细
+  Vue.component('report-detail',(resolve) =>{ require(['./components/sale/businessquery/reportDetail'], resolve)})
   // 分公司选择新组件,默认全选
   Vue.component('res-select-new', (resolve) => { require(['./filiale/tongchuan/ResSelectNew'], resolve)})
   // 分公司特殊页面注册替换

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

@@ -1 +0,0 @@
-