sale-client 3.5.26 → 3.5.27

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -58,8 +58,6 @@
                     <button @click="$parent.$parent.importFile" class="button_export button_spacing"
                             style="float: right" v-if="false">导入
                     </button>
-                    <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
-                    </button>
                     <!--                    <button class="button_search" style="width: 90px" @click=" $parent.$parent.selectaddress()">选择地址</button>-->
                     <button @click="$parent.$parent.xiaohu()"
                             class="button_delete button_spacing"
@@ -407,9 +405,11 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-    <modal :show.sync="batchMeterShow" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+    <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="downloadFiles()">模板下载
+        </button>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>

package/src/components/FilesManage/MeterinfoTest.vue

@@ -185,7 +185,7 @@
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">表具使用年限</label>
-            <input type="number" class="input_search" style="width:60%" v-model="fireinfo.f_use_limit"
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
                    placeholder='表具使用年限' >
           </div>
           <div class="col-sm-4 form-group">
@@ -794,8 +794,19 @@
         } else {
           this.ratioshow = false
         }
+      },
+      'row.f_gas_date' (val) {
+        if (!this.row.f_use_limit) {
+          this.row.f_use_limit = this.$appdata.getSingleValue('使用年限')
+        }
+        if (!this.row.f_scrap_date && this.row.f_gas_date) {
+          if (this.row.f_use_limit !== undefined) {
+            let date = new Date(this.row.f_gas_date)
+            let year = date.getFullYear() + (this.row.f_use_limit / 1)
+            this.row.f_scrap_date = year + this.row.f_gas_date.slice(4)
+          }
+        }
       }
-
     },
     computed: {
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -106,6 +106,13 @@
             <input type="text" v-model="baseinfo.base.f_zuhu_phone" class="input_search" style="width:60%"
                    placeholder="租户电话">
           </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-8 form-group">
+            <label for="f_zuhu_idnumber" class="font_normal_body">租户身份证</label>
+            <input type="text" v-model="baseinfo.base.f_zuhu_idnumber" class="input_search" style="width:80%"
+                   placeholder="租户身份证">
+          </div>
           <div style="" class="col-sm-4 form-group">
             <label for="f_is_mgq" class="font_normal_body ">&ensp;付款类型</label>
             <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"

package/src/components/charge/ChargeOper.vue

@@ -49,7 +49,9 @@
     } else {
       self.temp = []
       for (let i = 0; i < getBtns.length; i++) {
-        if (self.$login.r.includes(getBtns[i].name)) {
+        // 不需要权限的按钮
+        let noInclude = getBtns[i].name === '垃圾费收费'
+        if (noInclude || self.$login.r.includes(getBtns[i].name)) {
           // 进行权限验证
           self.temp.push(getBtns[i])
         }

package/src/components/revenue/base/rightview/CardList.vue

@@ -116,8 +116,7 @@
                 <transfermanage-detail :data="row" v-if="row.type === '过户'"></transfermanage-detail>
                 <othercharge-detail :data="row" v-if="row.type === '其他收费欠费登记'||row.type === '其他收费'||row.type === '维修收费'"></othercharge-detail>
                 <inputtorchange-detail :data="row" v-if="row.type === '抄表员变更'"></inputtorchange-detail>
-                <offgasaddgas-detail :data="row"
-                                     v-if=" row.type === '换表补气' ||row.type === '其他补气' || row.type === '清零补气' || row.type === '掉气补气'||row.type==='物联网补费'||row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气' " ></offgasaddgas-detail>
+                <offgasaddgas-detail :data="row" v-if=" row.type === '换表补气' ||row.type === '其他补气' || row.type === '清零补气' || row.type === '掉气补气'||row.type==='物联网补费'||row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气' " ></offgasaddgas-detail>
                 <iotopen-detail :data="row" v-if="row.type === '开通'"></iotopen-detail>
                 <iotmetercenter-detail :data="row" v-if="row.type === '物联网收费' || row.type === '物联网开户' || row.type === '调价退费' || row.type === '调价补费'||row.type === '退押金'  "></iotmetercenter-detail>
                 <overuserchange-detail :data="row" v-if="row.type === '超用收费'"></overuserchange-detail>
@@ -134,10 +133,8 @@
                 <autoaccounts-cancel-detail :data="row" v-if="row.type === '自动下账撤销'"></autoaccounts-cancel-detail>
                 <transfermanage-cancel-detail :data="row" v-if="row.type === '过户撤销'"></transfermanage-cancel-detail>
                 <cardmetercenter-cancel-detail :data="row" v-if="row.type === '卡表收费撤销'"></cardmetercenter-cancel-detail>
-                <machinemetercenter-cancel-detail :data="row"
-                                                  v-if="row.type === '机表收费撤销'"></machinemetercenter-cancel-detail>
-                <machinemetercenter-cancel-detail :data="row"
-                                                  v-if="row.type == '预存缴费撤销'"></machinemetercenter-cancel-detail>
+                <machinemetercenter-cancel-detail :data="row" v-if="row.type === '机表收费撤销'"></machinemetercenter-cancel-detail>
+                <machinemetercenter-cancel-detail :data="row" v-if="row.type == '预存缴费撤销'"></machinemetercenter-cancel-detail>
                 <othercharge-cancel-detail :data="row" v-if="row.type === '其他收费撤销'"></othercharge-cancel-detail>
                 <replacecardmanage-cancel-detail :data="row" v-if="row.type === '补卡撤销'"></replacecardmanage-cancel-detail>
                 <iotmetercenter-cancel-detail :data="row" v-if="row.type === '物联网收费撤销'"></iotmetercenter-cancel-detail>
@@ -148,6 +145,7 @@
                 <advance-delivery-detail :data="row" v-if="row.type ==='卡表预交' "></advance-delivery-detail>
                 <machinemetercenter-detail :data="row" v-if="row.type === '预存缴费'||row.type == '调价预存'"></machinemetercenter-detail>
                 <gasloss-detail :data="row" v-if="row.type === '气损收费' || row.type === '气损收费撤销'"></gasloss-detail>
+                <garbage-detail :data="row" v-if="row.type === '垃圾费收费'"></garbage-detail>
               </div>
               <div style="margin-top: 8px;background: #FFF;" v-if="!$parent.$parent.$parent.isSelected(row)">
                 <span>{{row.f_describe}}</span>
@@ -462,6 +460,8 @@
           } else {
             name = 'rs/report/iot_sell'
           }
+        } else if (type === '垃圾费收费') {
+          name = 'rs/report/garbageChargeReport'
         }
         return name
       },

package/src/components/revenue/base/rightview/carddetail/GarbageDetail.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="auto">
+    <partial-view v-ref:pv>
+      <div class="row">
+        <label class = "col-sm-4">开始日期:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.min_hand_date}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">结束日期:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.max_hand_date}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">缴费月数:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.month}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">总金额:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.money}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作人:</label>
+        <span class = "col-sm-8" style="text-align:left">{{data.f_operator}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作时间:</label>
+        <span class = "col-sm-8" style="text-align:left">{{data.f_operate_date}}</span>
+      </div>
+    </partial-view>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '垃圾费收费详情',
+    props: ['data'],
+    data () {
+      return {
+        model: {}
+      }
+    },
+    ready () {
+      let sql = 'garbageDetail'
+      let condition = {
+        recordId: this.data.id
+      }
+      this.$info(`加载数据中..., sql:${sql}`)
+      this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: condition}}).then((a) => {
+        this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
+        this.model = a.data
+      }).catch((error) => {
+        if (error.status) {
+          this.$warn(`加载数据出错, ${JSON.stringify(error)}`)
+          return
+        }
+        throw error
+      })
+    }
+  }
+</script>

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

@@ -0,0 +1,286 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <div class="flex">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="col-sm-2  form-group">
+                <label for="f_payment"  class="font_normal_body">付款方式:</label>
+                <v-select id="f_payment"
+                          v-model="model.f_payment"
+                          placeholder='付款方式'
+                          :value-single="true"
+                          condition="f_payment='{}' "
+                          :value.sync="model.f_payment"
+                          :options='$parent.$parent.payment'
+                          close-on-select ></v-select>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label for="f_bank_name"  class="font_normal_body">银行名称:</label>
+                <v-select id="f_bank_name"
+                          v-model="model.f_bank_name"
+                          placeholder='银行名称'
+                          :value-single="true"
+                          condition="f_bank_name= '{}' "
+                          :value.sync="model.f_bank_name"
+                          :options='$parent.$parent.bankname'
+                          close-on-select ></v-select>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label for="startDate" class="font_normal_body">开始日期:</label>
+                <datepicker id="startDate" placeholder="开始日期"
+                            v-model="model.startDate" style="width: 60%"
+                            :value.sync="model.startDate"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label for="endDate" class="font_normal_body">结束日期:</label>
+                <datepicker id="endDate" placeholder="结束日期"
+                            v-model="model.endDate" style="width: 60%"
+                            :value.sync="model.endDate"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
+              <div class="span" style="float:right;">
+                <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              :footer="$parent.$parent.footer"
+                              :header="$parent.$parent.other"
+                              sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="bankPaymentSummary"
+                              template-name='银行对账汇总信息' :choose-col="true"></export-excel>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>付款方式</th>
+              <th>银行名称</th>
+              <th>银行总金额</th>
+              <th>燃气总金额</th>
+              <th>差额</th>
+              <th style="white-space: nowrap;">交易日期</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_payment}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_bank_name}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_total_charge}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_collection}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{((row.f_total_charge-0) - (row.f_collection-0)).toFixed(2)}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_trade_date}}</nobr>
+            </td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+      <table class="table-hover">
+        <tr style="position: relative" class="table-bordered">
+          <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;font-weight: bold">
+            银行金额汇总:&emsp;{{sumsmodel.f_total_charge}}
+          </td>
+          <td
+            style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            收费系统金额汇总:&emsp;{{sumsmodel.f_collection}}
+          </td>
+          <td
+            style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            差额汇总:&emsp;{{((sumsmodel.f_total_charge -0) - (sumsmodel.f_collection -0)).toFixed(2)}}
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+
+  export default {
+    title: '银行对账',
+    data () {
+      return {
+        model: new PagedList('rs/sql/bankPaymentSummary', 20,
+          {f_payment: 'this.model.f_payment', f_bank_name: 'this.model.f_bank_name', startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {f_total_charge: '', f_collection: ''}),
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_payment': '银行名称',
+            'f_bank_name': '银行名称',
+            'f_total_charge': '银行金额',
+            'f_collection': '收费系统金额',
+            'f_trade_date': '交易日期'
+          }
+        },
+        criteriaShow: false,
+        getfield: {},
+        condition2: '',
+        depresid: [],
+        userresid: [],
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        other: [],
+        footer: [],
+        // 合计数据
+        sumsmodel: {},
+        msg: [],
+        // 公司下拉
+        curorgid: [this.$login.f.orgid]
+      }
+    },
+    props: [],
+    ready () {
+      readyGen(this)
+    },
+    methods: {
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.f_orgid = obj.resids
+        console.log('-----------------obj', obj)
+      },
+      getdep (obj, val) {
+        this.depname = val[0]
+        this.userresid = obj
+        this.f_depid = obj
+      },
+      getuser (obj, val) {
+        this.operatorname = val[0]
+        this.f_operatorid = obj
+      },
+      dealmsg (val) {
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other = []
+        this.footer = []
+        // let exportdata = this.getCondition;
+        let otherInData = []
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+        let footerData = [], exportfield = this.getfield
+        footerData.push('合计')
+        let self = this
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
+        }
+        this.footer.push(footerData)
+        this.other.push(otherInData)
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.depresid = val
+        this.f_filialeid = val[0]
+        console.log('yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy', val)
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch (args) {
+
+        this.model.params.startDate = this.$refs.paged.$refs.cri.model.startDate
+        this.model.params.endDate = this.$refs.paged.$refs.cri.model.endDate
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        this.model.params.f_payment = this.model.f_payment
+        this.model.params.f_bank_name = this.model.f_bank_name
+        this.condition2 = args.condition
+        this.model.search(args.condition, args.model)
+      },
+      modify (row) {
+        console.log('返回数据1', row)
+        this.$showMessage('确认重置支付状态么？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let data = {
+              f_transaction_id: row.f_transaction_id
+            }
+            this.$resetpost('rs/logic/weChatMeter', data, {resolveMsg: null, rejectMsg: '重置出错!!!'}).then((res) => {
+              console.log('返回数据3', res)
+              this.$refs.paged.$refs.cri.search()
+              this.$showAlert(`重置成功!`, 'success', 4000)
+              // this.search()
+            }).catch((error) => {
+              console.log('重置异常', res)
+            })
+          }
+        })
+      }
+    },
+    computed: {
+      getCondition () {
+        return {
+          f_payment: this.$refs.paged.$refs.cri.model.f_payment,
+          f_bank_name: this.$refs.paged.$refs.cri.model.f_bank_name,
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          condition: this.condition2
+        }
+      },
+      payment () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('银行付款方式')]
+      },
+      bankname () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('银行名称')]
+      },
+      chargeType () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('微信收费类型')]
+      },
+      operator () {
+        return this.$getParams('操作员查询用', [{label: '全部', value: ''}])
+      },
+      network () {
+        return this.$getParams('网点查询用', [{label: '全部', value: ''}])
+      }
+    },
+    watch: {
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter()
+        },
+        deep: true
+      }
+    }
+  }
+</script>

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

@@ -0,0 +1,52 @@
+<template>
+  <tab-button v-ref:list>
+    <tabs header="银行对账汇总">
+      <bank-payment-constrast @deal-msg="dealMsg"></bank-payment-constrast>
+    </tabs>
+    <tabs header="银行对账明细">
+      <bank-payment @deal-msg="dealMsg"></bank-payment>
+    </tabs>
+  </tab-button>
+</template>
+<script>
+  import TabButton from './../../../comprehen/common/TabButton'
+  import Tabs from './../../../comprehen/common/Tabs'
+  import BankPayment from './BankPayment'
+  import BankPaymentConstrast from "./BankPaymentConstrast";
+
+  export default {
+    title : '银行对账',
+    data () {
+      return {// 页面开关
+        f_start_date: '',
+        f_end_date: '',
+        listpage: true,
+        width: {
+          left: '100%',
+          right: '0%'
+        },
+        // searchNumber:'',
+        rowData: {},
+        show: [true]
+      }
+    },
+    components: {BankPaymentConstrast, Tabs, TabButton, BankPayment},
+    ready () {
+      console.log(this.$refs.list)
+      console.log('银行对账')
+    },
+    methods: {
+      cancel (obj) {
+        this.listpage = true
+      },
+      dealMsg (obj) {
+        this.rowData = obj
+        this.listpage = false
+        console.log(obj.model)
+        this.f_start_date = obj.model.startDate
+        this.f_end_date = obj.model.endDate
+      }
+    }
+  }
+
+</script>

package/src/components/revenue/comprehen/common/ImportExcel.vue

@@ -1,11 +1,11 @@
 <template>
   <button class="button_search button_spacing" style="width: 90px" @click.prevent="createInfoForFile()">{{ btnName }}
   </button>
-  <button  class="button_search button_spacing right"  style="width: 80px" @click.prevent="downloadFiles()">{{templateBtnName}}
-  </button>
-  <modal :show.sync="batchShow" width="500px" title="文件导入" v-ref:modal backdrop="false">
+  <modal :show.sync="batchShow" width="570px" title="文件导入" v-ref:modal backdrop="false">
     <article slot="modal-body" class="modal-body">
-      <file-upload class="my-file-uploader" name="chargePriceUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      <file-upload class="my-file-uploader col-sm-9" name="chargePriceUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;" @click.prevent="downloadFiles()">{{templateBtnName}}
+      </button>
     </article>
     <footer slot="modal-footer" class="modal-footer">
     </footer>
@@ -53,7 +53,6 @@ export default {
   methods: {
     downloadFiles () {
       let downurl = 'rs/downloadfile/file?filename=' + this.templateName
-      debugger
       this.$resetget(downurl, {}).then(res => {
         var link = document.createElement('a')
         link.target = '_blank'
@@ -105,7 +104,11 @@ export default {
           {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
             if (res.data) {
               console.log(res.data.totalsum)
-              self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，` + this.alertMessage)
+              if (res.data.errorMsg) {
+                self.$showMessage(`${res.data.errorMsg}` + this.alertMessage)
+              } else {
+                self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条` + this.alertMessage)
+              }
               self.iswork = false
             }
           })

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -8,6 +8,7 @@
               <div class="row">
                 <res-select-group :initres="$parent.$parent.initres"  :show-component="['company','department','operator','slicearea']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="span" style="float:right">
+                <import-excel v-if="$parent.$parent.batchImport === '批量开关阀导入'" template-name="批量开关阀导入Excel模板" logic-name="importBatchValue" import-json="importBatchValue.json"></import-excel>
                 <button class="button_search button_spacing"  @click="search()" v-el:cba>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clearmsg">清空</button>
                 <label class="font_normal_body" v-if="!$parent.$parent.excelTable">超过十万条限制导出</label>
@@ -350,6 +351,7 @@ import {HttpResetClass} from 'vue-client'
         isShowUserException: false,
         val1: '',
         f_beizhu: '',
+        batchImport: '',
         Gasusertype: [],
         Gasproperties: [],
         metermodel: [],
@@ -405,6 +407,7 @@ import {HttpResetClass} from 'vue-client'
       this.$refs.paged.$refs.criteria.search()
       // 初始化气表品牌下拉框
       readyGen(this)
+      this.getAuthority()
     },
     events: {
       'dblclick' (row) {
@@ -413,6 +416,11 @@ import {HttpResetClass} from 'vue-client'
       }
     },
     methods: {
+      getAuthority () {
+        if (this.$login.r.find(value => value == '批量开关阀导入')) {
+          this.batchImport = '批量开关阀导入'
+        }
+      },
       research () {
         this.selectRow = null
         this.$refs.paged.$refs.criteria.search()

package/src/filiale/dongguan/components/FilesManage/FileUserFiles.vue

@@ -58,8 +58,6 @@
                     <button @click="$parent.$parent.importFile" class="button_export button_spacing"
                             style="float: right" v-if="false">导入
                     </button>
-                    <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
-                    </button>
                     <!--                    <button class="button_search" style="width: 90px" @click=" $parent.$parent.selectaddress()">选择地址</button>-->
                     <button @click="$parent.$parent.xiaohu()"
                             class="button_delete button_spacing"
@@ -410,9 +408,11 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-    <modal :show.sync="batchMeterShow" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+    <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="downloadFiles()">模板下载
+        </button>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>

package/src/filiale/dongguan/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -154,8 +154,10 @@
       <button class="button_search" type="button" @click="goChargeManage">去收费</button>
       <button v-if="row.f_meter_brand.includes('西美')&&row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="clearBarrier">清除障碍</button>
-      <button v-if="row.f_meter_type.includes('物联网表')"
+      <button v-if="row.f_meter_type.includes('物联网表') && row.f_user_state !== '正常'"
               class="button_search" type="button" @click="openUser">开户</button>
+      <button v-if="row.f_meter_type.includes('物联网表')  && row.f_user_state == '正常'"
+              class="button_search" type="button" @click="cancelUserTitle">销户</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="valvecontrol">开关阀</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
@@ -240,12 +242,29 @@
       <button  type="button" class="btn btn-info btn-ln fr"  @click='valveoperate(false)'>关阀</button>
     </footer>
   </modal>
+<!-- 销户-->
+    <modal :show.sync="cancelUserShow">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close()"><span>&times;</span></button>
+        <h4 class="modal-title" align="center">销户管理</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group " style="padding-left: 8px">
+          <label  class=" font_normal_body">销户原因</label>
+          <input class="input_search" style="width:80%" v-model="f_reason"  rows="3" placeholder="请填写原因">
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button  type="button" class="button_search btn-ln fr"  @click='cancelUser()'>销户</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
 <script>
   import {HttpResetClass} from 'vue-client'
   import Vue from 'vue'
+  import {CancelToken as res} from "axios";
   export default {
     title: '基本信息',
     props: ['row'],
@@ -256,6 +275,8 @@
         valveLimit: false,
         // 开关阀操作原因
         operateReason: '',
+        cancelUserShow: false,
+        f_reason: '',
         valve: false
       }
     },
@@ -265,6 +286,34 @@
       this.valveLimit = this.$login.r.includes('开关阀权限')
     },
     methods: {
+      // 销户弹窗显示
+      cancelUserTitle () {
+        this.cancelUserShow = true
+      },
+      // 销户
+      async cancelUser () {
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'rs/logic/cancelUser', {
+          data: {
+            f_userfiles_id: this.row.f_userfiles_id,
+            f_operator: this.$login.f.name,
+            f_reason: this.f_reason,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps
+          }
+        }, {resolveMsg: null, rejectMsg: null}
+      )
+        if (res.data.reason.includes('操作成功')) {
+          this.$showAlert(`${res.data.reason}`, 'success', 2000)
+        } else {
+          this.$showAlert(`${res.data.reason}`, 'warning', 2000)
+        }
+        this.close()
+      },
+
       // 发送请求去数据
       async getDevice () {
         if (this.row) {
@@ -355,7 +404,9 @@
       },
       close () {
         this.valve = false
+        this.cancelUserShow = false
         this.operateReason = ''
+        this.f_reason = ''
       },
       // 开关阀操作
       async valveoperate (oper) {

package/src/filiale/kelai/GarbageCharge.vue

@@ -0,0 +1,205 @@
+<template>
+  <div class="auto" id="GarbageCharge">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
+            <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+            <input type="text" v-show="false" v-model="$refs.payment.selectedItems"
+                   v-validate:payment='{required: true }'>
+            <v-select v-model="f_payment"
+                      placeholder='请选择'
+                      style="width:60%"
+                      :value.sync="model.f_payment"
+                      :options='paytype'
+                      v-ref:payment
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_print" class="font_normal_body">打印格式</label>
+            <v-select id="print"
+                      v-model="f_print"
+                      style="width:60%"
+                      placeholder='请选择'
+                      :value.sync="model.f_print"
+                      :options='printstyle'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">总&ensp;欠&ensp;费</label>
+            <input class="input_search" style="width:60%"  type="number" v-model="money" placeholder="总欠费" disabled>
+          </div>
+        </div>
+        <div class="row">
+          <div class="panel panel-info auto">
+            <div class="panel-body">
+              <data-grid :model="list" partial='list' class="list_area table_sy" v-ref:grid>
+                <template partial='head'>
+                  <tr>
+                    <th><nobr>序号</nobr></th>
+                    <th><nobr>欠费月份</nobr></th>
+                    <th><nobr>金额</nobr></th>
+                  </tr>
+                </template>
+                <template partial='body'>
+                  <tr>
+                    <td>{{$index + 1}}</td>
+                    <td>{{row.f_hand_date}}</td>
+                    <td>{{row.f_money}}</td>
+                  </tr>
+                </template>
+              </data-grid>
+            </div>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+        <button class="button_clear btn-gn" @click="clean()">取消</button>
+      </div>
+    </validator>
+    <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok"
+                :data='printModel' v-ref:printbill></print-bill>
+  </div>
+<!--  <upload :blodid="data.f_userinfo_id" isremark="true" fusetype="退费管理"></upload>-->
+</template>
+
+
+<script>
+let readyGen = async function (self) {
+  await self.$getConfig(self, 'GarbageCharge')
+  // 默认打印格式
+  self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+  self.model.f_payment = [self.config.payment]
+
+  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: {
+        showupload: false, // 默认不上传附件
+        hasPrint: false,  // 默认打票
+        hasBillManage: false,  // 默认不启用发票管理
+        overBalance: false,   // 为true时退费金额可以大于余额
+        printType: '普通收据', // 收据/电子票/专用发票/国税发票
+        payment: '现金缴费',
+        billType: '燃气费'
+      },
+      model: {
+        f_refund_fee: '',
+        f_refund_gas: '',
+        f_comments: '',
+        f_payment: '',
+        f_print: '',
+        f_price: 0
+      },
+      blodid: '',
+      hasValidateBill: false,
+      validateOk: false,
+
+      printModel: {},
+      print: false,
+      billUrl: '',
+      billData: {
+        url: 'rs/report/refund_sell',
+        bill: ''
+      },
+      // 下拉框值
+      paytype: this.$appdata.getParam('付款方式'),
+      printstyle: this.$appdata.getParam('打印格式'),
+      list: {data: []},
+      money: 0
+    }
+  },
+  props: ['row'],
+  ready () {
+    readyGen(this)
+    this.getList()
+  },
+  methods: {
+    async getList () {
+      let res = await this.$resetpost('rs/logic/queryGarbageCharges', {f_userfiles_id: this.row.f_userfiles_id}, {resolveMsg: null,rejectMsg: '查询垃圾费异常'})
+      this.list.data = res.data.list
+      this.money = res.data.money
+    },
+    async confirm () {
+      if (this.money <= 0) {
+        this.$showMessage('收费金额不能小于等于0')
+        return
+      }
+      let param = {
+        f_userfiles_id: this.row.f_userfiles_id,
+        money: this.money,
+        number: this.list.data.length,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      console.log('垃圾费收费', param)
+      let res = await this.$resetpost('rs/logic/garbageCharges', {data: param}, {warnMsg: `确定要对用户${this.row.f_user_name}进行垃圾费收费吗？`, resolveMsg: '收费成功！！', rejectMsg: '收费失败！！请重试！！'})
+      console.log('垃圾费收费', res)
+      if (this.config.hasPrint) {
+        if (this.model.f_print.indexOf('电子发票') == -1) {
+          console.log('this.config.hasBillManage', this.config.hasBillManage)
+          if (this.config.hasBillManage) {
+            // 启用发票管理，获取票据管理中的票号并存储记录
+            this.printModel.id = res.data.id
+            this.printModel.f_bill_type = '退费'
+            this.printModel.f_bill_style = this.model.f_print[0]
+            // this.billUrl = 'rs/report/refund_sell'
+            this.print = true
+          } else {
+            this.printModel.id = res.data.id
+            // this.billUrl = 'rs/report/refund_sell'
+            this.print = true
+          }
+        } else if (this.config.printType === '国税发票') {
+          // TODO
+          this.$dispatch('success')
+        } else if (this.config.printType === '电子发票') {
+          // TODO
+          this.$dispatch('success')
+        }
+      } else {
+        this.$dispatch('success')
+      }
+    },
+    clean () {
+      this.$dispatch('refresh')
+    },
+    printok () {
+      this.$dispatch('success')
+    },
+    validateBill (val) {
+      this.validateOk = !val.isOk
+      this.billData.bill = val.bill
+    }
+  },
+  watch: {
+  }
+}
+</script>
+<style lang="less">
+#GarbageCharge {
+  tr {
+    th {
+      text-align: center;
+    }
+
+    td {
+      text-align: center;
+    }
+  }
+}
+</style>

package/src/filiale/kelai/UserfilesList.vue

@@ -0,0 +1,293 @@
+<template>
+  <div id='UserfilesList' class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">用户编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
+                     condition="f_userinfo_code = '{}'" placeholder='用户编号'>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">用户姓名</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
+                     condition="f_user_name like '%{}%'" placeholder='用户姓名'>
+            </div>
+
+            <div class="form-group button-range" style="float: right">
+              <button class="button_search button_spacing" @click="$parent.$parent.addUser(true)" v-if="$parent.$parent.f_civill_id">添加用户</button>
+              <button class="button_search button_spacing" @click="$parent.$parent.removeUser(true)" v-if="$parent.$parent.f_civill_id">解除关系</button>
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <button class="button_clear button_spacing" @click="clear">清空</button>
+              <div style="float: right" class="button_spacing"
+                   :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
+                   @click="criteriaShow = !criteriaShow"></div>
+            </div>
+          </div>
+          <div class="row" v-show="criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户电话</label>
+              <input type="text" class="form-control" v-model="model.f_user_phone" placeholder='用户电话'
+                     condition="f_user_phone like '%{}%'" v-next-el='yhxm' style="width: 60%"
+              >
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">客户类型</label>
+              <v-select :options='$parent.$parent.user_type' :value.sync="model.f_user_type"
+                        close-on-select condition="f_user_type='{}'"
+                        placeholder='用户类型' v-model="model.f_user_type"></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">客户状态</label>
+              <v-select :options='$parent.$parent.user_state' :value.sync="model.f_user_state"
+                        close-on-select condition="f_user_state = '{}'"
+                        placeholder='客户状态' v-model="model.f_user_state"></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">抄&nbsp;表&nbsp;员&nbsp;</label>
+              <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
+                        style="width:60%"
+                        :multiple="true"
+                        condition="f_inputtor in {}"
+                        :options='$parent.$parent.inputtores' placeholder='抄表员'
+                        close-on-select
+                        v-el:cc></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :options='$parent.$parent.gasproperties' :value.sync="model.f_gasproperties"
+                        close-on-select condition="f_gasproperties='{}'"
+                        placeholder='用气性质' v-model="model.f_gasproperties"></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">气表类型</label>
+              <v-select :options='$parent.$parent.meter_classify' :value.sync="model.f_meter_classify"
+                        close-on-select condition="f_meter_classify='{}'" value-single
+                        placeholder='气表类型' v-model="model.f_meter_classify"></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">气表品牌</label>
+              <v-select :value.sync="model.f_meter_brand" multiple
+                        v-model="model.f_meter_brand"
+                        :options='$parent.$parent.meterbrands' placeholder='请选择'
+                        condition="f_meter_brand in {}"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">小&emsp;区&emsp;</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area" style="width: 60%"
+                     condition=" f_residential_area like '{}%'" placeholder="输入小区">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">客户地址</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
+                     condition="f_address like '%{}%'" placeholder='客户地址'>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">楼&emsp;号&emsp;</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_building"
+                     condition="f_building = '{}'" placeholder='楼号'>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :optional="true" class="list_area table_sy" :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <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>
+        </template>
+        <template partial='body'>
+          <td>{{ $index + 1 }}</td>
+          <td>{{ row.f_userinfo_code }}</td>
+          <td>{{ row.f_user_name }}</td>
+          <td>{{ row.f_user_state }}</td>
+          <td>{{ row.f_address }}</td>
+          <td>{{ row.f_meternumber }}</td>
+          <td>{{ row.f_meter_base }}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+    <modal v-if="addmeterinfoshow" :show="addmeterinfoshow" width="80%" v-ref:modal :backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <span class="glyphicon glyphicon-remove closebtn" @click="addUser(false)"></span>
+      </header>
+      <article slot="modal-body" class="modal-body" style="height: 700px">
+        <userfiles-list :f_filialeids.sync="f_filialeids" v-ref:userlist></userfiles-list>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click='addUser(false)'>取消</button>
+        <button type="button" class="btn btn-primary" @click='confirmAddUser()'>确认</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  name: 'UserfilesList',
+  data () {
+    return {
+      model: new PagedList('rs/sql/ncmeterQuery', 20),
+      f_orgid: '',
+      gasproperties: this.$appdata.getParam('用气性质') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')] : [],
+      user_type: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+      meter_classify: [{label: '机表', value: '机表'}],
+      user_state: [{label: '正常', value: '正常'}],
+      meterbrands: [],
+      addmeterinfoshow: false
+    }
+  },
+  props: {
+    f_filialeids: {
+      type: String
+    },
+    // 团缴主键
+    f_civill_id: {
+      type: Number
+    }
+  },
+  ready () {
+    // this.$refs.paged.$refs.cri.model.f_meter_classify = '机表'
+    this.$refs.paged.$refs.cri.model.f_user_state = '正常'
+    this.loadParamGem()
+  },
+  methods: {
+    async loadParamGem () {
+      await this.$LoadParams.loadParam()
+      await this.initAdjustables()
+      await this.$refs.paged.$refs.cri.search()
+    },
+    async initAdjustables () {
+      // 初始化气表品牌
+      let brandArr = []
+      this.$GetSaleParam.getGasbrand().forEach((item) => {
+        let temp1 = {}
+        temp1.label = item.label
+        temp1.value = item.value.f_meter_brand
+        brandArr.push(temp1)
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.f_filialeids])
+      }
+      if (this.f_civill_id) {
+        args.condition = `${args.condition} and f_civill_id = ${this.f_civill_id}`
+      } else {
+        args.condition = `${args.condition} and (f_civill_id is null or f_civill_id = '')`
+      }
+      args.condition = `${args.condition} and f_orgid in ${this.f_orgid}`
+      this.model.search(args.condition, args.model)
+      this.$refs.paged.$refs.grid.selectInit()
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+    },
+    addUser (flag) {
+      this.addmeterinfoshow = flag
+    },
+    async confirmAddUser () {
+      let dataArr = this.$refs.userlist.$refs.paged.$refs.grid.getRowData()
+      if (dataArr.length == 0) {
+        this.$showMessage(`当前未选中任何用户, 请核实!!!`)
+        return
+      }
+      let res = await this.$showMessage(`当前选中${dataArr.length}条用户, 确认建立团缴关系吗?`, ['confirm', 'cancel'])
+      if (res == 'confirm') {
+        let ids = []
+        for (let row of dataArr) {
+          ids.push(row.f_userfiles_id)
+        }
+        ids = this.$login.convertToIn(ids)
+        let param = {
+          ids: ids,
+          f_civill_id: this.f_civill_id
+        }
+        await this.$resetpost('rs/logic/updateCivill', param, {resolveMsg: '建立团缴关系成功', rejectMsg: '建立团缴关系失败!!!'})
+        this.addUser(false)
+        this.$refs.paged.$refs.cri.search()
+      }
+    },
+    async removeUser () {
+      let dataArr = this.$refs.paged.$refs.grid.getRowData()
+      if (dataArr.length == 0) {
+        this.$showMessage(`当前未选中任何用户, 请核实!!!`)
+        return
+      }
+      let res = await this.$showMessage(`当前选中${dataArr.length}条用户, 确认解除团缴关系吗?`, ['confirm', 'cancel'])
+      if (res == 'confirm') {
+        let ids = []
+        for (let row of dataArr) {
+          ids.push(row.f_userfiles_id)
+        }
+        ids = this.$login.convertToIn(ids)
+        let param = {
+          ids: ids
+        }
+        await this.$resetpost('rs/logic/updateCivill', param, {resolveMsg: '解除团缴关系成功', rejectMsg: '解除团缴关系失败!!!'})
+        this.$refs.paged.$refs.cri.search()
+      }
+    }
+  },
+  computed: {
+    inputtores () {
+      // 获取抄表员
+      console.log('获取抄表员', this.$login.f)
+      let rs = []
+      if (this.$login.f.f_gasman.length > 0) {
+        for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+          let temp = {
+            label: this.$login.f.f_gasman[i].name,
+            value: this.$login.f.f_gasman[i].name
+          }
+          rs.push(temp)
+        }
+      }
+      this.inputtores2 = rs
+      return [...rs]
+    }
+  },
+  watch: {
+    'f_civill_id' () {
+      this.$refs.paged.$refs.cri.search()
+    }
+  }
+}
+</script>
+
+<style lang="less">
+#UserfilesList {
+  tr {
+    th {
+      text-align: center;
+    }
+
+    td {
+      text-align: center;
+    }
+  }
+}
+</style>

package/src/filiale/kelai/sale.js

@@ -1,6 +1,9 @@
 // 分公司特殊组件页面注册
-
 let specialComp = {
-  'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) }
+  'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) },
+  // 团缴管理添加用的列表弹窗
+  'userfiles-list': (resolve) => { require(['./UserfilesList'], resolve) },
+  // 垃圾收费
+  'garbage-charge': (resolve) => { require(['./GarbageCharge'], resolve) }
 }
 exports.specialComp = specialComp

package/src/main.js

@@ -11,7 +11,7 @@ Vue.config.silent = true
 
 all()
 system(false)
-sale('dongguan')
+sale('kelai')
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')

package/src/sale.js

@@ -61,7 +61,9 @@ export default function (filiale) {
   // 综合业务 --综合操作
   // Vue.component('comprehen-search', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/ComprehenSearch'], resolve) })
   // 综合业务 --银行对账
+  Vue.component('bank-payment-new', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/BankPayment/BankPaymentnew'], resolve) })
   Vue.component('bank-payment', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment'], resolve) })
+  Vue.component('bank-payment-constrast', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/BankPayment/BankPaymentConstrast'], resolve) })
   // 综合业务 --订单明细
   Vue.component('order-detail', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/OrderDetails/OrderDetails'], resolve) })
   // 综合业务 --T+财务软件
@@ -471,6 +473,8 @@ export default function (filiale) {
   Vue.component('return-money-detail', (resolve) => { require(['./components/revenue/base/rightview/carddetail/ReturnMoney'], resolve) })
   // 气损收费详情小组件
   Vue.component('gasloss-detail', (resolve) => { require(['./components/revenue/base/rightview/carddetail/GasLossDetail'], resolve) })
+  // 垃圾费收费详情小组件
+  Vue.component('garbage-detail', (resolve) => { require(['./components/revenue/base/rightview/carddetail/GarbageDetail'], resolve) })
 
   /** **************************换表相关组件***************************/
   // 换新表