sale-client 3.5.25 → 3.5.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.25",
+  "version": "3.5.28",
   "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/ChargeList.vue

@@ -363,7 +363,7 @@ let cardBtnGen = async function (self, val) {
             }
             if (getUser.data.length == 1 && getUser.data[0].f_alias === self.cardInfo.Factory) {
               self.readCardParam = getUser.data[0].f_card_password
-              self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(getUser.data.f_card_password)
+              self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(getUser.data[0].f_card_password)
             } else {
               self.$showAlert('此卡需要先获取客户信息。请通过条件查询该客户信息之后进行读卡！！', 'warning', 2000)
               return

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/batch/batchUserList.vue

@@ -114,7 +114,7 @@
     // console.log('获取登录信息，', self.$login, self.$appdata, self.$appdata.getParam('用户类型'), Vue.$login.f.name)
     await self.search()
     await self.$LoadParams.loadParam()
-    let overdueset= []
+    let overdueset = []
     let res = await self.$resetpost('rs/sql/saleSingleTable', {
       data: {
         tablename: 't_overdue_set',
@@ -179,7 +179,7 @@
 
           // 是多选
           if (this.rowsdata.length) {
-            info = '确认批量修改档案吗?'
+            info = `共选中${this.rowsdata.length}条数据，确认批量修改档案吗?`
           }
           // 点击的是批量生成
           this.$showMessage(info, ['confirm', 'cancel']).then(

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>