sale-client 3.6.110 → 3.6.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.110",
+  "version": "3.6.111",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -91,7 +91,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.61",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.86",
+    "vue-client": "1.24.94",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -44,6 +44,13 @@
 
               <div style="float: right">
                 <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                              :field="$parent.$parent.getExportFields" :header="$parent.$parent.other"
+                              sqlurl="rs/logic/saleExport"
+                              :sql-name="$parent.$parent.isIot ? 'sale_WebChargeQuery' : 'sale_ChargeQuery'"
+                              template-name='用户收费查询导出'
+                              :choose-col="true">
+                </export-excel>
                 <print-data :defaultfield="$parent.$parent.defaultfield"
                             :field="$parent.$parent.isIot?$parent.$parent.iotFields:$parent.$parent.fields"
                             :is-selected="true" :model="$parent.$parent.printModel"
@@ -178,10 +185,10 @@
         <!--          应交合计:&emsp;{{model.sums.f_oughtfee}}-->
         <!--        </td>-->
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          气量合计:&emsp;{{model.sums.f_pregas}}
+          气量合计:&emsp;{{ sumsmodel.f_pregas}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          实收合计:&emsp;{{ model.sums.f_collection }}
+          实收合计:&emsp;{{ sumsmodel.f_collection }}
         </td>
       </tr>
     </table>
@@ -245,6 +252,9 @@ export default {
       radio: [],
       // 选中的页
       all: [],
+      other: [],
+      footer: [],
+      sumsmodel: {},
       // row数据
       rowsdata: [],
       fields: {
@@ -291,10 +301,25 @@ export default {
     this.$refs.paged.$refs.criteria.search()
   },
   methods: {
+    getotherfooter () {
+      this.other = []
+      this.footer = []
+      let otherInData = []
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+      let footerData = []
+      let exportfield = this.getExportFields
+      footerData.push('合计')
+      for (var field in this.sumsmodel) {
+        footerData.push(`${exportfield[field]}合计:${this.sumsmodel[field]}`)
+      }
+      this.footer.push(footerData)
+      this.other.push(otherInData)
+    },
     async search () {
       console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
       this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
       this.model.search(this.condition, this.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       let http = new HttpResetClass()
       let res = await http.load('POST', `${this.row.f_meter_type === '物联网表' ? 'rs/sql/sale_WebChargeQuery' : 'rs/sql/sale_ChargeQuery'}`, {
         data: {
@@ -419,7 +444,77 @@ export default {
       }
     }
   },
+  watch: {
+    'model.rows' (val) {
+      if (val.length === 0) {
+        this.sumsmodel = {}
+      }
+    },
+    'sumsmodel': {
+      handler: function (val) {
+        this.getotherfooter()
+      },
+      deep: true
+    }
+  },
   computed: {
+    getCondition () {
+      return {
+        condition: this.condition,
+        f_user_id: this.row.f_user_id
+      }
+    },
+    getExportFields () {
+      let fields
+      if (this.isIot) {
+        fields = {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'type': '收费类型',
+          'f_hand_date': '收费区间',
+          'f_meternumber': '表号',
+          'f_last_tablebase': '上期指数',
+          'f_tablebase': '本期指数',
+          'f_pregas': '气量',
+          'f_price': '气价',
+          'f_preamount': '气费金额',
+          'f_delaypay': '滞纳金',
+          'f_jianmian': '减免金额',
+          'f_balance': '上期结余',
+          'f_oughtfee': '应交金额',
+          'f_collection': '实收金额',
+          'f_curbalance': '本期结余',
+          'f_payment': '付款方式',
+          'f_operator': '操作员',
+          'f_operate_date': '缴费时间',
+          'f_state': '缴费状态',
+          'f_depname': '网点',
+          'f_comments': '备注'
+        }
+      } else {
+        fields = {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'type': '收费类型',
+          'f_meternumber': '表号',
+          'f_pregas': '气量',
+          'f_price': '气价',
+          'f_preamount': '气费金额',
+          'f_delaypay': '滞纳金',
+          'f_jianmian': '减免金额',
+          'f_balance': '上期结余',
+          'f_collection': '实收金额',
+          'f_curbalance': '本期结余',
+          'f_payment': '付款方式',
+          'f_operator': '操作员',
+          'f_operate_date': '缴费时间',
+          'f_state': '缴费状态',
+          'f_depname': '网点',
+          'f_comments': '备注'
+        }
+      }
+      return fields
+    },
     ischecked () {
       return function (index, i) {
         if (!this.radio[index]) {

package/src/components/revenue/comprehen/Bill/paper/BillList.vue

@@ -175,6 +175,10 @@
       },
       selfSearch (args) {
         args.condition = `${args.condition} and f_orgid like '${this.$login.f.orgid}%'`
+        console.log('看看此用户是否限制查询全部票据', this.$login.r.includes('限制查看全部票据'))
+        if (this.$login.r.includes('限制查看全部票据')) {
+          args.condition = `${args.condition} and f_bill_user = '${this.$login.f.name}'`
+        }
         console.log(args.condition)
         this.model.search(args.condition, args.model)
       },

package/src/components/revenue/machineHandManage/ArrearsQuery.vue

@@ -192,10 +192,10 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">欠费金额</label>
-                  <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_oughtfee_all_small"
-                         condition="f_oughtfee_all >= '{}' " placeholder="大于等于">
-                  <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_oughtfee_all_big"
-                         condition="f_oughtfee_all <= '{}' " placeholder="小于等于">
+                  <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_oughtfee_col_small"
+                         condition="f_oughtfee_col >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_oughtfee_col_big"
+                         condition="f_oughtfee_col <= '{}' " placeholder="小于等于">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">欠费期数</label>
@@ -299,6 +299,12 @@
                 <th>
                   <nobr>用气金额</nobr>
                 </th>
+                <th>
+                  <nobr>合计欠费</nobr>
+                </th>
+                <th>
+                  <nobr>实际欠费</nobr>
+                </th>
                 <th>
                   <nobr>缴费时间</nobr>
                 </th>
@@ -320,12 +326,6 @@
                 <th>
                   <nobr>上期余额</nobr>
                 </th>
-                <th>
-                  <nobr>合计欠费</nobr>
-                </th>
-                <th>
-                  <nobr>实际欠费</nobr>
-                </th>
                 <th>
                   <nobr>抄表员</nobr>
                 </th>
@@ -393,6 +393,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtfee}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_oughtfee_all}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_oughtfee_col}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
@@ -414,12 +420,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_balance}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_oughtfee_all}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_oughtfee_col}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_inputtor}}</nobr>
               </td>

package/src/components/revenue/machineHandManage/machineDown.vue

@@ -36,6 +36,13 @@
               <div class="span" style="float:right;">
                 <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getExportFields" :header="$parent.$parent.other"
+                              sqlurl="rs/logic/saleExport"
+                              sql-name="getDownPlan"
+                              template-name='抄表计划下发导出'
+                              :choose-col="true">
+                </export-excel>
                 <button class="button_search button_spacing"
                         @click="$parent.$parent.batchDownHand()">计划下发
                 </button>
@@ -603,6 +610,7 @@
         uploadText: '抄表',
         showerr: false,
         err: '',
+        other: [],
         // 请求对象(批量导入,查询进度使用)
         HttpReset: new HttpResetClass()
       }
@@ -616,6 +624,20 @@
       document.getElementById(this.inputid).focus()
     },
     methods: {
+      getotherfooter () {
+        this.other = []
+        // this.footer = []
+        let otherInData = []
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+        // let footerData = []
+        // let exportfield = this.getExportFields
+        // footerData.push('合计')
+        // for (var field in this.sumsmodel) {
+        //   footerData.push(`${exportfield[field]}合计:${this.sumsmodel[field]}`)
+        // }
+        // this.footer.push(footerData)
+        this.other.push(otherInData)
+      },
       // 获得本月的最后一天。
       getLastDayOfMonth (year, month) {
         let new_year = year    // 取当前的年份
@@ -1008,6 +1030,20 @@
       // },
     },
     computed: {
+      getExportFields () {
+        return {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'f_address': '用户地址',
+          'f_user_level': '用户等级',
+          'f_adjustable_name': '调压箱名称',
+          'f_inputtor': '抄表员',
+          'f_balance': '上期结余',
+          'f_meternumber': '表号',
+          'f_meter_base': '上期底数',
+          'f_book_name': '抄表册'
+        }
+      },
       getCondition () {
         // return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
         return {

package/src/filiale/lixianV3/UserInfoDetailManageNew.vue

@@ -0,0 +1,205 @@
+<template>
+  <div class="binary flex" >
+    <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
+      <div class="auto"><user-base-info-new :row="row" :buttonshow="buttonshow"  @cancel-main="cancel" @cancel-re="cancelRe"></user-base-info-new></div>
+      <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%;overflow-y: scroll">
+        <saletab header="流水查询" v-if="permission('流水查询')">
+          <record-query-user :row="row"></record-query-user>
+        </saletab>
+        <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
+          <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
+        </saletab>
+        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="累购查询" v-if="permission('累购查询')">
+          <Repurchase  :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
+        </saletab>
+        <saletab header="下账查询" v-if="!newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <automatic-purse  :row="row"   @deal-msg="dealMsg"></automatic-purse>
+        </saletab>
+        <saletab header="下账查询" v-if="newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <web-automatic-purse  :row="row"   @deal-msg="dealMsg"></web-automatic-purse>
+        </saletab>
+        <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
+        </saletab>
+        <saletab header="抄表记录" v-if="!row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
+        </saletab>
+        <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
+          <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
+        </saletab>
+        <saletab header="补气查询" v-if="permission('补气查询')">
+          <fill-gas-query-user  :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
+        </saletab>
+        <saletab header="换表查询" v-if="permission('换表查询')">
+          <change-meter-query-user  :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
+        </saletab>
+        <saletab header="其他收费" v-if="permission('其他收费')">
+          <other-charge-query-user  :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
+        </saletab>
+        <saletab header="过户查询" v-if="permission('过户查询')">
+          <transfer-query-user  :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
+        </saletab>
+        <saletab header="价格调整" v-if="permission('价格调整')">
+          <price-change-query-user  :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
+        </saletab>
+        <saletab header="附件查看" v-if="permission('附件查看')">
+          <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
+        </saletab>
+        <saletab header="变更记录" v-if="permission('变更记录')">
+          <change-record  :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
+        </saletab>
+        <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
+          <query-instruct  :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
+        </saletab>
+        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
+          <query-history-instruct  :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
+        </saletab>
+        <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
+          <watch-warning  :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
+        </saletab>
+        <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
+          <watch-collection  :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
+        </saletab>
+        <saletab header="调价补差" v-if="permission('调价补差')">
+          <price-adjustment-query-user  :row="row" v-if="show == '调价补差'" @deal-msg="dealMsg"></price-adjustment-query-user>
+        </saletab>
+        <saletab header="设备查询" v-if="permission('设备查询')">
+          <deveice-record  :row="row" v-if="show == '设备查询'" @deal-msg="dealMsg"></deveice-record>
+        </saletab>
+        <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
+          <meter-param  :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
+        </saletab>
+        <saletab header="表使用量图表" v-if="permission('流量计参数查看')">
+          <table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
+        </saletab>
+        <saletab header="用户设备查询"  v-if="permission('用户设备查看')">
+          <user-device-query :row="row" v-if="show == '用户设备查询'" @deal-msg="dealMsg"></user-device-query>
+        </saletab>
+      </saletabbut>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  // 导入IC卡相关查询界面
+  import ChangeMeterQueryUser from '../../components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser'
+  import ChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeQueryUser'
+  import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
+  import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
+  import HandQueryUser from './ic_detail/HandQueryUser'
+  import OtherChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/OtherChargeQueryUser'
+  import RecordQueryUser from '../../components/common/userinfo_detail/ic_detail/RecordQueryUser'
+  import TransferQueryUser from '../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
+  import CardHandRecord from '../../components/common/userinfo_detail/ic_detail/CardHandRecord'
+  import AutomaticPurse from '../../components/common/userinfo_detail/ic_detail/AutomaticPurse'
+  import Repurchase from '../../components/common/userinfo_detail/ic_detail/Repurchase'
+  import MachineRecordQuery from '../../components/common/userinfo_detail/ic_detail/MachineRecordQuery'
+  import WebAutomaticPurse from '../../components/common/userinfo_detail/ic_detail/WebAutomaticPurse'
+  import WebChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/WebChargeQueryUser'
+  // import WebHandQueryUser from '../../components/common/userinfo_detail/ic_detail/WebHandQueryUser'
+  import UserDeviceQuery from '../../components/common/userinfo_detail/ic_detail/UserDeviceQuery'
+
+  // 导入物联网相关查询
+  import QueryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryInstruct'
+  import QueryHistoryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryHistoryInstruct'
+  import WatchCollection from '../../components/common/userinfo_detail/iot_detail/WatchCollection'
+  import WatchWarning from '../../components/common/userinfo_detail/iot_detail/WatchWarning'
+  import PriceChangeQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceChangeQueryUser'
+  import ChangeRecord from '../../components/common/userinfo_detail/ic_detail/ChangeRecord'
+  import PriceAdjustmentQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser'
+  import MeterParam from '../../components/common/userinfo_detail/ic_detail/MeterParam'
+  import DeveiceRecord from '../../components/common/userinfo_detail/ic_detail/DeveiceRecord'
+export default {
+    title: '用户详细信息',
+    props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
+    components: {
+      PriceAdjustmentQueryUser,
+      PriceChangeQueryUser,
+      AutomaticPurse,
+      WebAutomaticPurse,
+      WebChargeQueryUser,
+      // WebHandQueryUser,
+      Repurchase,
+      ChangeMeterQueryUser,
+      ChargeQueryUser,
+      ChargeRecordQueryUser,
+      FillCardQueryUser,
+      HandQueryUser,
+      OtherChargeQueryUser,
+      RecordQueryUser,
+      TransferQueryUser,
+      WatchWarning,
+      WatchCollection,
+      QueryInstruct,
+      QueryHistoryInstruct,
+      ChangeRecord,
+      CardHandRecord,
+      MeterParam,
+      DeveiceRecord,
+      MachineRecordQuery,
+      UserDeviceQuery
+    },
+    data () {
+      return {
+        row: null,
+        name: '自动下账查询',
+        newWebHand: this.$appdata.getSingleValue('新抄表'),
+        show: ''
+      }
+    },
+    ready () {
+      this.search()
+      console.log(this.$login)
+    },
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '收费综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      },
+      async search () {
+        let http = new HttpResetClass()
+        let condition = ' 1 = 1'
+        if (this.f_userfiles_id) {
+          condition = `f_userfiles_id = '${this.f_userfiles_id}'`
+        } else if (this.f_userinfo_id) {
+          condition = `f_userinfo_id = '${this.f_userinfo_id}'`
+        } else if (this.f_userinfo_code) {
+          condition = `f_userinfo_code = '${this.f_userinfo_code}'`
+        }
+
+        let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
+          {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+        this.row = getBaseInfo.data[0]
+        this.row.parentname = this.parentname || ''
+      },
+
+      cancel (val) {
+        this.$emit('cancel-main', val)
+      },
+
+      cancelRe (val) {
+        this.$emit('cancel-re', val)
+      },
+
+      butOper (val) {
+        this.name = val
+      }
+    },
+    watch: {
+      'f_userinfo_id' () {
+        this.search()
+      }
+    }
+  }
+</script>

package/src/filiale/lixianV3/ic_detail/HandQueryUser.vue

@@ -0,0 +1,426 @@
+<template >
+  <div class="flex" style="justify-content: space-between;">
+    <div @keyup.enter="search" style="">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" title="归属日期" >开始时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="f_hand_date >= '{} 00:00:00' "
+                            placeholder="起始时间"
+                            style="width:60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body" title="归属日期">结束时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="f_hand_date <= '{} 23:59:59' "
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">是否缴费</label>
+                <v-select :value.sync="model.f_whether_pay" v-model='model.f_whether_pay'
+                          style="width:60%"
+                          :options='$parent.$parent.whetherpaies' placeholder='是否缴费'
+                          close-on-select
+                          condition="f_whether_pay = '{}'"></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" title="抄表状态">抄表状态</label>
+                <v-select :value.sync="model.f_meter_state" v-model='model.f_meter_state'
+                          style="width:60%"
+                          :options='$parent.$parent.meterstates' placeholder='抄表状态'
+                          close-on-select
+                          condition="f_meter_state = '{}'"></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" title="表单状态">表单状态</label>
+                <v-select :value.sync="model.f_hand_state" v-model='model.f_hand_state'
+                          style="width:60%"
+                          :options='$parent.$parent.handstates' placeholder='表单状态'
+                          close-on-select
+                          condition="f_hand_state = '{}'"></v-select>
+              </div>
+
+              <div style="float: right">
+                <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :footer="$parent.$parent.footer"
+                              :field="$parent.$parent.getExportFields"
+                              :header="$parent.$parent.other"
+                              sqlurl="rs/logic/saleExport"
+                              sql-name="sale_handplanLiXianV3"
+                              template-name='用户抄表记录导出'
+                              :choose-col="true">
+                </export-excel>
+                <print-data :defaultfield="$parent.$parent.defaultfield"
+                            :field="$parent.$parent.fields"
+                            :is-selected="true"
+                            :model="$parent.$parent.printModel"
+                            @print-data="$parent.$parent.print()"
+                            :starthead="$parent.$parent.starthead"
+                            titletable="抄表记录打印">
+                </print-data>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" class="list_area table_sy" partial='list' 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>
+              <th><nobr>表单状态</nobr></th>
+              <th><nobr>抄表员</nobr></th>
+              <th><nobr>录入员</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr>
+              <td style="text-align:center">{{row.f_hand_date.substring(0,7)}}</td>
+              <td style="text-align:center">{{row.datas}}</td>
+              <td style="text-align:center">{{row.f_hand_date}}</td>
+              <td style="text-align:center">{{row.f_input_date}}</td>
+              <td style="text-align:center">{{row.f_last_tablebase}}</td>
+              <td style="text-align:center">{{row.f_tablebase}}</td>
+              <td style="text-align:center">{{row.f_balance}}</td>
+              <td style="text-align:center">{{row.f_oughtamount}}</td>
+              <td style="text-align:center">{{row.f_oughtfee}}</td>
+              <td style="text-align:center">{{row.f_curbalance}}</td>
+              <td style="text-align:center">{{row.f_whether_pay}}</td>
+              <td style="text-align:center">{{row.f_stair1price}}</td>
+              <td style="text-align:center">{{row.f_stairamount1}}</td>
+              <td style="text-align:center">{{row.f_stair2price}}</td>
+              <td style="text-align:center">{{row.f_stair2amount}}</td>
+              <td style="text-align:center">{{row.f_stair3price}}</td>
+              <td style="text-align:center">{{row.f_stair3amount}}</td>
+              <td style="text-align:center">{{row.f_meter_state}}</td>
+              <td style="text-align:center">{{row.f_result_state}}</td>
+              <td style="text-align:center">{{row.f_hand_state}}</td>
+              <td style="text-align:center">{{row.f_inputtor}}</td>
+              <td style="text-align:center">{{row.f_input_person}}</td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+
+    </div>
+    <table class="table-hover">
+      <tr class="table-bordered" style="position: relative">
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+          汇总信息
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          用气量合计:&emsp;{{sumsmodel.f_oughtamount}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          用气金额合计:&emsp;{{sumsmodel.f_oughtfee}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          一阶用气量合计:&emsp;{{sumsmodel.f_stairamount1}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          一阶用气金额合计:&emsp;{{sumsmodel.f_stair1fee}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          二阶用气量合计:&emsp;{{sumsmodel.f_stair2amount}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          二阶用气金额合计:&emsp;{{sumsmodel.f_stair2fee}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          三阶用气金额合计:&emsp;{{sumsmodel.f_stair3amount}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          三阶用气金额合计:&emsp;{{sumsmodel.f_stair3fee}}
+        </td>
+      </tr>
+    </table>
+  </div>
+
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+  export default {
+    title: '抄表',
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('rs/sql/sale_handplanLiXianV3', 20, {f_user_id: this.row.f_user_id}, {
+          f_oughtfee: 0,
+          f_oughtamount: 0,
+          f_stairamount1: 0,
+          f_stair1fee: 0,
+          f_stair2amount: 0,
+          f_stair2fee: 0,
+          f_stair3amount: 0,
+          f_stair3fee: 0
+        }),
+        show: false,
+        other: [],
+        footer: [],
+        sumsmodel: {},
+        lists: [],
+        meterstates: this.$appdata.getParam('抄表状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')] : [],
+        handstates: this.$appdata.getParam('表单状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('表单状态')] : [],
+        // 控制单选
+        radio: [],
+        // 选中的页
+        all: [],
+        // row数据
+        rowsdata: [],
+        starthead: '',
+        fields: {
+          'f_userinfo_code': '用户编号',
+          'f_user_name': '姓名',
+          'f_last_tablebase': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_oughtamount': '用气量',
+          'f_oughtfee': '用气金额',
+          'f_detailprice': '结算明细',
+          'datas': '用气周期',
+          'f_oughtfee1': '应交金额',
+          'f_inputtor': '抄表员',
+          'f_input_date': '录入时间',
+          'f_whether_pay': '是否缴费',
+          'f_hand_date': '抄表时间'
+        },
+        defaultfield: [
+          'datas',
+          'f_last_tablebase',
+          'f_last_tablebase',
+          'f_oughtamount',
+          'f_oughtfee',
+          'f_oughtfee1'
+        ],
+        fooinfo: [
+          '单位',
+          '收款人'
+        ],
+        printModel: {
+          rows: []
+        }
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.model.f_hand_state = ['有效']
+      this.$refs.paged.$refs.criteria.search()
+      // this.sumgasandmoney= this.$refs.paged.$refs.grid.model.sums
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      for (let i in this.all) {
+        this.money += i.f_oughtamount
+        this.gas += i.f_oughtfee
+      }
+    },
+    methods: {
+      getotherfooter () {
+        this.other = []
+        this.footer = []
+        let otherInData = []
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+        let footerData = []
+        let exportfield = this.getExportFields
+        footerData.push('合计')
+        for (var field in this.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${this.sumsmodel[field]}`)
+        }
+        this.footer.push(footerData)
+        this.other.push(otherInData)
+      },
+      async search () {
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.model.search(this.condition, this.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'rs/sql/sale_handplanLiXianV3', {
+          data: {
+            condition: this.condition,
+            f_user_id: this.row.f_user_id
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.printModel.rows = res.data
+        this.starthead = '用户编号:' + this.row.f_userinfo_code + '&emsp;&emsp;用户姓名:' + this.row.f_user_name
+      },
+      // 多选框初始化
+      selectInit () {
+        this.rowsdata = []
+        this.all = []
+        this.radio = []
+      },
+      print () {
+        console.log('====================================')
+        console.log('print')
+        console.log(this.printModel)
+        this.selectInit()
+      },
+      select () {
+        let index = this.model.pageIndex - 1
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (this.all[index]) {
+          // 数据
+          this.rowsdata[index] = Object.assign([], this.model.rows)
+          // 勾选
+          for (let i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, true)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index] = []
+          // 不勾选
+          for (let i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, false)
+          }
+        }
+        let z = 0
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            this.printModel.rows[z++] = this.rowsdata[i][j]
+          }
+        }
+      },
+      selectOne (event, row, i) {
+        let index = this.model.pageIndex - 1
+        if (!this.rowsdata[index]) {
+          this.rowsdata[index] = []
+        }
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (event.target.checked) {
+          // 数据
+          this.rowsdata[index][i] = row
+          // 勾选
+          this.radio[index].$set(i, true)
+          // 判断是否全部选中
+          var allState = true
+          if (this.model.rows.length != this.radio[index].length) {
+            allState = false
+          }
+          for (var state of this.radio[index]) {
+            if (!state) {
+              allState = false
+            }
+          }
+          if (allState) {
+            this.all.$set(index, true)
+          } else {
+            this.all.$set(index, false)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index][i] = []
+          // 不勾选
+          this.radio[index].$set(i, false)
+          // 任意取消一个则全选状态设为false
+          this.all.$set(index, false)
+        }
+        let z = 0
+        this.printModel.rows = []
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
+              this.printModel.rows[z++] = this.rowsdata[i][j]
+            }
+          }
+        }
+      }
+    },
+    watch: {
+      'model.rows' (val) {
+        if (val.length === 0) {
+          this.sumsmodel = {}
+        }
+      },
+      'sumsmodel': {
+        handler: function (val) {
+          this.getotherfooter()
+        },
+        deep: true
+      }
+    },
+    computed: {
+      getCondition () {
+        return {
+          condition: this.condition,
+          f_user_id: this.row.f_user_id
+        }
+      },
+      getExportFields () {
+        return {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'f_hand_date': '抄表日期',
+          'f_input_date': '下发日期',
+          'f_last_tablebase': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_balance': '上期余额',
+          'f_oughtamount': '用气量',
+          'f_oughtfee': '用气金额',
+          'f_curbalance': '本期余额',
+          'f_whether_pay': '是否缴费',
+          'f_stair1price': '一阶单价',
+          'f_stairamount1': '一阶气量',
+          'f_stair1fee': '一阶用气金额',
+          'f_stair2price': '二阶单价',
+          'f_stair2amount': '二阶气量',
+          'f_stair2fee': '二阶用气金额',
+          'f_stair3price': '三阶单价',
+          'f_stair3amount': '三阶气量',
+          'f_stair3fee': '三阶用气金额',
+          'f_meter_state': '抄表状态',
+          'f_result_state': '抄表结果状态',
+          'f_hand_state': '表单状态',
+          'f_inputtor': '抄表员',
+          'f_input_person': '录入员'
+        }
+      },
+      whetherpaies () {
+        return [
+          {label: '全部', value: ''},
+          {label: '已缴费', value: '是'},
+          {label: '未缴费', value: '否'}
+        ]
+      },
+      ischecked () {
+        return function (index, i) {
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      }
+    }
+  }
+</script>
+

package/src/filiale/lixianV3/sale.js

@@ -1,6 +1,8 @@
 // 分公司特殊组件页面注册
 import Vue from 'vue'
+
 export default function () {
   // 换表 挪到公共 加配置了
   // Vue.component('machine-hand', (resolve) => { require(['./iotHand'], resolve) })
+  Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
 }