sale-client 3.6.182 → 3.6.184

package/package.json

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

package/src/filiale/qianneng/chargeBatch/ChargeGroupList.vue

@@ -158,7 +158,7 @@
 
     <export-excel
       :isshow="false" :data="getCondition" :field="getfield"
-      :defaultselect="defaultselect"
+      :defaultselect="defaultselect" :footer="footer" :header="other"
       :header="excelhead" :choose-col="true" v-ref:excel
       sqlurl="rs/logic/saleExport" sql-name="batchOweQuery" template-name='团体欠费明细导出'>
     </export-excel>
@@ -180,6 +180,8 @@ export default {
       // 公司下拉
       curorgid: [this.$login.f.orgid],
       f_orgid: '',
+      other:[],
+      footer:[],
       f_civill_id: null,
       oweShow: false,
       getCondition: null,
@@ -222,7 +224,8 @@ export default {
         'f_oughtfee'
       ],
       printModel: new PagedList('rs/sql/batchOweQuery', 20, {}, {f_oughtfee: 0}),
-      row: null
+      row: null,
+      starthead: ''
     }
   },
   title: '档案查询',
@@ -336,8 +339,8 @@ export default {
       let condition = `p.f_civill_id = ${row.id}`
       await this.printModel.search(condition)
       this.starthead = `<div style="display: inline-block;width: 100%;">
-                          <div style="text-align: left;display: inline-block;width: 49%;float: left;">&nbsp;团缴编号${row.id}</div>
-                          <div style="text-align: right;display: inline-block;width: width: 49%;float: right;">总欠费金额${row.f_oughtfee_all}元&nbsp;</div>
+                          <div style="text-align: left;display: inline-block;width: 49%;float: left;">&nbsp;团缴编号: ${row.f_customer}</div>
+                          <div style="text-align: right;display: inline-block;width: width: 49%;float: right;">总欠费金额: ${row.f_oughtfee_all}元&nbsp;</div>
                         </div>`
       this.$refs.printdata.printData()
     },
@@ -346,7 +349,7 @@ export default {
       this.row = row
       this.getotherfooter(row)
       this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
-      this.starthead = `团缴编号${row.id},总欠费金额${row.f_oughtfee_all}元`
+      this.starthead = `团缴编号: ${row.f_customer},总欠费金额: ${row.f_oughtfee_all}元`
       this.excelhead = []
       let headData = []
       headData.push(this.starthead)

package/src/filiale/rongcheng/gasmove.vue

@@ -0,0 +1,251 @@
+<template>
+    <div class="auto">
+        <validator name='v'>
+            <form novalidate class="form-horizontal">
+                <div class="row">
+                    <div class="col-sm-4 form-group">
+                        <label class="font_normal_body">用户编号</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='目标用户编号'
+                               v-model="model.f_userinfo_code" @blur="getuser(model.f_userinfo_code)">
+                    </div>
+                    <div class="col-sm-4 form-group" >
+                        <label for="f_user_name" class="font_normal_body">用户姓名</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='目标用户姓名'
+                               v-model="model.f_user_name" readonly >
+                    </div>
+
+                    <div class="col-sm-4 form-group" >
+                        <label class="font_normal_body">气表类型</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='目标用户气表类型'
+                               v-model="model.f_meter_type" readonly >
+                    </div>
+                </div>
+                <div class="row">
+
+                    <div class="col-sm-4 form-group" v-if="row.f_meter_type =='机表'" >
+                        <label class="font_normal_body">当前余额</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='当前余额'
+                               v-model="row.f_balance" readonly >
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="row.f_meter_type =='物联网表'" >
+                        <label class="font_normal_body">当前余额</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='当前余额'
+                               v-model="row.f_balance_amount" readonly >
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="row.f_meter_type == '气量卡表' || row.f_meter_type == '金额卡表'"
+                         :class="[$v.f_meter_base.required || $v.f_meter_base.dctest ? 'has-error' : 'has-success']">
+                        <label class="font_normal_body">当前底数</label>
+                        <input class="input_search" style="width:60%" type="text" placeholder='当前表已用气量'
+                               @blur="meterBaseChange()"
+                               v-validate:f_meter_base='{required: true}'  v-model="model.f_meter_base" >
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="model.f_meter_type!='' && model.f_meter_type!='气量卡表'"
+                         :class="[$v.f_move_fee.required || $v.f_move_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_move_fee"
+                                @blur="preamount()"
+                               v-validate:f_move_fee='{required: true}' placeholder="转气金额">
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="model.f_meter_type!='' && model.f_meter_type=='气量卡表'"
+                         :class="[$v.f_move_fee.required || $v.f_move_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_move_fee"
+
+                               v-validate:f_move_fee='{required: true}' placeholder="转气金额">
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="model.f_meter_type!='' && model.f_meter_type=='气量卡表'"
+                         :class="[$v.f_move_gas.required || $v.f_move_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_move_gas"
+                               @blur="pregas()"
+                               v-validate:f_move_gas='{required: true}' placeholder="转气气量">
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="model.f_meter_type!='' && model.f_meter_type!='气量卡表'"
+                         :class="[$v.f_move_gas.required || $v.f_move_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_move_gas"
+                               v-validate:f_move_gas='{required: true}' 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>
+            </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>
+        <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    </div>
+</template>
+
+
+<script>
+    let preamountGen = async function (self) {
+      let calFee = self.model.f_move_fee
+      if (self.firstPrice) {
+        self.model.f_move_gas = (calFee / self.firstPrice).toFixed(2)
+      }
+    }
+    let pregasGen = async function (self) {
+      self.model.f_move_gas = (self.model.f_move_gas - 0).toFixed(2)
+      self.model.f_move_fee = (self.model.f_move_gas * self.firstPrice).toFixed(2)
+    }
+    export default {
+      title: '转气',
+      data () {
+        return {
+          model: {
+            f_refund_fee: '',
+            f_comments: '',
+            f_meter_type: '',
+            f_user_name: '',
+            f_userfiles_id: '',
+            f_move_fee: 0,
+            f_move_gas: 0
+          },
+
+          blodid: '',
+          hasValidateBill: false,
+          validateOk: false,
+
+          printModel: {},
+          firstPrice: '',
+          print: false,
+          billUrl: '',
+          billData: {
+            url: 'rs/report/refund_sell',
+            bill: ''
+          },
+
+                // 下拉框值
+          paytype: this.$appdata.getParam('付款方式'),
+          printstyle: this.$appdata.getParam('打印格式')
+        }
+      },
+      props: ['row'],
+      ready () {
+        let self = this
+        this.$resetpost('rs/logic/getFirstPrice', {f_stairprice_id: this.row.f_stairprice_id}, {resolveMsg: '获取一阶气价成功', rejectMsg: '获取一阶气价失败'}).then((res)=> {
+          self.firstPrice = res.data
+        })
+        console.log(this.firstPrice)
+      },
+      methods: {
+        meterBaseChange () {
+          if (this.model.f_meter_base && this.model.f_meter_base > 0 && this.model.f_meter_base <= this.row.f_total_gas) {
+            this.model.f_move_gas = (this.row.f_total_gas - this.model.f_meter_base).toFixed(2)
+          }
+          if (this.model.f_meter_base > this.row.f_total_gas) {
+            this.$showAlert('转气底数不能大于总购气量', 'warning', 1500)
+            this.model.f_meter_base = ''
+            return
+          }
+          if (this.model.f_move_gas && this.model.f_move_gas > 0) {
+            try {
+              pregasGen(this)
+            } catch (error) {
+              this.$showAlert(`划价错误，错误类型：${error}`, 'danger', 0)
+            }
+          } else {
+            this.model.f_move_gas = 0
+          }
+        },
+        preamount () {
+          try {
+            preamountGen(this)
+          } catch (error) {
+            this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+          }
+        },
+        pregas () {
+          if (this.model.f_move_gas && this.model.f_move_gas > 0) {
+            try {
+              pregasGen(this)
+            } catch (error) {
+              this.$showAlert(`划价错误，错误类型：${error}`, 'danger', 0)
+            }
+          } else {
+            this.model.f_move_gas = 0
+          }
+        },
+        async getuser (val) {
+          if (val == this.row.f_userinfo_code) {
+            this.$showAlert('不能给自己转气', 'warning', 1500)
+            return
+          }
+          let res = await this.$resetpost('rs/sql/sale_getUser',
+                    {data: {condition: `i.f_userinfo_code='${val}' and i.f_orgid='${this.$login.f.orgid}'`}}, {resolveMsg: null, rejectMsg: null})
+          console.log(res.data)
+          if (res.data.length > 0) {
+            this.model.f_user_name = res.data[0].f_user_name
+            this.model.f_meter_type = res.data[0].f_meter_type
+            this.model.f_userfiles_id = res.data[0].f_userfiles_id
+          } else {
+            this.$showAlert('输入的用户编号不正确', 'warning', 1500)
+          }
+        },
+        async confirm () {
+          if (this.model.f_move_fee <= 0) {
+            this.$showAlert('转气金额和气量不能为0或小于0', 'warning', 1500)
+            return
+          }
+          if (this.row.f_meter_type == '机表' && this.row.f_balance < this.model.f_move_fee) {
+            this.$showAlert('转气金额不能大于余额', 'warning', 1500)
+            return
+          }
+          if (this.row.f_meter_type == '物联网表' && this.row.f_balance_amount < this.model.f_move_fee) {
+            this.$showAlert('转气金额不能大于余额', 'warning', 1500)
+            return
+          }
+          if (!this.model.f_meter_type) {
+            this.$showAlert('请先输入目标用户信息', 'warning', 1500)
+            return
+          }
+
+          let param = {
+            f_user_id: this.row.f_user_id,
+            f_userfiles_id: this.row.f_userfiles_id,
+            userfilesid: this.model.f_userfiles_id,
+            version: this.row.version,
+            f_move_fee: this.model.f_move_fee,
+            f_meter_base: this.model.f_meter_base,
+            f_move_gas: this.model.f_move_gas,
+            f_comments: this.model.f_comments,
+            f_billing: this.row.f_billing,
+            f_userinfo_code: this.model.f_userinfo_code,
+            f_price_id: this.row.f_price_id,
+            f_orgid: this.$login.f.orgid,
+            f_stairprice_id: this.row.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
+            }
+          }
+
+          let res = await this.$resetpost('rs/logic/movegas', {data: param}, {warnMsg: `确定要进行转气吗？`, resolveMsg: '转气成功！！', rejectMsg: '转气失败！！请重试！！'})
+          this.$dispatch('success')
+        },
+        clean () {
+          this.$dispatch('refresh')
+        },
+        printok () {
+          this.$dispatch('success')
+        },
+        validateBill (val) {
+          this.validateOk = !val.isOk
+          this.billData.bill = val.bill
+        }
+      }
+    }
+</script>

package/src/filiale/rongcheng/sale.js

@@ -111,4 +111,6 @@ export default function () {
   Vue.component('charge-modal', (resolve) => { require(['./ChargeModal'], resolve) })
   // 表具停用
   Vue.component('disable-manage', (resolve) => { require(['./business/MeterDisable/DisableManage'], resolve) })
+  // 转气(荣成转气按一阶计算)
+  Vue.component('gas-move', (resolve) => { require(['./gasmove'], resolve) })
 }

package/src/filiale/wenxi/HandplanQuery.vue

@@ -801,6 +801,12 @@
             'f_accounts_state': '下账状态', 'f_sellinggas_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
             'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
             'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',
+            'f_instantaneous_flow': '瞬时流量',
+            'f_pressure': '压力',
+            'f_temperature': '温度',
+            'f_controller_power': '控制器电量',
+            'f_flowmeter_capacity': '流量计电量',
+            'f_valve_switch': '阀门开关',
             'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
             'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
             'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_rest_date': '所属年月'}

package/src/filiale/wenxi/cardsHand.vue

@@ -559,6 +559,12 @@ export default {
         'f_input_date': '抄表录入日期',
         'f_last_tablebase': '上期底数',
         'f_tablebase': '本期底数',
+        'f_instantaneous_flow': '瞬时流量',
+        'f_pressure': '压力',
+        'f_temperature': '温度',
+        'f_controller_power': '控制器电量',
+        'f_flowmeter_capacity': '流量计电量',
+        'f_valve_switch': '阀门开关',
         'f_actualtablebase': '实际用量',
         'f_meter_state': '状态'
       },