sale-client 3.6.166 → 3.6.168

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
+const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://127.0.0.1:8080/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -18,7 +18,10 @@ var devConfig = {
     },
     proxy: {
       '/rs/file': {
-        target: serverRul
+        target: localUrl
+      },
+      '/rs/downloadfile': {
+        target: localUrl
       },
       '/webapps': {
         target: serverRul

package/package.json

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

package/src/components/common/userinfo_detail/UserBaseInfo.vue

@@ -343,10 +343,20 @@
           meternumberf: this.row.f_meternumber,
           contentData: {isOpen: oper ? 1 : 0}
         }
-        await this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
-          {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
-            this.valve = false
-            this.operateReason = ''
+        let _this = this
+        await this.$resetpost('rs/sql/iot_searchInstruct', {data: datas},
+          {warnMsg: null, resolveMsg: null}).then(res => {
+            if (res.data.length === 0) {
+              _this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
+                {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
+                  _this.valve = false
+                  _this.operateReason = ''
+                })
+            } else {
+              this.$showAlert('存在开关阀待发送的指令，系统不生成同样的待发送指令', 'warning', 3000)
+              _this.valve = false
+              _this.operateReason = ''
+            }
           })
       }
     },

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

@@ -388,10 +388,20 @@
           meternumberf: this.row.f_meternumber,
           contentData: {isOpen: oper ? 1 : 0}
         }
-        await this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
-          {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
-            this.valve = false
-            this.operateReason = ''
+        let _this = this
+        await this.$resetpost('rs/sql/iot_searchInstruct', {data: datas},
+          {warnMsg: null, resolveMsg: null}).then(res => {
+            if (res.data.length === 0) {
+              _this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
+              {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
+                _this.valve = false
+                _this.operateReason = ''
+              })
+            } else {
+              this.$showAlert('存在开关阀待发送的指令，系统不生成同样的待发送指令', 'warning', 3000)
+              _this.valve = false
+              _this.operateReason = ''
+            }
           })
       }
     },

package/src/components/revenue/Common/PaymentCode.vue

@@ -44,7 +44,7 @@
         timer: null,
         // 收费成功id
         sellinggasId: null,
-        canPayment: this.$appdata.getSingleValue('微信支付付款方式') ? this.$appdata.getSingleValue('微信支付付款方式') : '微信支付',
+        canPayment: this.$appdata.getSingleValue('微信支付付款方式') ? this.$appdata.getSingleValue('微信支付付款方式') : '',
       }
     },
     created () {

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

@@ -152,6 +152,7 @@
       </thead>
       <tr v-for="checkitem in model.safecheckitem">
         <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ checkitem.f_item_name }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ checkitem.f_is_repaired }}</td>
         <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%" v-if="checkitem.f_path!='' && checkitem.f_path!=null">
           <img-self :src="'rs/image/file/'+checkitem.f_path" style="float: left"  width="100" height="150"></img-self>
         </td>

package/src/components/revenue/batchDeduction/batchDeduction.vue

@@ -0,0 +1,47 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main" :class="{'basic-main':!chargeShow,'binary-left':chargeShow}" style="height: 98%;">
+      <batch-deduction-list :charge-show="chargeShow"  v-ref:deductionlist></batch-deduction-list>
+    </div>
+    <div style="height: 98%;width: 40%" class="binary-right" v-if="chargeShow">
+      <batch-deduction-oper :batch-id="batch_id" v-ref:oper></batch-deduction-oper>
+    </div>
+    <work-busy :is-busy="isbusy"></work-busy>
+  </div>
+</template>
+<script>
+export default {
+  title: '批量补扣费',
+  data () {
+    return {
+      chargeShow: false,
+      batch_id: '',
+      isbusy: false
+    }
+  },
+  ready () {},
+  methods: {},
+  events: {
+    async batchToSell (condition) {
+      this.isbusy = true
+      await this.$resetpost(`rs/logic/sale_chargeDeduction`, {condition}, {
+        resolveMsg: '生成收费记录成功',
+        rejectMsg: '生成收费记录失败',
+        silent: true
+      }, 0).then(res => {
+        this.batch_id = res.data
+        this.isbusy = false
+      }).catch(e => {
+        this.isbusy = false
+      })
+      await this.$refs.deductionlist.search()
+      this.chargeShow = true
+    },
+    reSearch () {
+      this.chargeShow = false
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+</style>

package/src/components/revenue/batchDeduction/batchDeductionList.vue

@@ -0,0 +1,238 @@
+<template>
+  <criteria-paged :model="model" v-ref:paged>
+    <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+      <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+        <div class="row">
+          <div class="form-group col-sm-2">
+            <label class="font_normal_body"><nobr>用户编号</nobr></label>
+            <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                   condition="tbd.f_userinfo_code='{}'" placeholder='用户编号'>
+          </div>
+          <div class="form-group col-sm-2">
+            <label class="font_normal_body"><nobr>用户姓名</nobr></label>
+            <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                   condition="tbd.f_user_name = '{}'" placeholder='用户姓名'>
+          </div>
+          <div class="form-group col-sm-2" v-if="!$parent.$parent.chargeShow" >
+            <label class="font_normal_body"><nobr>用气性质</nobr></label>
+            <input type="text" style="width:60%" class="input_search" v-model="model.f_gasproperties"
+                   condition="uf.f_gasproperties='{}'" placeholder='用气性质'>
+          </div>
+
+          <div class="span" style="float:right;">
+            <button class="button_export button_spacing" @click="$parent.$parent.importToSuccess()">一键生成补扣费记录</button>
+            <button class="button_export button_spacing" @click="$parent.$parent.importForThe()">导入待处理记录</button>
+            <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
+            <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+            <div style="float: right" class="button_spacing"
+                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                 @click="$parent.$parent.hidden()"></div>
+          </div>
+        </div>
+        <div class="row" v-show="$parent.$parent.criteriaShow">
+          <div class="form-group col-sm-2">
+            <label class="font_normal_body"><nobr>记录状态</nobr></label>
+            <v-select v-model="model.f_state"
+                      placeholder='记录状态'
+                      :value.sync="model.f_state"
+                      :options='$parent.$parent.states'
+                      condition="tbd.f_state = '{}'"
+                      style="width: 60%"
+                      close-on-select></v-select>
+          </div>
+          <div class="form-group col-sm-2" v-if="$parent.$parent.chargeShow" >
+            <label class="font_normal_body"><nobr>用气性质</nobr></label>
+            <input type="text" style="width:60%" class="input_search" v-model="model.f_gasproperties"
+                   condition="uf.f_gasproperties='{}'" placeholder='用气性质'>
+          </div>
+        </div>
+      </div>
+    </criteria>
+    <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th>序号</th>
+          <th>客户编号</th>
+          <th>用户姓名</th>
+          <th>用气性质</th>
+          <th>表上余额</th>
+          <th>系统余额</th>
+          <th>金额</th>
+          <th>业务类型</th>
+          <th>收费时间</th>
+          <th>记录状态</th>
+          <th>生成记录人员</th>
+          <th>所属分公司</th>
+          <th>操作</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td style="text-align: center;"> {{ $index + 1 }}</td>
+        <td>{{ row.f_userinfo_code }}</td>
+        <td>{{ row.f_user_name }}</td>
+        <td>{{ row.f_gasproperties }}</td>
+        <td>{{ row.f_jval }}</td>
+        <td>{{ row.f_balance_amount }}</td>
+        <td>{{ row.f_collection }}</td>
+        <td>{{ row.f_collection < 0 ? '扣费' : '补费' }}</td>
+        <td>{{ row.f_operate_date }}</td>
+        <td>{{ row.f_state }}</td>
+        <td>{{ row.f_operator }}</td>
+        <td>{{ row.f_orgname }}</td>
+        <td style="text-align: center"> <button v-if="row.f_state === '待生成'" type="button" class="btn btn-danger" @click.stop="$parent.$parent.$parent.cancel(row)">作废</button>&nbsp;&nbsp;&nbsp;
+        </td>
+      </template>
+    </data-grid>
+  </criteria-paged>
+  <work-busy :is-busy='isbusy'></work-busy>
+  <modal :show.sync="fileShow" width="480px" v-ref:modal backdrop="true">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="importForThe"><span>&times;</span></button>
+      <h4 class="modal-title">选择文件</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定"
+                     multiple v-ref:file></file-upload>
+        <button type="button" style="margin-top: 10px;" @click="downloadFiles()" class="button_clear btn-gn">模板下载</button>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="display: none"></footer>
+  </modal>
+</template>
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '批量预存',
+  props: ['chargeShow'],
+  data () {
+    return {
+      criteriaShow: false,
+      model: new PagedList('rs/sql/getDeductionRecord', 30 ,{}),
+      fileShow: false,
+      condition: '',
+      searchEd: false,
+      templateName: '批量补扣费导入模板',
+      states: [
+        {label: '待生成', value: '待生成'},
+        {label: '已生成', value: '已生成'},
+        {label: '作废', value: '作废'}
+      ],
+      isbusy: false
+    }
+  },
+
+  ready () {
+  },
+  methods: {
+    downloadFiles () {
+      let downurl = 'rs/downloadfile/file?filename=' + this.templateName
+      this.$downFile(downurl, this.templateName + '.xlsx')
+    },
+    selfSearch (args) {
+      this.condition = args.condition
+      this.model.search(args.condition, this.model)
+      this.searchEd = true
+      this.$dispatch('reSearch')
+    },
+    // 待生成记录生成为有效收费记录
+    async importToSuccess () {
+      if (this.searchEd) {
+        // 查询有多少待执行记录
+        let condition = this.condition + ` and tbd.f_state = '待生成' `
+        let http = new HttpResetClass()
+        let getCount = await http.load('POST', 'rs/sql/getDeductionRecord',
+          {data: {
+            condition: condition
+          }},
+          {resolveMsg: null, rejectMsg: null})
+        let sum = getCount.data.length
+        if (sum === 0) {
+          this.$showAlert('没有待生成的记录', 'warning', 2000)
+          return
+        }
+        this.$showMessage(`确定要生成收费记录吗?共计${sum}条记录`, ['confirm', 'cancel']).then(async (res) => {
+          if (res === 'confirm') {
+            this.$dispatch('batchToSell', condition)
+          }
+        })
+      } else {
+        this.$showAlert('请先执行查询操作', 'warning', 2000)
+      }
+    },
+    importForThe () {
+      this.fileShow = !this.fileShow
+    },
+    // 作废待生成记录
+    async cancel (row) {
+      await this.$resetpost('rs/entity/t_batch_deductions', {id: row.id, f_state: '作废'}, {
+        resolveMsg: '作废成功',
+        rejectMsg: '作废失败!!!'
+      })
+      await this.search()
+    },
+    // 隐藏折叠条件
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    // 清空
+    clear () {
+      Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+        this.$refs.paged.$refs.criteria.model[key] = []
+      })
+    },
+    search () {
+      this.$refs.paged.$refs.criteria.search()
+    }
+  },
+  events: {
+    onFileUpload: async function (file, res) {
+      this.isbusy = true
+      let data = {
+        filepath: res.f_downloadpath,
+        f_operator: Vue.$login.f.name,
+        f_operatorid: Vue.$login.f.id,
+        f_orgid: Vue.$login.f.orgid,
+        f_orgname: Vue.$login.f.orgs,
+        f_depid: Vue.$login.f.depids,
+        f_depname: Vue.$login.f.deps
+      }
+      await this.$resetpost(`rs/logic/sale_importPreloads`, data, {
+        resolveMsg: null,
+        rejectMsg: '导入失败',
+        silent: true
+      }, 0).then((res) => {
+        this.isbusy = false
+        if (res.data.type == 'success') {
+          this.$showAlert('导入信息:' + res.data.msg, res.data.type, 2000)
+        } else {
+          this.$showAlert('文件上传失败，请检查数据格式(每个数据字段值都为文本格式,收费金额为数字,日期格式为 年年年年-月月-日日 时时:分分:秒秒),多次错误请尝试重新下载模板', 'warning', 2000)
+        }
+        // 关闭上传框
+        this.importForThe()
+        // 重新查询
+        this.search()
+      }).catch(() => {
+        this.$showAlert('文件上传失败，请检查数据格式(每个数据字段值都为文本格式,收费金额为数字,日期格式为 年年年年-月月-日日 时时:分分:秒秒),多次错误请尝试重新下载模板', 'warning', 2000)
+        this.isbusy = false
+      })
+    },
+    'onFileError' (error) {
+      this.$showAlert('文件上传失败，请检查数据格式(每个数据字段值都为文本格式,收费金额为数字,日期格式为 年年年年-月月-日日 时时:分分:秒秒),多次错误请尝试重新下载模板', 'warning', 2000)
+    }
+  }
+
+}
+</script>
+<style lang="less" scoped>
+.table_sy {
+  tr {
+    td {
+      text-align: center;
+    }
+  }
+}
+</style>

package/src/components/revenue/batchDeduction/batchDeductionOper.vue

@@ -0,0 +1,119 @@
+<template>
+  <criteria-paged :simple="true" :model="model" v-ref:paged>
+    <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+      <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+      </div>
+    </criteria>
+    <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th>客户编号</th>
+          <th>用户姓名</th>
+          <th>用气性质</th>
+          <th>金额</th>
+          <th>业务类型</th>
+          <th>操作</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td>{{ row.f_userinfo_code }}</td>
+        <td>{{ row.f_user_name }}</td>
+        <td>{{ row.f_gasproperties }}</td>
+        <td>{{ row.f_collection }}</td>
+        <td>{{ row.type }}</td>
+        <td style="text-align: center;">
+          <button @click.stop="$parent.$parent.$parent.report(row)" class="btn btn-link" name="button" type="button"
+                  v-if="row.f_state==='已生成'">票据补打
+          </button>
+<!--          <button @click.stop="$parent.$parent.$parent.cancel(row)" class="btn btn-link" name="button" type="button"-->
+<!--                  v-if="row.f_state==='已生成'">撤销记录-->
+<!--          </button>-->
+        </td>
+      </template>
+    </data-grid>
+  </criteria-paged>
+  <record-cancel :data="cancel_data" :show.sync="cancel_show" @cancel="cancelOper()" @cancel-success="cancelSucc()" v-if="cancel_show"></record-cancel>
+  <reissue-bill :data="reissue_data" :show.sync="reissue_show" @cancel="reissueOper()" @reissue-success="reissueSucc()"
+                v-if="reissue_show"></reissue-bill>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import co from 'co'
+
+let reprintGen = function* (self, row) {
+  try {
+    let reissueData = {}
+    reissueData = Object.assign({}, reissueData, row)
+    reissueData.f_bill_type = '预存缴费'
+    reissueData.f_bill_style = '普通收据'
+    reissueData.f_operator = self.$login.f.name
+    reissueData.f_operatorid = self.$login.f.id
+    reissueData.f_orgid = self.$login.f.orgid
+    reissueData.f_orgname = self.$login.f.orgs
+    reissueData.f_depid = self.$login.f.depids
+    reissueData.f_depname = self.$login.f.deps
+    reissueData.billUrl = 'rs/report/MakeUp'
+    self.reissue_data = reissueData
+    self.reissue_show = true
+  } catch (error) {
+    if (error.status) {
+      self.$warn(`加载数据出错, ${JSON.stringify(error)}`, 'CardList')
+    }
+    throw error
+  }
+}
+export default {
+  title: '批量预存',
+  props: ['batchId'],
+  data () {
+    return {
+      model: new PagedList('rs/sql/batchDeductionQuery', 30),
+      reissue_show: false,
+      cancel_show: false,
+      cancel_data: null,
+      reissue_data: null
+    }
+  },
+
+  ready () {
+    this.search()
+  },
+  methods: {
+    cancel (row) {
+      this.cancel_show = true
+      this.cancel_data = row
+    },
+    cancelOper () {
+      this.cancel_data = null
+      this.cancel_show = false
+    },
+    cancelSucc () {
+      this.cancel_show = false
+      this.search()
+      this.$dispatch('refresh')
+    },
+    selfSearch (args) {
+      args.condition = args.condition + ` and tbd.f_batch_id = '${this.batchId}'`
+      this.model.search(args.condition, this.model)
+    },
+    reissueSucc () {
+      this.reissue_show = false
+      this.$dispatch('refresh')
+    },
+    reissueOper () {
+      this.reissue_data = null
+      this.reissue_show = false
+    },
+    report (row) {
+      let reprint = reprintGen(this, row)
+      return co(reprint)
+    },
+    search () {
+      this.$refs.paged.$refs.criteria.search()
+    }
+  }
+
+}
+</script>
+<style lang="less" scoped>
+</style>

package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue

@@ -31,7 +31,7 @@
             </div>
             <div class="col-sm-8" :class="[$v.f_newidnumber.identityCardValid ? 'has-error' : '']" v-if="model.f_newcredentials[0] === '身份证'">
               <label id="label" class="font_normal_body">*证件号码</label>
-              <input type="text"  v-model="model.f_newidnumber" v-validate:f_newidnumber='{identityCardValid: true}' class="input_search" style="width:80%" placeholder="新身份证号">
+              <input type="text"  v-model="model.f_newidnumber" maxlength="18" v-validate:f_newidnumber='{identityCardValid: true}' class="input_search" style="width:80%" placeholder="新身份证号">
             </div>
             <div class="col-sm-8" v-if="model.f_newcredentials[0] !== '身份证'">
               <label class="font_normal_body">&nbsp;证件号码</label>

package/src/components/revenue/comprehen/closeaccount/Batchmanage.vue

@@ -1,20 +1,19 @@
 <template>
 <!--  <div v-if="listpage">-->
     <tab-button v-ref:list>
-      <tabs header="批量销户审核">
+      <tabs header="批量销户审核" v-if="permission('批量销户审核')">
         <battch-canceluser-audit @deal-msg="dealMsg"></battch-canceluser-audit>
       </tabs>
-      <tabs header="修改抄表员">
+      <tabs header="修改抄表员" v-if="permission('修改抄表员')">
         <batch-update-inputtor @deal-msg="dealMsg"></batch-update-inputtor>
       </tabs>
-      <tabs header="修改表档案">
+      <tabs header="修改表档案" v-if="permission('修改表档案')">
+        <batch-edit-manage @deal-msg="dealMsg"></batch-edit-manage>
+      </tabs>
+      <tabs header="批量补扣费" v-if="permission('批量补扣费')">
         <batch-edit-manage @deal-msg="dealMsg"></batch-edit-manage>
       </tabs>
     </tab-button>
-<!--  </div>-->
-<!--  <div v-if="!listpage">-->
-<!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
-<!--  </div>-->
 </template>
 
 <script>
@@ -39,12 +38,17 @@
         show: [true]
       }
     },
-    components: {Tabs, TabButton, Closeaccount },
+    components: { Tabs, TabButton, Closeaccount },
     ready () {
-      console.log(this.$refs.list)
-      console.log('批量管理')
+      if (!this.permission('批量销户审核') && !this.permission('修改抄表员') && !this.permission('修改表档案') &&
+      !this.permission('批量补扣费')) {
+        this.$showAlert('您没有该页面的内容权限，请向管理员申请', 'warning', 3000)
+      }
     },
     methods: {
+      permission (name) {
+        return this.$login.r.find(value => value == name)
+      },
       cancel (obj) {
         this.listpage = true
       },

package/src/components/revenue/comprehen/gasbrand/AddGasBrand.vue

@@ -1,19 +1,21 @@
 <template>
-  <div  class="auto select-overspread" style="padding-left: 10px;">
-    <ul class="nav nav-tabs"  style="margin-bottom: 10px">
+  <div class="auto select-overspread" style="padding-left: 10px;">
+    <ul class="nav nav-tabs" style="margin-bottom: 10px">
       <li role="presentation" class="active"><a href="#">气表品牌</a></li>
     </ul>
     <validator name='v'>
-      <form  novalidate class="form-horizontal select-overspread container-fluid auto">
-        <div class="row" >
+      <form novalidate class="form-horizontal select-overspread container-fluid auto">
+        <div class="row">
           <div class="col-sm-4 form-group" :class="[$v.f_meter_brand.required ? 'has-error' : 'has-success']">
-            <label for="f_meter_brand"  class="font_normal_body">气表品牌</label>
-            <input class="input_search" style="width: 60%"  type="text" v-model="gasmessage.f_meter_brand" v-validate:f_meter_brand="['required']">
+            <label for="f_meter_brand" class="font_normal_body">气表品牌</label>
+            <input class="input_search" style="width: 60%" type="text" v-model="gasmessage.f_meter_brand"
+                   v-validate:f_meter_brand="['required']">
           </div>
 
           <div class="col-sm-4 form-group" :class="[$v.metertype.required ? 'has-error' : '']">
             <label for="f_meter_type" class="font_normal_body">气表类型</label>
-            <input type="text" class="input_search" style="width: 60%" v-show="false" v-model="$refs.metertype.selectedItems" v-validate:metertype='{required: true }'>
+            <input type="text" class="input_search" style="width: 60%" v-show="false"
+                   v-model="$refs.metertype.selectedItems" v-validate:metertype='{required: true }'>
             <v-select :value.sync="gasmessage.f_meter_type"
                       v-model="gasmessage.f_meter_type"
                       :options='meterType' placeholder='气表类型'
@@ -21,18 +23,19 @@
           </div>
           <div class="col-sm-4 form-group" :class="[$v.f_alias.required ? 'has-error' : 'has-success']">
             <label for="f_alias" class="font_normal_body">别&emsp;&emsp;名</label>
-            <input class="input_search" style="width: 60%" type="text" v-model="gasmessage.f_alias" v-validate:f_alias='{required: true }'>
+            <input class="input_search" style="width: 60%" type="text" v-model="gasmessage.f_alias"
+                   v-validate:f_alias='{required: true }'>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_checkout_limit" class="font_normal_body ">校检年限</label>
-            <input class="input_search" style="width: 60%" type="number" v-model="gasmessage.f_checkout_limit"  >
+            <input class="input_search" style="width: 60%" type="number" v-model="gasmessage.f_checkout_limit">
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_collection_type" class="font_normal_body">缴费方式</label>
             <v-select :value.sync="gasmessage.f_collection_type"
                       v-model="gasmessage.f_collection_type"
                       :options='collectiontypes' placeholder='缴费方式'
-                      close-on-select :disabled='colletype'  style="width: 60%"></v-select>
+                      close-on-select :disabled='colletype' style="width: 60%"></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_isdecimal" class="font_normal_body">支持小数</label>
@@ -43,7 +46,7 @@
           </div>
           <div class="col-sm-4 form-group" v-if="gasmessage.f_isdecimal[0] ==='是'">
             <label for="f_isdecimal" class="font_normal_body">气量位数</label>
-              <v-select :value.sync="gasmessage.f_gas_decimal"
+            <v-select :value.sync="gasmessage.f_gas_decimal"
                       v-model="gasmessage.f_gas_decimal"
                       :value-single="true"
                       :search="false"
@@ -59,31 +62,45 @@
                       :options='decimalArray' placeholder='金额位数'
                       close-on-select style="width: 60%"></v-select>
           </div>
-          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('物联网')" :class="[$v.calculation.required ? 'select-error' : '']">
+          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('物联网')"
+               :class="[$v.calculation.required ? 'select-error' : '']">
             <label for="f_calculation" class="font_normal_body">结算方式</label>
-            <input type="text" v-show="false" v-model="$refs.calculation.selectedItems" v-validate:calculation='{required: true }'>
-            <v-select :value.sync="gasmessage.f_calculation" :width="'60%'" :options='calculation' placeholder='结算方式' close-on-select v-ref:calculation>
+            <input type="text" v-show="false" v-model="$refs.calculation.selectedItems"
+                   v-validate:calculation='{required: true }'>
+            <v-select :value.sync="gasmessage.f_calculation" :width="'60%'" :options='calculation'
+                      placeholder='结算方式' close-on-select v-ref:calculation>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('物联网') && gasmessage.f_calculation.length
+                                                && gasmessage.f_calculation[0] == '表端结算'">
+            <label for="f_calculation" class="font_normal_body">系统结算</label>
+            <v-select :value.sync="gasmessage.f_system_settlement" :width="'60%'"
+                      v-model="gasmessage.f_system_settlement"
+                      :search="false"
+                      :options='isdecimal' placeholder='系统是否结算' close-on-select>
             </v-select>
           </div>
           <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('物联网')">
             <label for="f_hascard" class="font_normal_body">是否带卡</label>
 
-              <v-select :value.sync="gasmessage.f_hascard"
-                        v-model="gasmessage.f_hascard"
-                        :options='isdecimal' placeholder='是否带卡'
-                        close-on-select style="width: 60%"></v-select>
+            <v-select :value.sync="gasmessage.f_hascard"
+                      v-model="gasmessage.f_hascard"
+                      :options='isdecimal' placeholder='是否带卡'
+                      close-on-select style="width: 60%"></v-select>
 
           </div>
-          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('物联网') && gasmessage.f_hascard[0]==='是'">
+          <div class="col-sm-4 form-group"
+               v-if="gasmessage.f_meter_type[0].includes('物联网') && gasmessage.f_hascard[0]==='是'">
             <label for="f_hascard" class="font_normal_body">共用次数</label>
 
-              <v-select :value.sync="gasmessage.f_share_times"
-                        v-model="gasmessage.f_share_times"
-                        :options='isdecimal' placeholder='是否共用次数'
-                        close-on-select style="width: 60%"></v-select>
+            <v-select :value.sync="gasmessage.f_share_times"
+                      v-model="gasmessage.f_share_times"
+                      :options='isdecimal' placeholder='是否共用次数'
+                      close-on-select style="width: 60%"></v-select>
 
           </div>
-          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('物联网') && gasmessage.f_hascard[0]==='是'">
+          <div class="col-sm-4 form-group"
+               v-if="gasmessage.f_meter_type[0].includes('物联网') && gasmessage.f_hascard[0]==='是'">
             <label for="f_hascard" class="font_normal_body">共用开户</label>
 
             <v-select :value.sync="gasmessage.f_share_open"
@@ -96,14 +113,15 @@
           <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('气量卡表')">
             <label for="hasCard" class="font_normal_body">支持蓝牙</label>
 
-              <v-select :value.sync="gasmessage.f_support_bluetooth"
-                        :value-single="true"
-                        v-model="gasmessage.f_support_bluetooth"
-                        :options='isdecimal' placeholder='是否支持蓝牙'
-                        close-on-select style="width: 60%"></v-select>
+            <v-select :value.sync="gasmessage.f_support_bluetooth"
+                      :value-single="true"
+                      v-model="gasmessage.f_support_bluetooth"
+                      :options='isdecimal' placeholder='是否支持蓝牙'
+                      close-on-select style="width: 60%"></v-select>
 
           </div>
-          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('卡表')||gasmessage.f_meter_type[0].includes('物联网表')">
+          <div class="col-sm-4 form-group"
+               v-if="gasmessage.f_meter_type[0].includes('卡表')||gasmessage.f_meter_type[0].includes('物联网表')">
             <label for="hasCard" class="font_normal_body">是否累购</label>
             <v-select :value.sync="gasmessage.f_support_purchase"
                       :value-single="true"
@@ -121,18 +139,20 @@
           </div>
           <div v-if="gasmessage.f_meter_type[0].includes('卡表') || gasmessage.f_hascard[0]==='是'" class="row">
             <div class="col-sm-4 form-group" :class="[$v.f_cardnumber.required ? 'has-error' : 'has-success']">
-              <label for="f_card_password"  class="font_normal_body">&nbsp;&nbsp;&nbsp;卡号&nbsp;&nbsp;&nbsp;</label>
-              <input class="input_search" style="width: 60%" type="text" v-model="gasmessage.f_cardnumber"  v-validate:f_cardnumber='{required: true }'>
+              <label for="f_card_password" class="font_normal_body">&nbsp;&nbsp;&nbsp;卡号&nbsp;&nbsp;&nbsp;</label>
+              <input class="input_search" style="width: 60%" type="text" v-model="gasmessage.f_cardnumber"
+                     v-validate:f_cardnumber='{required: true }'>
             </div>
-            <div class="col-sm-4 form-group" >
-              <label for="f_card_password"  class="font_normal_body">卡&ensp;密&ensp;码</label>
-              <input class="input_search" style="width: 60%" type="text" v-model="gasmessage.f_card_password"  >
+            <div class="col-sm-4 form-group">
+              <label for="f_card_password" class="font_normal_body">卡&ensp;密&ensp;码</label>
+              <input class="input_search" style="width: 60%" type="text" v-model="gasmessage.f_card_password">
             </div>
           </div>
 
           <div class="col-sm-4 form-group">
-            <label  class="font_normal_body ">优&ensp;先&ensp;级</label>
-            <input class="input_search" placeholder="优先级" style="width:60%" type="text" v-model="gasmessage.f_priority">
+            <label class="font_normal_body ">优&ensp;先&ensp;级</label>
+            <input class="input_search" placeholder="优先级" style="width:60%" type="text"
+                   v-model="gasmessage.f_priority">
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_is_check" class="font_normal_body">是否校验</label>
@@ -156,8 +176,9 @@
                       close-on-select style="width: 60%"></v-select>
           </div>
           <div class="col-sm-4 form-group">
-            <label  class="font_normal_body ">表号长度</label>
-            <input class="input_search" placeholder="表号长度" style="width:60%" type="number" v-model="gasmessage.f_meternumber_len">
+            <label class="font_normal_body ">表号长度</label>
+            <input class="input_search" placeholder="表号长度" style="width:60%" type="number"
+                   v-model="gasmessage.f_meternumber_len">
           </div>
           <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('卡表')">
             <label for="hasCard" class="font_normal_body">动&ensp;态&ensp;库<br/>到&ensp;期&ensp;日</label>
@@ -170,17 +191,24 @@
 
 
           <div class="col-sm-12 form-group" style="height: auto !important;">
-            <label  class="font_normal_body " style="margin-top:-20px">备&emsp;&emsp;注</label>
-            <textarea class="input_textarea" rows="3" style="width:87%;margin-top:5px" v-model="gasmessage.f_comments"></textarea>
+            <label class="font_normal_body " style="margin-top:-20px">备&emsp;&emsp;注</label>
+            <textarea class="input_textarea" rows="3" style="width:87%;margin-top:5px"
+                      v-model="gasmessage.f_comments"></textarea>
           </div>
         </div>
         <p class="bg-info text-center" style="padding: 8px;margin: 8px">气表型号</p>
-        <add-gas-model :data="gasmessage"  :modelvalid.sync="modelvalid" v-on:toggle = "getArrParam"   v-ref:addgasmodel></add-gas-model>
+        <add-gas-model :data="gasmessage" :modelvalid.sync="modelvalid" v-on:toggle="getArrParam"
+                       v-ref:addgasmodel></add-gas-model>
         <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
-          <button type="button" class="button_search " @click="confirm()" :disabled='!($v.valid && modelvalid) ' v-if ='isConfirm'>保存</button>
-          <button type="button" class="button_search " @click="modify()" :disabled='!($v.valid && modelvalid)' v-if ='isModify' >修改</button>
-          <button type="button" class="button_search " @click="delMeter()" v-if='data.counts===0 && isModify'>删除</button>
-          <button type="button" class="button_clear" @click="cancel()" >取消</button>
+          <button type="button" class="button_search " @click="confirm()" :disabled='!($v.valid && modelvalid) '
+                  v-if='isConfirm'>保存
+          </button>
+          <button type="button" class="button_search " @click="modify()" :disabled='!($v.valid && modelvalid)'
+                  v-if='isModify'>修改
+          </button>
+          <button type="button" class="button_search " @click="delMeter()" v-if='data.counts===0 && isModify'>删除
+          </button>
+          <button type="button" class="button_clear" @click="cancel()">取消</button>
         </div>
       </form>
     </validator>
@@ -191,9 +219,10 @@
 import ViewOrg from './ViewOrg'
 import AddGasModel from './AddGasModel'
 import {HttpResetClass} from 'vue-client'
+
 /**
-*阶梯气价管理组件
-*/
+ *阶梯气价管理组件
+ */
 export default {
   components: {AddGasModel, ViewOrg},
   title: '修改气表品牌',
@@ -217,6 +246,7 @@ export default {
         f_support_bluetooth: '',
         f_support_purchase: '',
         f_issupport_feededuction: '',
+        f_system_settlement: '',
         f_share_times: '',
         f_share_open: '',
         f_priority: 100,
@@ -239,7 +269,10 @@ export default {
       isdecimal: [{label: '否', value: '否'}, {label: '是', value: '是'}],
       decimalArray: [{label: 1, value: 1}, {label: 2, value: 2}, {label: 3, value: 3}, {label: 4, value: 4}],
       collectiontypes: [{label: '按金额', value: '按金额'}, {label: '按气量', value: '按气量'}],
-      meterType: [{label: '金额卡表', value: '金额卡表'}, {label: '气量卡表', value: '气量卡表'}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
+      meterType: [{label: '金额卡表', value: '金额卡表'}, {label: '气量卡表', value: '气量卡表'}, {
+        label: '机表',
+        value: '机表'
+      }, {label: '物联网表', value: '物联网表'}],
       calculation: [{label: '表端结算', value: '表端结算'}, {label: '系统结算', value: '系统结算'}]
     }
   },
@@ -291,6 +324,7 @@ export default {
         this.gasmessage.f_is_step = this.gasmessage.f_is_step ? [this.gasmessage.f_is_step] : []
         this.gasmessage.f_collection_type = this.gasmessage.f_collection_type ? [this.gasmessage.f_collection_type] : ''
         this.gasmessage.f_calculation = this.gasmessage.f_calculation ? [this.gasmessage.f_calculation] : ''
+        this.gasmessage.f_system_settlement = this.gasmessage.f_system_settlement ? [this.gasmessage.f_system_settlement] : ''
         this.isConfirm = false
         this.gasmessage.f_hascard = this.gasmessage.f_hascard ? [this.gasmessage.f_hascard] : []
         this.gasmessage.f_share_times = this.gasmessage.f_share_times ? [this.gasmessage.f_share_times] : []
@@ -317,14 +351,15 @@ export default {
       this.model.f_isdecimal = this.model.f_meter_type.includes('物联网') ? '是' : this.model.f_isdecimal[0]
       this.model.f_collection_type = this.model.f_collection_type[0]
       this.model.f_calculation = this.model.f_calculation[0]
+      this.model.f_system_settlement = this.model.f_system_settlement[0]
       this.model.useOrg = this.useOrg
       this.getArrParam()
       this.$LogicService.addGasBrand(this.model, this.addGasModelArray)
-      .then(
-        (res) => {
-          this.$dispatch('success', '气表品牌增加', this.data, res)
-        }
-      ).catch(
+        .then(
+          (res) => {
+            this.$dispatch('success', '气表品牌增加', this.data, res)
+          }
+        ).catch(
         (error) => {
           this.$dispatch('error', '气表品牌增加', this.data, error)
         }
@@ -356,22 +391,23 @@ export default {
       console.log('+++++++++++++', this.model)
       if (this.model.f_meter_type !== '物联网表') {
         // this.model.f_hascard ='否'
-       // this.model.f_share_times = '否'
+        // this.model.f_share_times = '否'
       }
       if (this.model.f_meter_type !== '气量卡表') {
-       // this.model.f_support_bluetooth = '否'
+        // this.model.f_support_bluetooth = '否'
       }
       this.model.f_isdecimal = this.model.f_isdecimal[0]
       this.model.f_collection_type = this.model.f_collection_type[0]
       this.model.f_calculation = this.model.f_calculation[0]
+      this.model.f_system_settlement = this.model.f_system_settlement[0]
       this.$LogicService.modifyGasBrand(this.model, this.addGasModelArray)
-      .then(
-        (res) => {
-          let http = new HttpResetClass()
-          http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})
-          this.$dispatch('success', '气表品牌修改', this.data, res)
-        }
-      ).catch(
+        .then(
+          (res) => {
+            let http = new HttpResetClass()
+            http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})
+            this.$dispatch('success', '气表品牌修改', this.data, res)
+          }
+        ).catch(
         (error) => {
           this.$dispatch('error', '气表品牌修改', this.data, error)
         }

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

@@ -159,10 +159,20 @@ export default {
         meternumberf: this.row.f_meternumber,
         contentData: {isOpen: oper ? 1 : 0}
       }
-      await this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
-        {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
-          this.valve = false
-          this.operateReason = ''
+      let _this = this
+      await this.$resetpost('rs/sql/iot_searchInstruct', {data: datas},
+        {warnMsg: null, resolveMsg: null}).then(res => {
+          if (res.data.length === 0) {
+            _this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
+              {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
+                  _this.valve = false
+                  _this.operateReason = ''
+              })
+          } else {
+            this.$showAlert('存在开关阀待发送的指令，系统不生成同样的待发送指令', 'warning', 3000)
+            _this.valve = false
+            _this.operateReason = ''
+          }
         })
       await this.$dispatch('research')
     },

package/src/plugins/LogicService.js

@@ -231,6 +231,7 @@ let LogicService = {
       f_isdecimal: model.f_isdecimal,
       f_collection_type: model.f_collection_type,
       f_calculation: model.f_calculation,
+      f_system_settlement: model.f_system_settlement,
       f_comments: model.f_comments,
       f_is_check: model.f_is_check,
       f_is_step: model.f_is_step,

package/src/sale.js

@@ -1118,6 +1118,10 @@ export default function () {
   Vue.component('batch-preloads', (resolve) => { require(['./components/revenue/batchPreloads/batchPreloads'], resolve) })
   Vue.component('batch-preloads-list', (resolve) => { require(['./components/revenue/batchPreloads/batchPreloadsList'], resolve) })
   Vue.component('batch-preloads-charge', (resolve) => { require(['./components/revenue/batchPreloads/batchPreloadsCharge'], resolve) })
+  // 批量补扣费
+  Vue.component('batch-deduction-manage', (resolve) => { require(['./components/revenue/batchDeduction/batchDeduction'], resolve) })
+  Vue.component('batch-deduction-list', (resolve) => { require(['./components/revenue/batchDeduction/batchDeductionList'], resolve) })
+  Vue.component('batch-deduction-oper', (resolve) => { require(['./components/revenue/batchDeduction/batchDeductionOper'], resolve) })
   // 周口ncc推送日志查看
   Vue.component('log-query', (resolve) => { require(['./components/zhoukou/LogRecordList'], resolve) })
   // 周口ncc创建开发商档案