sale-client 3.6.172 → 3.6.173

package/package.json

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

package/src/components/chargeBatch/CardList.vue

@@ -71,7 +71,7 @@
                        <a @click.stop="$parent.$parent.$parent.operate('票据明细', row)" href="#">票据明细打印</a>
                     </li>
                     <li
-                      v-if="(row.type === '批量收费'||row.type === '团体收费' || row.type === '迁表' || row.type === '拆表' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '其他收费'|| row.type === '气费减免'||row.type === '维修收费' || row.type === '过户' || row.type === '换新表' || row.type === '气表清零' || row.type === '机表收费' || row.type === '超用收费' || row.type === '其他收费' || row.type === '补卡'|| row.type === '调价补费'|| row.type=='预存缴费' || row.type==='卡表赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='物联网赠气')||row.type==='气损收费'">
+                      v-if="(row.type === '批量收费'||row.type === '团体调价补费' || row.type === '迁表' || row.type === '拆表' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '其他收费'|| row.type === '气费减免'||row.type === '维修收费' || row.type === '过户' || row.type === '换新表' || row.type === '气表清零' || row.type === '机表收费' || row.type === '超用收费' || row.type === '其他收费' || row.type === '补卡'|| row.type === '调价补费'|| row.type=='预存缴费' || row.type==='卡表赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='物联网赠气')||row.type==='气损收费'">
                       <a @click.stop="$parent.$parent.$parent.operate('撤销', row)" href="#">撤销</a>
                     </li>
                     <li v-else>
@@ -133,7 +133,7 @@
                 <advance-delivery-detail :data="row" v-if="row.type ==='卡表预交' "></advance-delivery-detail>
                 <machinemetercenter-detail :data="row" v-if="row.type === '预存缴费'"></machinemetercenter-detail>
                 <gasloss-detail :data="row" v-if="row.type === '气损收费'"></gasloss-detail>
-                <batch-charge-detail :data="row" v-if="row.type === '批量收费' || row.type === '团体收费' || row.type === '团体退费' || row.type === '团体补费' || row.type === '团体扣费'"></batch-charge-detail>
+                <batch-charge-detail :data="row" v-if="row.type === '批量收费'|| row.type === '团体调价补费'|| row.type === '团体调价补费撤销'  || row.type === '团体收费' || row.type === '团体退费' || row.type === '团体补费' || row.type === '团体扣费'"></batch-charge-detail>
               </div>
               <div style="margin-top: 8px;background: #FFF;" v-if="!$parent.$parent.$parent.isSelected(row)">
                 <span>{{row.f_describe}}</span>

package/src/components/chargeBatch/RecordCancel.vue

@@ -270,6 +270,8 @@
           name = 'gasLossCancel'
         } else if (type === '批量收费' || type === '团体收费') {
           name = 'batchPaymentCancel'
+        } else if (type === '团体调价补费') {
+          name = 'batchAddCancel'
         } else {
           return
         }

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackListList.vue

@@ -27,6 +27,7 @@
                      v-model="model.f_user_phone">
             </div>
             <div class="form-group col-sm-3 button-range" style="padding-right: 10px">
+              <import-excel v-if="$parent.$parent.blackImport === '黑名单导入'" template-name="黑名单用户导入模板" logic-name="BlackListImport" import-json="blacklist.json"></import-excel>
               <button @click="$parent.$parent.search()" class="button_search button_spacing" style="width:80px;margin-left:30px;" v-el:cx>查询</button>
               <button @click="$parent.$parent.add()" class="button_export button_spacing" style="width: max-content;"
                       v-el:cx>新增黑名单
@@ -170,6 +171,7 @@
           user: []
         },
         criteriaShow: false,
+        blackImport: '',
         model: new PagedList('rs/sql/sale_getBlackList', 20),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
@@ -196,9 +198,15 @@
       ispartial: false
     },
     ready () {
+      this.getAuthority()
       this.search()
     },
     methods: {
+      getAuthority () {
+        if (this.$login.r.find(value => value == '黑名单导入')) {
+          this.blackImport = '黑名单导入'
+        }
+      },
       async getRes (condition, obj) {
         console.log('condition =', condition)
         console.log('obj =', obj)

package/src/filiale/gehua/PriceChangeCompensation/GroupCompensation.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="auto">
+    <surplus-record-detail :row.sync="row" :civill.sync="civill"></surplus-record-detail>
+    <group-jb-compensation  :row.sync="row" :civill="civill"></group-jb-compensation>
+  </div>
+</template>
+<script>
+  import GroupJbCompensation from './GroupJbCompensation'
+  import SurplusRecordDetail from './SurplusRecordDetail'
+
+  export default {
+    components: {GroupJbCompensation,SurplusRecordDetail},
+    title: '团缴调价补差',
+    data () {
+      return {
+      }
+    },
+    props: ['row', 'civill'],
+    ready () {
+    }
+  }
+</script>

package/src/filiale/gehua/PriceChangeCompensation/GroupJbCompensation.vue

@@ -0,0 +1,368 @@
+<template>
+  <div class="flex-row">
+    <div class="span" style="overflow-y: auto;">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <div class="row">
+            <div class="col-sm-4">
+              <label class=" font_normal_body">团体调价补差</label>
+              <v-select v-model="f_compensation_type"
+                        placeholder='请选择'
+                        :value-single="true"
+                        :value.sync="model.f_compensation_type"
+                        :options='compensationTypes'
+                        close-on-select clear-button></v-select>
+            </div>
+            <div class="col-sm-4">
+              <label class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
+              <v-select v-model="f_payment"
+                        placeholder='请选择'
+                        :value.sync="model.f_payment"
+                        :options='paytype'
+                        close-on-select clear-button></v-select>
+            </div>
+            <div class="col-sm-4" :class="[$v.printstyle.required ? 'select-error' : '']">
+              <label for="f_print" class="font_normal_body">打印格式</label>
+              <input type="text" v-show="false" v-model="$refs.printstyle.selectedItems"
+                     v-validate:printstyle='{required: true }'>
+              <v-select id="print"
+                        v-model="f_print"
+                        placeholder='请选择'
+                        :multiple="mulPrint"
+                        :value.sync="model.f_print"
+                        :options='printstyle'
+                        close-on-select clear-button v-ref:printstyle>
+              </v-select>
+            </div>
+          </div>
+          <div class="row" style="margin-top:6px;">
+            <div class="col-sm-8">
+              <label for="f_comments" class="font_normal_body">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+              <input class="input_search" style="width:80%" v-model="model.f_comments" rows="1" placeholder="备注">
+            </div>
+            <div class="col-sm-4"
+                 :class="[$v.f_preamount.required  || $v.f_preamount.dctest ? 'has-error' : 'has-success']">
+              <label for="f_collection" class="font_normal_body"
+                     v-if="model.f_compensation_type == '调价补费'">应补金额</label>
+              <label for="f_collection" class="font_normal_body" v-else>应退金额</label>
+              <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+                     readonly
+                     v-scale="[model.f_preamount, 4]"
+                     v-validate:f_preamount='{required: true, dctest: [(model.f_preamount - 0), ">=" ] }'
+                     placeholder="补费金额">
+            </div>
+
+          </div>
+          <div class="row" style="margin-top:6px;">
+            <div class="col-sm-4">
+              <label for="f_balance" class="font_normal_body">上期结余</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_balance"
+                     v-scale="[model.f_balance, 4]" placeholder="上期结余" disabled>
+            </div>
+
+            <div class="col-sm-4">
+              <label for="f_curbalance" class="font_normal_body">本期结余</label>
+              <input class="input_search" style="width:60%" type="number" v-model="curbalance"
+                     v-scale="[curbalance, 2]" placeholder="本期结余" disabled>
+            </div>
+            <div class="col-sm-4"
+                 :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
+              <label for="f_collection" class=" font_normal_body">实际收款</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     v-scale="[model.f_collection, 4]"
+                     v-validate:f_preamount='{required: true, dctest: [(model.f_preamount - 0), ">=" ] }'
+                     placeholder="实际收款">
+            </div>
+            <div class="row" style="margin-top:6px;">
+              <!--<div class="col-sm-4">-->
+              <!--<label for="f_change_price" class="font_normal_body">补差单价</label>-->
+              <!--<input class="input_search" style="width:60%" type="number" v-model="model.f_change_price"-->
+              <!--v-scale="[model.f_change_price, 4]" placeholder="补差单价" readonly>-->
+              <!--</div>-->
+              <div class="col-sm-4">
+                <label for="f_real_amount" class="font_normal_body">补差气量</label>
+                <input class="input_search" style="width:60%" type="number" v-model="model.f_real_amount"
+                       v-scale="[model.f_real_amount, 4]" placeholder="补差气量" readonly>
+              </div>
+              <div class="col-sm-4" :class="[$v.f_surplus_fee.required  ? 'has-error' : 'has-success']">
+                <label for="f_surplus_fee" class="font_normal_body">补差金额</label>
+                <input class="input_search" style="width:60%" type="number" v-model="model.f_surplus_fee"
+                       v-scale="[model.f_surplus_fee, 4]" placeholder="补差金额"
+                       v-validate:f_surplus_fee='{required: true}'>
+              </div>
+            </div>
+          </div>
+        </form>
+        <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+        <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close"
+                    @printok="printok" v-ref:printbill></print-bill>
+        <div style="text-align:right; height: 25%">
+          <strong style="font-size: large"
+                  v-if="!config.notShowFormula">计算公式:{{ calculatedetail ? calculatedetail : ' 暂无' }}</strong><br/>
+          <payment-code-button :clickable="!$v.valid || clickConfirm"
+                               :payment.sync="model.f_payment" :payment-data="paytype"
+                               @confirm-payment="confirm()">
+          </payment-code-button>
+          <button class="button_search btn-gn" type="submit" @click="confirm()" :disabled='!$v.valid || clickConfirm'>
+            确认
+          </button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
+      </validator>
+    </div>
+  </div>
+  <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
+  <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="团体调价补差"></upload>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+
+/**
+ *综合业务
+ *团体调价补差收费组件
+ */
+
+let compensationChargeGen = async function (self) {
+  try {
+    if (self.paymentModel.length === 0) {
+      self.paymentModel = [{
+        f_payment: self.model.f_payment[0],
+        f_money: self.model.f_preamount
+      }]
+    }
+    self.model.payments = self.paymentModel
+
+    let param = Object.assign({}, {}, self.model)
+    param.f_payment = self.model.f_payment.toString()
+    param.f_print = self.model.f_print.toString()
+    // 加入扫码盒付款码支付流水号
+    param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+    let res = await self.$resetpost('rs/logic/groupJBCompensation', {data: {model: param, row: self.row}}, {
+      warnMsg: `确定对客户${self.row.f_user_name}进行团体调价补差吗？`,
+      resolveMsg: '团体调价补差成功！！',
+      rejectMsg: '团体调价补差出错!!!'
+    })
+    // 开始打票
+    console.log('开始打票', self.config)
+    if (self.config.hasPrint) {
+      if (self.config.printType != '电子发票') {
+        if (self.config.hasBillManage) {
+          // 启用发票管理，获取票据管理中的票号并存储记录
+          self.row.id = res.data.id
+          self.row.f_bill_type = '团体调价补差'
+          self.row.f_bill_style = self.model.f_print[0]
+          self.print = true
+        } else {
+          self.row.id = res.data.id
+          self.print = true
+        }
+      } else if (self.config.printType === '国税发票') {
+        // TODO
+      } else if (self.config.printType === '电子发票') {
+        // TODO
+      }
+    } else {
+      self.$dispatch('success')
+    }
+  } catch (error) {
+    if (error.status === 301) {
+      self.$dispatch('refresh')
+    } else {
+      if (error) {
+        self.$showAlert(error, 'danger', 0)
+      }
+    }
+
+    self.$dispatch('refresh')
+  }
+}
+let asyncCardMeterCenter = async function (self) {
+  await self.$getConfig(self, 'JbCompensation')
+  console.log('卡表收费config', self.config)
+  self.blodid = self.row.f_userinfo_id
+  // 默认打印格式
+  self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+  self.model.f_payment = [self.config.payment]
+  self.mulPrint = self.config.printType instanceof Array
+  let http = new HttpResetClass()
+  let getSurplus = await http.load('POST', 'rs/sql/singleTable_OrderBy',
+    {
+      data: {
+        items: 'sum(f_real_amount) f_real_amount,sum(f_surplus_fee) f_surplus_fee',
+        tablename: 't_surplus_detail',
+        condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${self.civill}') and f_state='有效' and f_whether_pay = '否' `,
+        orderitem: 'f_surplus_fee'
+      }
+    },
+    {resolveMsg: null, rejectMsg: null})
+  if (getSurplus.data.length > 0) {
+    self.model.f_preamount = getSurplus.data[0].f_surplus_fee
+    self.model.f_collection = getSurplus.data[0].f_surplus_fee
+    self.model.f_surplus_fee = getSurplus.data[0].f_surplus_fee
+    self.model.f_real_amount = getSurplus.data[0].f_real_amount
+    // self.model.f_change_price=getSurplus.data[0].f_change_price
+  }
+  //self.model.f_price = getPrice.data[0].f_price
+  // 获取当前票号用
+  self.model.f_use_type = self.config.billType
+  self.model.f_bill_type = self.model.f_print
+  self.hasValidateBill = self.config.hasBillManage
+}
+export default {
+  title: '机表团体调价补差收费',
+  data () {
+    return {
+      config: {
+        notShowFormula: false, // 不显示计算公式,默认显示
+        // 控制附件显示
+        showupload: false,
+        hasPrint: false,  // 默认打票
+        hasBillManage: false,  // 默认不启用发票管理
+        billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
+        printType: '普通收据', // 收据/电子票/专用发票/国税发票
+        payment: '现金缴费'
+      },
+      model: {
+        f_compensation_type: '调价补费',
+        f_print: '',
+        f_balance: '',
+        f_preamount: '',
+        f_payment: '',
+        f_collection: '',
+        f_surplus_fee: '',
+        f_real_amount: ''
+        // f_change_price:''
+      },
+      blodid: '',
+      // 启用发票管理需要对票号进行验证
+      hasValidateBill: false,
+      validateOk: false,
+      print: false,
+      billData: {
+        url: 'rs/report/compensation_bill',
+        billnumber: ''
+      },
+      paymentModel: [],
+      mulPrint: false,
+      clickConfirm: false, // 控制确认按钮只能点击一次
+      // 下拉框值
+      paytype: this.$appdata.getParam('付款方式'),
+      printstyle: this.$appdata.getParam('打印格式'),
+      compensationTypes: [{label: '调价补费', value: '调价补费'}]
+    }
+  },
+  props: ['row', 'civill'],
+  ready () {
+    if (this.row) {
+      this.model.f_balance = this.row.f_balance
+      asyncCardMeterCenter(this)
+    }
+
+  },
+  watch: {
+    'row' (val) {
+      if (val) {
+        this.model.f_balance = this.row.f_balance
+        asyncCardMeterCenter(this)
+      }
+
+    },
+    'model.f_payment.length' (val) {
+      console.log('付款方式多选。。', val)
+      if (val > 1 && !this.model.f_preamount) {
+        this.model.f_payment = ['现金缴费']
+        this.$showAlert('请先计算付款金额', 'warning', 2000)
+      } else {
+        this.paymentModel = []
+
+        this.model.f_payment.forEach((res) => {
+          let temp = {
+            f_payment: res,
+            f_money: 0
+          }
+          this.paymentModel.push(temp)
+        })
+        this.$resetValidation()
+      }
+    }
+  },
+  methods: {
+    async confirm () {
+      this.clickConfirm = true
+      this.$dispatch('no-button')
+      this.model.f_userinfo_id = this.row.f_userinfo_id
+      this.model.f_userfiles_id = this.row.f_userfiles_id
+      this.model.version = this.row.version
+      this.model.f_surplus_id = this.row.f_surplus_id
+      this.model.f_user_id = this.row.f_user_id
+      this.model.f_total_fee = ((this.row.f_total_fee - 0) + (this.model.f_collection - 0)).toFixed(2)
+      this.model.f_total_usegas_amount = ((this.row.f_total_usegas_amount - 0) + (this.model.f_collection - 0)).toFixed(2)
+      this.model.f_total_gas = (this.row.f_total_gas - 0)
+      this.model.f_balance = this.row.f_balance - 0
+      this.model.f_curbalance = this.row.f_balance - 0
+      this.model.f_user_name = this.row.f_user_name
+      this.model.f_user_type = this.row.f_user_type
+      this.model.f_meter_type = this.row.f_meter_type
+      this.model.f_price_id = this.row.f_price_id
+      this.model.f_meter_brand = this.row.f_meter_brand
+      this.model.f_meter_style = this.row.f_meter_style
+      this.model.f_stairprice_id = this.row.f_stairprice_id
+      this.model.f_gasproperties = this.row.f_gasproperties
+      this.model.f_address = this.row.f_address
+      this.model.f_collection2 = (this.model.f_collection - 0) - (this.model.f_preamount - 0)
+      this.model.f_curbalance2 = this.curbalance
+      this.model.f_collection = (this.model.f_compensation_type == '调价补费' ? this.model.f_preamount : (0 - this.model.f_preamount))
+      this.model.f_times = this.row.f_times
+      this.model.f_type = this.model.f_compensation_type
+      this.model.f_state = '有效'
+      this.model.f_operat_type = this.model.f_compensation_type
+      this.model.f_describe = `${this.$login.f.name}对${this.row.f_user_name}进行${this.model.f_compensation_type}操作`
+      this.model.f_operator = this.$login.f.name
+      this.model.f_operatorid = this.$login.f.id
+      this.model.f_orgid = this.row.f_orgid
+      this.model.f_orgname = this.row.f_orgname
+      this.model.f_depid = this.$login.f.depids
+      this.model.f_depname = this.$login.f.deps
+      // 先调用付款码支付组件流程
+      let ss = await this.$refs.paymentcode.flowPath()
+      this.$refs.paymentcode.paymentCodeShow = false
+      console.log('付款码操作返回', ss)
+      if (!ss.result) return
+      compensationChargeGen(this)
+    },
+    clean () {
+      this.$info('取消操作')
+      this.$dispatch('refresh', this.row)
+    },
+    validateBill (val) {
+      this.validateOk = !val.isOk
+      this.billData.bill = val.bill
+    },
+    printok () {
+      // 收据打完，判断是否还有其他票据进行请求
+      for (let i = 0; i < this.model.f_print.length; i++) {
+        if (this.model.f_print[i] === '电子发票') {
+          this.$CommonService.openEticket(this.row.id, '售气收费')
+        }
+      }
+      this.$dispatch('success')
+    },
+    close () {
+      this.print = false
+      this.clean()
+    }
+  },
+  computed: {
+    'curbalance' () {
+      if (this.model.f_collection) {
+        return ((this.row.f_balance - 0) + ((this.model.f_collection - 0) - (this.model.f_preamount - 0))).toFixed(2)
+      } else {
+        return this.row.f_balance
+      }
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/filiale/gehua/PriceChangeCompensation/OweRecordQuery.vue

@@ -0,0 +1,184 @@
+<template>
+  <div class="basic-main flex">
+    <div style="height: 400px;background:#E6E6FA;">
+      <data-grid :model="owe" class="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>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center;white-space:nowrap;">{{ $index + 1 }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_userinfo_code }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_user_name }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_meter_classify }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.c }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_hand_date }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_last_tablebase }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_tablebase }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_oughtamount }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_oughtfee }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_debt_money }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_oughtfee_new }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.overdue }}</td>
+            <td style="text-align:center;white-space:nowrap;">{{ row.f_oughtfee_all }}</td>
+          </tr>
+        </template>
+      </data-grid>
+    </div>
+  </div>
+  <div class="auto" style="margin-top: 1%;">
+    <div style="height: auto" class="select-overspread">
+      <div class="form-inline" style="height: auto">
+        <div class="form-group" v-for="btn in operBtns">
+          <button :id="btn.name" type="button" style="color:black"
+                  :class="[($index === 0) ? 'btn btn-click' : 'btn btn-un-click']" @click="business(btn)">
+            <span style="color:black">{{ btn.name }}</span>
+          </button>
+        </div>
+      </div>
+      <div v-show="chargeShow" style="height: auto" class="select-overspread">
+        <route v-ref:route></route>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '批量欠费查询',
+  data () {
+    return {
+      owe: {rows: []},
+      model: {f_collection: 0},
+      civill: null,
+      chargeShow: false,
+      operBtns: [
+        {name: '团体缴费', value: {routeName: 'batch-charge'}},
+        {name: '余额退款', value: {routeName: 'group-refund'}},
+        {name: '补费扣费', value: {routeName: 'group-fee-deduction'}},
+        {name: '制磁条卡', value: {routeName: 'show-citiao_card'}}
+      ]
+    }
+  },
+  props: ['searchdata', 'f_civill_id', 'row'],
+  ready () {
+    this.getsalerecord()
+  },
+  methods: {
+    async getsalerecord () {
+      let surplusdata = {
+        data: {
+          items: '*',
+          tablename: 't_surplus_detail',
+          condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${this.f_civill_id}') and f_state='有效' and f_whether_pay = '否'`,
+          orderitem: 'f_userinfo_id'
+        }
+      }
+      this.$resetpost('rs/sql/singleTable_OrderBy', surplusdata).then((res) => {
+        if (res.data.length === 0) {
+          this.operBtns = [
+            {name: '团体缴费', value: {routeName: 'batch-charge'}},
+            {name: '余额退款', value: {routeName: 'group-refund'}},
+            {name: '补费扣费', value: {routeName: 'group-fee-deduction'}},
+            {name: '制磁条卡', value: {routeName: 'show-citiao_card'}}
+          ]
+          this.getsale()
+        } else {
+          this.operBtns = [{name: '团体调价补差', value: {routeName: 'group-compensation'}}]
+          this.business(this.operBtns[0])
+        }
+      })
+    },
+    async getsale () {
+      let http = new HttpResetClass()
+      if (this.f_civill_id) {
+        this.condition = `p.f_civill_id = ${this.f_civill_id}`
+      } else {
+        let userfiles = Array.from(this.searchdata.keys())
+        this.condition = `p.f_userfiles_id in (${userfiles})`
+      }
+      let record = await http.load('POST', 'rs/logic/batchOwe', {
+        data: {
+          condition: this.condition,
+          f_civill_id: this.f_civill_id
+        }
+      }, {rejectMsg: '欠费查询出错！！', resolveMsg: null})
+      this.owe.rows = record.data.owe
+      this.model = Object.assign(this.model, record.data.model)
+      this.civill = record.data.civill
+      this.business(this.operBtns[0])
+    },
+    business (btn) {
+      // 处理按钮样式
+      this.styleChange(btn.name)
+      this.chargeShow = true
+      this.$refs.route.init(btn.value.routeName, {row: this.row, data: this.model, owe: this.owe, civill: this.f_civill_id})
+    },
+    styleChange (name) {
+      this.operBtns.forEach((res) => {
+        if (res.name === name) {
+          if (document.getElementById(res.name)) {
+            document.getElementById(res.name).style.backgroundColor = '#6aa6e2'
+            document.getElementById(res.name).style.color = 'white'
+          }
+        } else {
+          if (document.getElementById(res.name)) {
+            document.getElementById(res.name).style.backgroundColor = 'white'
+            document.getElementById(res.name).style.color = 'black'
+          }
+        }
+      })
+    }
+  },
+  watch: {
+    'searchdata' () {
+      this.getsalerecord()
+    }
+  }
+}
+</script>

package/src/filiale/gehua/PriceChangeCompensation/SurplusRecordDetail.vue

@@ -1,36 +1,58 @@
 <template>
   <div style="height:100%">
-    <data-grid :model="model" class="table_sy"   partial='list' v-ref:grid >
-      <template partial='head' >
+    <data-grid :model="model" class="table_sy" partial='list' v-ref:grid>
+      <template partial='head'>
         <tr>
-          <th style="text-align: center"><nobr>序号</nobr></th>
-          <th style="text-align: center"><nobr>一阶补差单价</nobr></th>
-          <th style="text-align: center"><nobr>二阶补差单价</nobr></th>
-          <th style="text-align: center"><nobr>三阶补差单价</nobr></th>
-          <th style="text-align: center"><nobr>补差气量</nobr></th>
-          <th style="text-align: center"><nobr>补差金额</nobr></th>
+          <th style="text-align: center">
+            <nobr>序号</nobr>
+          </th>
+          <th style="text-align: center">
+            <nobr>一阶补差单价</nobr>
+          </th>
+          <th style="text-align: center">
+            <nobr>二阶补差单价</nobr>
+          </th>
+          <th style="text-align: center">
+            <nobr>三阶补差单价</nobr>
+          </th>
+          <th style="text-align: center">
+            <nobr>补差气量</nobr>
+          </th>
+          <th style="text-align: center">
+            <nobr>补差金额</nobr>
+          </th>
 
-          <th style="text-align: center"><nobr>补差开始时间</nobr></th>
-          <th style="text-align: center"><nobr>补差结束日期</nobr></th>
-          <th style="text-align: center"><nobr>缴费状态</nobr></th>
-          <th style="text-align: center"><nobr>操作时间</nobr></th>
-          <th style="text-align: center"><nobr>操作人</nobr></th>
+          <th style="text-align: center">
+            <nobr>补差开始时间</nobr>
+          </th>
+          <th style="text-align: center">
+            <nobr>补差结束日期</nobr>
+          </th>
+          <th style="text-align: center">
+            <nobr>缴费状态</nobr>
+          </th>
+          <th style="text-align: center">
+            <nobr>操作时间</nobr>
+          </th>
+          <th style="text-align: center">
+            <nobr>操作人</nobr>
+          </th>
         </tr>
       </template>
-      <template partial='body' >
-        <tr >
-          <td style="text-align: center;">{{$index + 1}}</td>
-          <td style="text-align: center;">{{row.f_change_price1}}</td>
-          <td style="text-align: center;">{{row.f_change_price2}}</td>
-          <td style="text-align: center;">{{row.f_change_price3}}</td>
-          <td style="text-align: center;">{{row.f_real_amount}}</td>
-          <td style="text-align: center;">{{row.f_surplus_fee}}</td>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">{{ $index + 1 }}</td>
+          <td style="text-align: center;">{{ row.f_change_price1 }}</td>
+          <td style="text-align: center;">{{ row.f_change_price2 }}</td>
+          <td style="text-align: center;">{{ row.f_change_price3 }}</td>
+          <td style="text-align: center;">{{ row.f_real_amount }}</td>
+          <td style="text-align: center;">{{ row.f_surplus_fee }}</td>
 
-          <td style="text-align: center;">{{row.f_start_date}}</td>
-          <td style="text-align: center;">{{row.f_end_date}}</td>
-          <td style="text-align: center;">{{row.f_whether_pay}}</td>
-          <td style="text-align: center;">{{row.f_operate_date}}</td>
-          <td style="text-align: center;">{{row.f_operator}}</td>
+          <td style="text-align: center;">{{ row.f_start_date }}</td>
+          <td style="text-align: center;">{{ row.f_end_date }}</td>
+          <td style="text-align: center;">{{ row.f_whether_pay }}</td>
+          <td style="text-align: center;">{{ row.f_operate_date }}</td>
+          <td style="text-align: center;">{{ row.f_operator }}</td>
         </tr>
       </template>
     </data-grid>
@@ -44,7 +66,7 @@ let asyncReady = async function (self) {
 }
 export default {
   title: '调价补差记录',
-  props: ['row'],
+  props: ['row', 'civill'],
   data () {
     return {
       model: {rows: []}
@@ -54,19 +76,45 @@ export default {
     asyncReady(this)
   },
   methods: {
-    async refresh(){
-      let http = new HttpResetClass()
-      var suplusList = await http.load('POST', 'rs/sql/singleTable_OrderBy',
-        {data: {items: "*",
-            tablename: 't_surplus_detail',
-            condition: `f_userinfo_id = '${this.row.f_userinfo_id}' and f_state='有效' and f_whether_pay = '否'`,
-            orderitem: 'f_userinfo_id'}},
-        {resolveMsg: null, rejectMsg: null})
-      this.model.rows = suplusList.data
+    async refresh () {
+      console.log('团缴id' + this.civill)
+      if (!this.civill) {
+        if (this.row && this.row.f_userinfo_id) {
+          let http = new HttpResetClass()
+          var suplusList = await http.load('POST', 'rs/sql/singleTable_OrderBy',
+            {
+              data: {
+                items: '*',
+                tablename: 't_surplus_detail',
+                condition: `f_userinfo_id = '${this.row.f_userinfo_id}' and f_state='有效' and f_whether_pay = '否'`,
+                orderitem: 'f_userinfo_id'
+              }
+            },
+            {resolveMsg: null, rejectMsg: null})
+          this.model.rows = suplusList.data
+        }
+      } else {
+        let http = new HttpResetClass()
+        var suplusList1 = await http.load('POST', 'rs/sql/singleTable_OrderBy',
+          {
+            data: {
+              items: '*',
+              tablename: 't_surplus_detail',
+              condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${this.civill}') and f_state='有效' and f_whether_pay = '否'`,
+              orderitem: 'f_userinfo_id'
+            }
+          },
+          {resolveMsg: null, rejectMsg: null})
+        this.model.rows = suplusList1.data
+
+      }
     }
   },
   watch: {
-    'row.f_userfiles_id'(){
+    'row.f_userfiles_id' () {
+      this.refresh()
+    },
+    'civill' () {
       this.refresh()
     }
   }

package/src/filiale/gehua/sale.js

@@ -104,9 +104,13 @@ export default function () {
     require(['./ChargeGroupList'], resolve) })
   // 调价补差
   Vue.component('compensation-manage', (resolve) => { require(['./PriceChangeCompensation/CompensationManage'], resolve) })
+  // 团体缴费查询列表
+  Vue.component('group-compensation', (resolve) => {
+    require(['./PriceChangeCompensation/GroupCompensation'], resolve) })
   // 调价补差(新)
   Vue.component('new-price-adjustment', (resolve) => { require(['./NewPriceAdjustment'], resolve) })
   Vue.component('new-price-adjustment-sell', (resolve) => { require(['./NewPriceAdjustmentSell'], resolve) })
   Vue.component('new-price-adjustment-webmeter', (resolve) => { require(['./NewPriceAdjustmentWebmeter'], resolve) })
   Vue.component('new-price-adjustment-manage', (resolve) => { require(['./PriceAdjustmentManage'], resolve) })
+  Vue.component('owe-record-query', (resolve) => { require(['./PriceChangeCompensation/OweRecordQuery'], resolve) })
 }