sale-client 4.2.26 → 4.2.28

package/src/filiale/qingjian/FileUserFiles.vue

@@ -87,6 +87,9 @@
                             v-if="$parent.$parent.rows && $parent.$parent.rows.length === 1 && $parent.$parent.rows[0].f_user_state === '销户'">
                       启用
                     </button>
+                    <button @click="$parent.$parent.openBatchModal()" class="button_clear button_spacing"
+                            style="float: right">批量修改调压箱
+                    </button>
                     <div
                             :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                             @click="$parent.$parent.hidden()"
@@ -302,7 +305,7 @@
                 </div>
               </div>
             </criteria>
-            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list'>
+            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list' optional>
               <template partial='head'>
                 <tr>
                   <th>
@@ -475,6 +478,20 @@
         <button class="button_search button_spacing" type="button" @click="close2()">取消</button>
       </footer>
     </modal>
+    <modal :show.sync="showModifyAdjustables" width="500px" title="批量修改调压箱"  large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="height: 70px">
+        <label class="font_normal_body">调&ensp;压&ensp;箱</label>
+        <v-select :options='adjustablesNew' :search='true'
+                  :value.sync="f_adjustable_id"
+                  close-on-select
+                  placeholder='调压箱'
+                  v-model='f_adjustable_id'></v-select>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search button_spacing" :disabled="!f_adjustable_id || f_adjustable_id.length < 1 " type="button" @click="batchModifyAdjustables()">确认</button>
+        <button class="button_search button_spacing" type="button" @click="closeBatchAdjustables()">取消</button>
+      </footer>
+    </modal>
     <!--<user-flow-sheet :show="printflag" :bill-config='configs' :bill-data='billData' :data='newdata' v-on:toggle="close" @printok="printok" v-ref:printbill></user-flow-sheet>-->
 
     <work-busy :is-busy="iswork" v-show="iswork"></work-busy>
@@ -570,7 +587,8 @@ let loadParamGem = async function (self) {
         xiaohushow: false,
         inputtores: this.$appdata.getParam('抄表员'),
         adjustables: [],
-
+        adjustablesNew: [],
+        f_adjustable_id: '',
         // 导入组件
         show: false,
 
@@ -602,6 +620,7 @@ let loadParamGem = async function (self) {
         showselectaddress: false,
         isedit: false,
         clientWidth: document.body.clientWidth,
+        showModifyAdjustables: false,
         batchMeterShow: false,
         billData: {
           url: 'api/af-revenue/report/userignition',
@@ -635,6 +654,35 @@ let loadParamGem = async function (self) {
       }
   },
     methods: {
+      openBatchModal () {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData()
+        if (rowdata.length <= 0) {
+          this.$showMessage('请至少选择一个表具!')
+          return
+        }
+        this.showModifyAdjustables = true
+      },
+      async batchModifyAdjustables() {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData()
+        let userfilesIds = rowdata.map(item => item.f_userfiles_id);
+        console.log('已选择的数据', userfilesIds)
+        console.log('已选择的调压箱', this.f_adjustable_id)
+        let model = {
+          f_adjustable_id: this.f_adjustable_id,
+          f_userfiles_ids: userfilesIds
+        }
+        await this.$resetpost('api/af-revenue/logic/batchModifyAdjustables', model, {
+          resolveMsg: null,
+          rejectMsg: '批量修改调压箱失败'
+        }).then((res) => {
+          if (res && res.data) {
+            this.$showMessage(`本次批量修改:  ${res.data}户`);
+          }
+          this.closeBatchAdjustables()
+          this.selfSearch()
+        })
+
+      },
       getAuthority () {
         if (this.$login.r.find(value => value == '销户导入')) {
           this.bacthPin = '销户导入'
@@ -760,6 +808,9 @@ let loadParamGem = async function (self) {
       closexiaohu () {
         this.xiaohushow = false
       },
+      closeBatchAdjustables () {
+        this.showModifyAdjustables = false
+      },
       xiaohu () {
         this.xiaohushow = true
       },
@@ -821,6 +872,7 @@ let loadParamGem = async function (self) {
         this.model.rows.unshift(data)
       },
       selfSearch (args) {
+        this.$refs.paged.$refs.grid.selectInit()
         args.condition = `${args.condition} ` + this.orgcondition
         this.criteriaShow = false
         this.$refs.paged.$refs.grid.$el.scrollTop = 0
@@ -874,6 +926,7 @@ let loadParamGem = async function (self) {
           arr.push(temp)
         })
         this.adjustables = [{label: '全部', value: ''}, ...arr]
+        this.adjustablesNew = arr
           // 初始化气表品牌
         let brandArr = []
         this.$GetSaleParam.getGasbrand().forEach((item) => {

package/src/filiale/ruihua/IOTRefund.vue

@@ -0,0 +1,303 @@
+<template>
+  <div class="auto">
+    <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"
+                   title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+            <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+            <v-select :value.sync="model.f_add_gas" value-single
+                      :options='addGas' placeholder='请选择'
+                      selected="是否计入累购"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">剩余气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_gas" readonly>
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">核算单价</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_price">
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按金额'">
+            <label class="font_normal_body">剩余金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_amount" readonly>
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按气量'"
+               :class="[$v.f_refund_gas.required || $v.f_refund_gas.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">冲减气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_gas"
+                   v-validate:f_refund_gas='{required: true,  dctest: [0, ">=" ]}' placeholder="冲减气量">
+          </div>
+          <div class="col-sm-4 form-group" v-if="!config.overBalance && data.f_collection_type === '按气量'"
+               :class="[$v.f_refund_gas.required || $v.f_refund_gas.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">冲减气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_gas"
+                   v-validate:f_refund_gas='{required: true,  dctest: [data.f_balance_gas, "<=" ]}'
+                   placeholder="冲减气量">
+          </div>
+        </div>
+
+        <div class="row">
+
+          <div class="col-sm-8">
+            <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+            <input class="input_search" style="width:80%" v-model="model.f_comments">
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%"
+                   type="number" v-model="model.f_refund_fee"
+                   placeholder="退费金额">
+          </div>
+          <div class="col-sm-4 form-group" v-if="!config.overBalance && data.f_collection_type === '按金额'"
+               :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                   v-validate:f_refund_fee='{required: true,  dctest: [data.f_balance_amount, "<=" ]}'
+                   placeholder="退费金额">
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按金额'"
+               :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                   v-validate:f_refund_fee='{required: true,  dctest: [0, ">=" ]}' placeholder="退费金额">
+          </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-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-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" :businessid="randomBusinessId" isremark="true" fusetype="退费管理"></upload>
+</template>
+
+
+<script>
+let readyGen = async function (self) {
+  await self.$getConfig(self, 'IOTRefund')
+  // 默认打印格式
+  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_add_gas: '计入',
+        f_refund_gas: '',
+        f_comments: '',
+        f_payment: '',
+        f_print: '',
+        f_price: 0
+      },
+
+      blodid: '',
+      hasValidateBill: false,
+      randomBusinessId: '',
+      resid: [],  // 存放新增的f_files表中id
+      validateOk: false,
+      addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
+      printModel: {},
+      print: false,
+      billUrl: '',
+      billData: {
+        url: 'api/af-revenue/report/refund_sell',
+        bill: ''
+      },
+
+      // 下拉框值
+      paytype: [],
+      printstyle: this.$appdata.getParam('打印格式')
+    }
+  },
+  props: ['data'],
+  ready () {
+    if (this.data.f_civill_id) {
+      this.paytype = [{label: '单位余额', value: '单位余额'}, ...this.$appdata.getParam('付款方式')]
+    } else {
+      this.paytype = this.$appdata.getParam('付款方式')
+    }
+    readyGen(this)
+    this.getRandomId()
+    if (this.data.f_collection_type === '按气量') {
+      // this.$showAlert('按气量缴费的物联网表退费功能尚未开放！！', 'warning', 3000)
+      this.model.f_price = this.data.f_price
+
+      // this.$dispatch('refresh')
+    }
+  },
+  events: {
+    // 删除Resid数组元素
+    'delResid' (val) {
+      this.resid.$remove({id: val, f_biobid: ''})
+      // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+    },
+    // 增加Resid数组元素
+    'resid' (val) {
+      this.resid.push({id: val, f_biobid: ''})
+    }
+  },
+  methods: {
+    getRandomId () {
+      this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        let res = Math.random() * 16 | 0
+        let v = c == 'x' ? res : (res & 0x3 | 0x8)
+        return v.toString(16)
+      })
+    },
+    async confirm () {
+      if (this.data.f_collection_type === '按金额' && this.model.f_price) {
+        this.model.f_refund_gas = (this.model.f_refund_fee - 0) / (this.model.f_price - 0)
+      }
+      let param = {
+        f_user_id: this.data.f_user_id,
+        f_userfiles_id: this.data.f_userfiles_id,
+        version: this.data.version,
+        f_price: this.model.f_price,
+        f_add_gas: this.model.f_add_gas,
+        f_refund_gas: this.model.f_refund_gas,
+        f_refund_fee: this.model.f_refund_fee,
+        f_comments: this.model.f_comments,
+        f_collection_type: this.data.f_collection_type,
+        f_payment: this.model.f_payment[0],
+        f_print: this.model.f_print[0],
+        f_price_id: this.data.f_price_id,
+        f_total_gas: parseFloat(this.data.f_total_gas) - parseFloat(this.model.f_refund_gas),
+        f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
+        f_stairprice_id: this.data.f_stairprice_id,
+        operInfo: {
+          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
+        }
+      }
+      if (this.model.f_add_gas !== '计入') {
+        param.f_total_fee = this.data.f_total_fee
+        param.f_total_gas = this.data.f_total_gas
+      }
+      console.log('退费传参', param)
+      let res = await this.$resetpost('api/af-revenue/logic/iotRefund', {data: param}, {
+        warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`,
+        resolveMsg: '退费成功！！',
+        rejectMsg: '退费失败！！请重试！！'
+      })
+      console.log('退费', res)
+      let param1 = []
+      for (let row of this.resid) {
+        param1.push({id: row.id})
+      }
+      let data = {
+        param: param1,
+        f_blobid: res.data.id
+      }
+      await this.$resetpost('api/af-revenue/logic/updatefiles', data)
+      console.log('退费this.config', this.config)
+      console.log('退费this.model', this.model)
+      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 = 'api/af-revenue/report/refund_sell'
+            this.print = true
+          } else {
+            this.printModel.id = res.data.id
+            // this.billUrl = 'api/af-revenue/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')
+      }
+    },
+    refundChange () {
+      this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+    },
+    clean () {
+      this.$dispatch('refresh')
+    },
+    printok () {
+      this.$dispatch('success')
+    },
+    validateBill (val) {
+      this.validateOk = !val.isOk
+      this.billData.bill = val.bill
+    }
+  },
+  watch: {
+    'model.f_price' () {
+      if (this.data.f_collection_type === '按气量') {
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      }
+    },
+    'model.f_refund_gas' () {
+      if (this.data.f_collection_type === '按气量') {
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      }
+    }
+  }
+}
+</script>

package/src/filiale/ruihua/sale.js

@@ -23,4 +23,6 @@ export default function () {
   Vue.component('change-meter', (resolve) => { require(['./newchangemeter/ChangeMeter'], resolve) })
   // 清零
   Vue.component('reset-meter', (resolve) => { require(['./newchangemeter/ResetMeter'], resolve) })
+  // 物联网退费管理
+  Vue.component('iot-refund', (resolve) => { require(['./IOTRefund'], resolve) })
 }

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/yuncheng/sale'
+import FilialeSale from './filiale/qingjian/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'