sale-client 3.6.346 → 3.6.347

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Jul 26 10:19:09 CST 2024
+#Wed Jul 31 10:14:59 CST 2024
 gradle.version=5.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.346",
+  "version": "3.6.347",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/base/leftview/SafeCheck.vue

@@ -161,7 +161,16 @@
         </td>
       </tr>
     </table>
-
+    <table class="table table-striped table-bordered" v-if="model.f_notified_path=='' && model.f_notified_path==null">
+      <thead>
+      <tr>  <th colspan="4" style="text-align: center;background-color: #8cbce2;">隐患整改通知单</th></tr>
+      </thead>
+      <tr>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%" v-if="model.f_notified_path!='' && model.f_notified_path!=null">
+          <img-self :src="'rs/image/file/'+model.f_notified_path" style="float: left"  width="100" height="150"></img-self>
+        </td>
+      </tr>
+    </table>
 
     <table  class="table table-striped table-bordered" v-if="model.f_entry_status=='入户'  && model.datasource =='newos'">
       <thead>

package/src/components/revenue/base/leftview/Userinfo.vue

@@ -39,8 +39,8 @@
           <span class="col-sm-7">{{ data.f_sys_balance ? data.f_sys_balance : dafault.f_user_type }}</span>
         </div>
         <div class="row" :class="[config.f_idnumber ? 'highlight' : '']">
-          <label class="col-sm-5">证件号码</label>
-          <span class="col-sm-7" style="word-break: break-all">{{ data ? data.f_idnumber : dafault.f_idnumber }}
+          <label class="col-sm-5" style="color: brown">证件号码</label>
+          <span class="col-sm-7" style="word-break: break-all;color: brown">{{ data ? data.f_idnumber : dafault.f_idnumber }}
             <span v-if="data"
                   @click.stop="changeuseridnumber"
                   class="glyphicon glyphicon-pencil clickchange"
@@ -49,15 +49,15 @@
           </span>
         </div>
         <div class="row" :class="[config.f_user_phone ? 'highlight' : '']">
-          <label class="col-sm-5">客户电话</label>
-          <span class="col-sm-7">{{ data ? data.f_user_phone : dafault.f_user_phone }}
+          <label class="col-sm-5" style="color: brown">客户电话</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_user_phone : dafault.f_user_phone }}
             <span v-if="data" @click.stop="changeuserphone"
                   class="glyphicon glyphicon-pencil  clickchange" title="修正客户电话"></span>
           </span>
         </div>
         <div class="row">
-          <label class="col-sm-5">备用电话</label>
-          <span class="col-sm-7">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}
+          <label class="col-sm-5" style="color: brown">备用电话</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}
             <span v-if="data" @click.stop="changerentphone"
                   class="glyphicon glyphicon-pencil  clickchange" title="修正备用电话"></span>
           </span>
@@ -67,8 +67,8 @@
           <span class="col-sm-7">{{ data ? data.f_user_state : dafault.f_user_state }}</span>
         </div>
         <div class="row" :class="[config.f_comments ? 'highlight' : '']">
-          <label class="col-sm-5">备注信息</label>
-          <span class="col-sm-7">{{ data ? data.f_comments : dafault.f_comments }}
+          <label class="col-sm-5" style="color: brown">备注信息</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_comments : dafault.f_comments }}
             <span v-if="data" @click.stop="change_reason"
                   class="glyphicon glyphicon-pencil  clickchange" title="修改备注信息"></span>
           </span>

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -93,6 +93,7 @@
             <th>序号</th>
             <th>用户编号</th>
             <th>用户姓名</th>
+            <th>气表类型</th>
             <th>银行名称</th>
             <th>燃气方订单号</th>
             <th>银行方订单号</th>
@@ -109,6 +110,7 @@
           <td style="text-align: center;">{{$index+1}}</td>
           <td>{{row.f_userinfo_code}}</td>
           <td>{{row.f_user_name}}</td>
+          <td>{{row.f_meter_classify}}</td>
           <th>{{row.f_bank_name?row.f_bank_name:row.bankname}}</th>
           <td>{{row.f_serial_id}}</td>
           <td>{{row.f_trade_number}}</td>
@@ -170,7 +172,6 @@
 </template>
 <script>
   import { PagedList } from 'vue-client'
-  import AppData from '../../../../../stores/AppData'
   import Vue from 'vue'
 
   export default {
@@ -200,7 +201,6 @@
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
-        debugger
         if (!this.$refs.paged.$refs.cri.model.startDate) {
           this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString()
         }
@@ -234,25 +234,103 @@
       },
       // 微信单方账单，系统可缴费
       async charge (row) {
-        row.f_operator = Vue.$login.f.name,
-          row.f_operatorid = Vue.$login.f.id,
-          row.f_orgid = Vue.$login.f.orgid,
-          row.f_orgname = Vue.$login.f.orgs,
-          row.f_depid = Vue.$login.f.depids,
-          row.f_depname = Vue.$login.f.deps,
-          row.f_zoneid = Vue.$login.f.zoneid,
-          row.f_zones = Vue.$login.f.zones
-        let res = await this.$resetpost('rs/logic/cardOneBank', row, {resolveMsg: '缴费成功', rejectMsg: '缴费失败'})
-        let param = []
-        for (let row of this.resid) {
-          param.push({id: row.id})
-        }
-        let data = {
-          param: param,
-          f_blobid: res.data
-        }
+        console.log('单边账补缴：', row)
+        row.f_operator = Vue.$login.f.name
+
+        // 判断表类型
+        if (row.f_meter_classify === '气量卡表' || row.f_meter_classify === '金额卡表') {
+          console.log('卡表补缴')
+          // 查询用户信息，获取卡号和卡表厂商别名
+          const userInfo = await this.$resetpost('rs/sql/sale_getUser', {
+            data: {
+              orderitem: 'f_userinfo_code',
+              condition: `f_userinfo_code = '${row.f_userinfo_code}'`
+            }
+          }, {resolveMsg: null, rejectMsg: '获取卡表用户信息失败'})
+          const f_card_id = userInfo.data[0].f_card_id
+          const f_alias = userInfo.data[0].f_alias
+          // 先按照金额进行划价
+          const pricingParams = {
+            data: {
+              model: {
+                f_card_id: f_card_id,
+                f_alias: f_alias
+              },
+              value: row.f_total_charge,
+              isGasValue: 1
+            }
+          }
+          const pricingRes = await this.$resetpost('rs/logic/commonCal', pricingParams, {resolveMsg: null, rejectMsg: '卡表划价失败'})
+          console.log('卡表划价结果：', pricingRes)
+          const chargeLength = pricingRes.data.chargeprice.length
+          let gasFee = 0
+          let gasAmountApproved = 0
 
-        await this.$resetpost('rs/logic/updatefiles', data)
+          if (chargeLength === 1) {
+            gasFee = pricingRes.data.chargeprice[0].f_money
+            gasAmountApproved = pricingRes.data.chargeprice[0].f_gas
+          } else if (chargeLength === 2) {
+            gasFee = pricingRes.data.f_stair1fee + pricingRes.data.f_stair2fee
+            gasAmountApproved = pricingRes.data.oughtamount
+          } else if (chargeLength === 3) {
+            gasFee = pricingRes.data.f_stair1fee + pricingRes.data.f_stair2fee + pricingRes.data.f_stair3fee
+            gasAmountApproved = pricingRes.data.oughtamount
+          }
+          // 缴费
+          const cardSellParams = {
+            f_card_id: f_card_id,
+            f_pregas: gasAmountApproved,
+            f_preamount: gasFee,
+            f_totalcost: row.f_total_charge,
+            isGasValue: 1,
+            f_unit: 'yuan',
+            f_write_card: '未写卡',
+            f_payment: '银行',
+            f_bank_name: row.f_bank_name,
+            f_print: '普通收据',
+            f_operator: row.f_bank_name,
+            f_userinfo_code: row.f_userinfo_code,
+            f_userfiles_id: userInfo.data[0].f_userfiles_id,
+            f_user_id: userInfo.data[0].f_user_id,
+            f_filialeids: `('${row.f_filialeid}')`,
+            f_serial_id: row.f_trade_number,
+            f_collection: row.f_total_charge,
+            f_operate_date: row.delivery_date,
+            f_comments: `本次缴费由 ${row.f_operator} 进行单边账补缴操作`
+          }
+          const res = await this.$resetpost('rs/logic/thirdPay', cardSellParams, {resolveMsg: '补缴成功', rejectMsg: '补缴失败'})
+          console.log('缴费结果：', res)
+        } else {
+          const requestSellData = {
+            f_userinfo_code: row.f_userinfo_code,
+            f_filialeids: `('${row.f_filialeid}')`,
+            f_serial_id: row.f_trade_number,
+            f_userfiles_id: row.f_userfiles_id,
+            f_payment: '银行',
+            f_print: '普通收据',
+            f_collection: row.f_total_charge,
+            f_bank_name: row.f_bank_name,
+            f_unit: 'yuan',
+            f_operator: row.f_bank_name,
+            f_operate_date: row.delivery_date,
+            f_comments: `本次缴费由 ${row.f_operator} 进行单边账补缴操作`
+          }
+          let url = 'rs/logic/'
+
+          if (row.f_meter_classify === '机表') {
+            console.log('机表补缴')
+            url += 'machinePay'
+          } else if (row.f_meter_classify === '物联网表') {
+            console.log('物联网表补缴')
+            url += 'iotPay'
+            requestSellData.f_preamount = row.f_total_charge
+            requestSellData.f_totalcost = row.f_total_charge
+          } else {
+            this.$showAlert('气表类型错误，无法进行补缴', 'warning', 3000)
+          }
+          const res = await this.$resetpost(url, requestSellData, {resolveMsg: '补缴成功', rejectMsg: '补缴失败'})
+          console.log('缴费结果：', res)
+        }
         this.$refs.paged.$refs.cri.search()
       }
         // })

package/src/filiale/zhongyi/HandQueryUser.vue

@@ -0,0 +1,389 @@
+<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>
+                <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>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.fields"
+                              sqlurl="rs/logic/saleExport" sql-name="sale_HandplanQuery" template-name='抄表查询'
+                              v-ref:exports
+                              :choose-col="true">
+
+                </export-excel>
+              </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 v-show="false"><nobr>抄表月份</nobr></th>
+              <th v-show="false"><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 v-if="!row.f_meter_type.includes('物联网表')"><nobr>是否缴费 </nobr></th>
+              <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>一阶单价 </nobr></th>
+              <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>一阶气量 </nobr></th>
+              <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>二阶单价 </nobr></th>
+              <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>二阶气量 </nobr></th>
+              <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>三阶单价 </nobr></th>
+              <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><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" v-show="false">{{row.f_hand_date.substring(0,7)}}</td>
+              <th v-show="false"><nobr >{{row.datas}}</nobr></th>
+              <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" v-if="!row.f_meter_type.includes('物联网表')">{{row.f_whether_pay}}</td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair1price}}</td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stairamount1}}</td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair2price}}</td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair2amount}}</td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair3price}}</td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair3amount}}</td>
+              <td style="text-align:center">{{row.f_meter_state}}</td>
+              <td style="text-align:center">{{row.f_result_state?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;{{model.sums.f_oughtamount}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          用气金额合计:&emsp;{{model.sums.f_oughtfee}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
+          一阶用气量合计:&emsp;{{model.sums.f_stairamount1}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
+          一阶用气金额合计:&emsp;{{model.sums.f_stair1fee}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
+          二阶用气量合计:&emsp;{{model.sums.f_stair2amount}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
+          二阶用气金额合计:&emsp;{{model.sums.f_stair2fee}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
+          三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
+          三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}
+        </td>
+        <!--<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
+          <!--欠费气量合计:&emsp;{{model.sums.f_totalowe_gas}}-->
+        <!--</td>-->
+<!--        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
+<!--          欠费金额合计:&emsp;{{model.sums.f_qianfei_fee}}-->
+<!--        </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_HandplanQuery', 20, {f_user_id: this.row.f_user_id}, {
+          f_oughtfee: 0,
+          f_oughtamount: 0,
+          f_qianfei_fee: 0,
+          f_stairamount1: 0,
+          f_stair1fee: 0,
+          f_stair2amount: 0,
+          f_stair2fee: 0,
+          f_stair3amount: 0,
+          f_stair3fee: 0
+        }),
+        show: false,
+        lists: [],
+        meterstates: this.$appdata.getParam('抄表状态') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('抄表状态')] : [],
+        handstates: this.$appdata.getParam('表单状态') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('表单状态')] : [],
+        // 控制单选
+        radio: [],
+        // 选中的页
+        all: [],
+        // row数据
+        rowsdata: [],
+        f_calculation: '',
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
+        starthead: '',
+        fields: {'f_userinfo_code': '用户编号',
+          'f_user_name': '姓名',
+          'f_last_tablebase': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_balance': '上期余额',
+          'f_curbalance': '本期余额',
+          'f_oughtamount': '用气量',
+          'f_oughtfee': '用气金额',
+          'f_qianfei_fee': '欠费金额合计',
+          'f_detailprice': '结算明细',
+          'datas': '用气周期',
+          'money1': '违约金',
+          'f_stair1price': '一阶单价',
+          'f_stairamount1': '一阶用量',
+          'f_stair2price': '二阶单价',
+          'f_stair2amount': '二阶用量',
+          'f_stair3price': '三阶单价',
+          'f_stair3amount': '三阶用量',
+          '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', 'money1', 'price1'
+        ],
+        fooinfo: [
+          '单位',
+          '收款人'
+        ],
+        printModel: {
+          rows: []
+        }
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.model.f_hand_state = ['有效']
+      this.f_calculation = this.row.f_calculation
+      this.$refs.paged.$refs.criteria.search()
+      // this.sumgasandmoney= this.$refs.paged.$refs.grid.model.sums
+      for (let i in this.all) {
+        this.money += i.f_oughtamount
+        this.gas += i.f_oughtfee
+      }
+    },
+    methods: {
+      // search() {
+      //   this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
+      //   this.model.search(this.condition, this.model)
+      // },
+      async search () {
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
+        this.model.search(this.condition, this.model)
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'rs/sql/sale_HandplanQuery', {
+          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 + '&emsp;&emsp;用户地址:' + this.row.f_address
+      },
+      // 多选框初始化
+      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 (var i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, true)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index] = []
+          // 不勾选
+          for (var 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]
+            }
+          }
+        }
+      }
+    },
+    computed: {
+      getCondition () {
+        return {
+          condition: this.condition,
+          f_user_id: this.row.f_user_id
+        }
+      },
+      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/zhongyi/HandplanQuery.vue

@@ -72,9 +72,9 @@
                                 sqlurl="rs/logic/saleExport" sql-name="salehandplanQuery" template-name='抄表查询导出'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="抄表查询打印"
-                              titletable="抄表查询"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                              :defaultfield="$parent.$parent.defaultfield" print-name="机表数据"
+                              titletable="机表数据"
+                              :sumsmodel="$parent.$parent.printsumsmodel"></print-data>
 
                   <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>
                 </div>
@@ -1095,6 +1095,12 @@
       banklist() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('银行名称')]
       },
+      printsumsmodel(){
+        let param = {}
+        param.f_oughtamount = this.sumsmodel.f_oughtamount
+        param.f_oughtfee = this.sumsmodel.f_oughtfee
+        return param
+      },
       getCondition() {
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,

package/src/filiale/zhongyi/UserInfoDetailManageNew.vue

@@ -0,0 +1,218 @@
+<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"
+        @search-main="search"></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="!newWebHand && !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="newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <web-hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></web-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>
+        <saletab header="合同查看"  v-if="permission('合同查看')">
+          <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
+        </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 './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 contractSigningList from '../../components/common/userinfo_detail/ic_detail/contractSigningList'
+
+  // 导入物联网相关查询
+  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,
+      contractSigningList
+    },
+    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/zhongyi/sale.js

@@ -39,4 +39,7 @@ export default function () {
   Vue.component('meter-message', (resolve) => { require(['./Common/MeterMessage'], resolve) })
   // 当前选择用户的表具基本信息
   Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
+
+  // Vue.component('limit-gas-manages', (resolve) => { require(['./LimitGasManage'], resolve) })
+  Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
 }