sale-client 3.6.490 → 3.6.491

package/package.json

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

package/src/components/common/userinfo_detail/ic_detail/CardHandRecord.vue

@@ -29,6 +29,11 @@
 
               <div style="float: right">
                 <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                              :field="$parent.$parent.fields" :header="$parent.$parent.other"
+                              sqlurl="rs/logic/saleExport" sql-name="sale_cardhandplanQuery" template-name='抄表查询导出'
+                              :choose-col="true"  ref="salehandplanExport"></export-excel>
+
                 <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"
                             @print-data="$parent.$parent.print()" print-name="其他收费流水"></print-data>
               </div>
@@ -132,6 +137,7 @@
     data () {
       return {
         condition: '1=1',
+        getfields: {},
         model: new PagedList('rs/sql/sale_cardhandplanQuery', 20, {}),
         // 控制单选
         radio: [],
@@ -148,7 +154,11 @@
         ],
         printModel: {
           rows: []
-        }
+        },
+        other: [],
+        footer: [],
+        // 合计数据
+        sumsmodel: {}
       }
     },
     props: ['row'],
@@ -156,6 +166,23 @@
       this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      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.getfields
+        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)
+      },
       async search () {
         this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
         this.model.search(this.condition, this.model)
@@ -262,6 +289,19 @@
           }
           return this.radio[index][i]
         }
+      },
+      getCondition () {
+        return {
+          condition: this.condition
+        }
+      }
+    },
+    watch: {
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter()
+        },
+        deep: true
       }
     }
   }

package/src/components/common/userinfo_detail/ic_detail/WebHandQueryUser.vue

@@ -52,6 +52,11 @@
 
               <div style="float: right">
                 <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                              :field="$parent.$parent.fields" :header="$parent.$parent.other"
+                              sqlurl="rs/logic/saleExport" :sql-name="$parent.$parent.sqlname" template-name='抄表查询导出'
+                              :choose-col="true"  ref="salehandplanExport"></export-excel>
+
                 <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"
                             @print-data="$parent.$parent.print()"
                             :starthead="$parent.$parent.starthead"
@@ -194,9 +199,11 @@
         all: [],
         // row数据
         rowsdata: [],
+        sqlname: `${this.row.f_meter_type === '物联网表'?'sale_WebHandplanQuery':'sale_HandplanQuery'}`,
         searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         starthead: '',
-        fields: {'f_userinfo_code': '用户编号',
+        fields: {
+          'f_userinfo_code': '用户编号',
           'f_user_name': '姓名',
           'f_last_tablebase': '上期底数',
           'f_tablebase': '本期底数',
@@ -208,15 +215,17 @@
           'datas': '用气周期',
           'money1': '违约金',
           'f_stair1price': '一阶单价',
+          'f_stair1fee': '一阶用气金额',
           'f_stairamount1': '一阶用量',
           'f_stair2price': '二阶单价',
+          'f_stair2fee': '二阶用气金额',
           'f_stair2amount': '二阶用量',
           'f_stair3price': '三阶单价',
+          'f_stair3fee': '三阶用气金额',
           'f_stair3amount': '三阶用量',
           'f_oughtfee1': '应交金额',
           'f_inputtor': '抄表员',
           'f_input_date': '抄表日期',
-          'f_whether_pay': '是否缴费',
           'f_hand_date': '录入时间'},
         defaultfield: [
           'datas', 'f_last_tablebase', 'f_last_tablebase', 'f_oughtamount', 'f_oughtfee', 'f_oughtfee1', 'money1', 'price1'
@@ -227,7 +236,11 @@
         ],
         printModel: {
           rows: []
-        }
+        },
+        other: [],
+        footer: [],
+        // 合计数据
+        sumsmodel: {}
       }
     },
     props: ['row'],
@@ -235,13 +248,30 @@
       this.$refs.paged.$refs.criteria.model.f_hand_state = ['有效']
       this.f_calculation = this.row.f_calculation
       this.$refs.paged.$refs.criteria.search()
-      // this.sumgasandmoney= this.$refs.paged.$refs.grid.model.sums
+      this.sumsmodel= this.$refs.paged.$refs.grid.model.sums
       for (let i in this.all) {
         this.money += i.f_oughtamount
         this.gas += i.f_oughtfee
       }
     },
     methods: {
+      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.fields
+        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)
+      },
       // search() {
       //   this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
       //   this.model.search(this.condition, this.model)
@@ -361,6 +391,19 @@
           }
           return this.radio[index][i]
         }
+      },
+      getCondition () {
+        return {
+          condition: this.condition
+        }
+      }
+    },
+    watch: {
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter()
+        },
+        deep: true
       }
     }
   }

package/src/components/revenue/machineHandManage/ArrearsQuery.vue

@@ -765,6 +765,7 @@
             str += `and f_input_date<='${this.$refs.paged.$refs.cri.model.inputendDate}'`
           }
           args.condition = `${args.condition} and f_meter_type='机表'` + f_orgstr
+          this.orgCondtionStr = args.condition
           this.model.search(args.condition, args.model, str)
           this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         }

package/src/filiale/bayan/CardMeterChargeCancel.vue

@@ -0,0 +1,394 @@
+<template>
+    <div class="flex-row">
+      <div class="span" style="overflow-y: scroll">
+        <form novalidate class="form-horizontal">
+          <p class="bg-info text-center" style="padding: 8px;">上次购气信息</p>
+          <div class="row" style="margin-top:6px;">
+            <label class=" col-sm-2 control-label">预购气量</label>
+            <div class="col-sm-2" >
+              <input class="form-control"  type="number" v-model="model.f_pregas" placeholder="预购气量" disabled>
+            </div>
+            <label class=" col-sm-2 control-label">预购金额</label>
+            <div class="col-sm-2">
+              <input class="form-control"  type="number" v-model="model.f_preamount" placeholder="预购金额" disabled>
+            </div>
+            <label class=" col-sm-2 control-label">撤销类型</label>
+            <div class="col-sm-2">
+              <input class="form-control"  type="text" v-model="model.f_canceltype" placeholder="撤销类型" disabled>
+            </div>
+          </div>
+          <div class="row" style="margin-top:6px;">
+            <label class=" col-sm-2 control-label">上期结余</label>
+            <div class="col-sm-2">
+              <input class="form-control"  type="number" v-model="model.f_balance" placeholder="上期结余" disabled>
+            </div>
+            <label class="col-sm-2 control-label">本期结余</label>
+            <div class="col-sm-2">
+              <input class="form-control"  type="number" v-model="model.f_curbalance" placeholder="本期结余" disabled>
+            </div>
+            <label class="col-sm-2 control-label">收款</label>
+            <div class="col-sm-2">
+              <input class="form-control"  type="number" v-model="model.f_collection" placeholder="收款" disabled>
+            </div>
+          </div>
+          <div class="row" style="margin-top:6px;">
+            <label class=" col-sm-2 control-label">售气时间</label>
+            <div class="col-sm-2" >
+              <input class="form-control"  type="text" v-model="model.f_date" disabled>
+            </div>
+            <label class="col-sm-2 control-label">操作员</label>
+            <div class="col-sm-2">
+              <input class="form-control" type="text" v-model="model.f_operator" disabled>
+            </div>
+            <label class="col-sm-2 control-label" title="参数名称：付款方式">收款方式</label>
+            <div class="col-sm-2">
+              <v-select v-model="f_payment"
+                        placeholder='请选择'
+                        :value.sync="model.f_payment"
+                        :options='paytype' clear-button></v-select>
+            </div>
+            <!--<label for="f_outlets" class="col-sm-2 control-label" style="width:15%">网点:</label>-->
+            <!--<div class="col-sm-2">-->
+            <!--<input class="form-control"  type="text" v-model="model.f_outlets" disabled>-->
+            <!--</div>-->
+          </div>
+
+          <div v-if="model.f_fillgas_id">
+            <p class="bg-info text-center" style="padding: 8px;" >相关补气信息</p>
+            <div class="row" style="margin-top:6px;">
+              <label class=" col-sm-2 control-label">预购气量</label>
+              <div class="col-sm-2" >
+                <input class="form-control"  type="number" v-model="xmodel.f_pregas" placeholder="预购气量" disabled>
+              </div>
+              <label class=" col-sm-2 control-label">预购金额</label>
+              <div class="col-sm-2">
+                <input class="form-control"  type="number" v-model="xmodel.f_preamount" placeholder="预购金额" disabled>
+              </div>
+              <label class=" col-sm-2 control-label">撤销类型</label>
+              <div class="col-sm-2">
+                <input class="form-control"  type="text" v-model="xmodel.f_canceltype" placeholder="撤销类型" disabled>
+              </div>
+            </div>
+            <div class="row" style="margin-top:6px;">
+              <label class=" col-sm-2 control-label">上期结余</label>
+              <div class="col-sm-2">
+                <input class="form-control"  type="number" v-model="xmodel.f_balance" placeholder="上期结余" disabled>
+              </div>
+              <label class="col-sm-2 control-label">本期结余</label>
+              <div class="col-sm-2">
+                <input class="form-control"  type="number" v-model="xmodel.f_curbalance" placeholder="本期结余" disabled>
+              </div>
+              <label class="col-sm-2 control-label">收款</label>
+
+              <div class="col-sm-2">
+                <input class="form-control"  type="number" v-model="xmodel.f_collection" placeholder="收款" disabled>
+              </div>
+            </div>
+            <div class="row" style="margin-top:6px;">
+              <label class=" col-sm-2 control-label">售气时间</label>
+              <div class="col-sm-2" >
+                <input class="form-control"  type="text" v-model="xmodel.f_date" disabled>
+              </div>
+              <label class="col-sm-2 control-label">操作员</label>
+              <div class="col-sm-2">
+                <input class="form-control" type="text" v-model="xmodel.f_operator" disabled>
+              </div>
+              <!--<label for="f_outlets" class="col-sm-2 control-label" style="width:15%">网点:</label>-->
+              <!--<div class="col-sm-2">-->
+              <!--<input class="form-control"  type="text" v-model="model.f_outlets" disabled>-->
+              <!--</div>-->
+            </div>
+          </div>
+        </form>
+        <div style="text-align:right;margin-right:50px;height: auto">
+          <button class="btn btn-success width-60" @click="cancel()" :disabled="isToday" v-if="jurisdiction.includes('购气撤销')">购气撤销</button>
+          <button class="button_clear" @click="clean()">取消</button>
+        </div>
+
+        <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false">
+          <header slot="modal-header" class="modal-header">
+            <h4 class="modal-title">撤销原因</h4>
+          </header>
+          <article slot="modal-body" class="modal-body">
+            <validator name='v'>
+              <form class="form-horizontal select-overspread">
+                <div class="form-group" v-if="config.hasBillManage && model.f_bill_style">
+                  <label class=" col-sm-3 control-label">发票撤销类型:</label>
+                  <div class="col-sm-4">
+                    <v-select v-model="f_cancel_type"
+                              placeholder='请选择'
+                              :value.sync="correctModel.f_cancel_type"
+                              :options='cancelTypes'
+                              @change="cancelTypeChange"
+                              :value-single="true"
+                              close-on-select clear-button>
+                    </v-select>
+                  </div>
+                </div>
+                <div class="form-group" :class="[$v.f_cancel_reason.required ? 'has-error' : 'has-success']">
+                  <label class=" col-sm-3 control-label">撤销原因:</label>
+                  <div class="col-sm-8">
+                    <textarea class="form-control" v-model="correctModel.f_cancel_reason" rows="3"
+                              placeholder="请填写原因" v-validate:f_cancel_reason='{required: true}'></textarea>
+                  </div>
+                </div>
+              </form>
+            </validator>
+            <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button v-show="show" type="button" class="button_search" @click='confirm()' :disabled="!correctModel.f_cancel_reason">确认</button>
+            <button v-show="show" type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <correct-bill :show="print" :bill-config='config' :bill-data='billData'
+                      @printok="printok" @toggle="printCancel" :data='printModel' v-ref:printbill ></correct-bill>
+      </div>
+    </div>
+</template>
+<script>
+/**
+*综合业务
+*卡表收费组件
+*/
+
+let cardChargeCancelGen = async function (self) {
+  // 冲正记录
+  self.row.cardInfo = self.cardData
+  self.model = Object.assign({}, self.model, self.correctModel)
+  let res = null
+  if (self.xmodel.id) {
+    res = await self.$CancelService.cardAndFillGasCancel(self.model, self.xmodel, self.row)
+  } else {
+    res = await self.$CancelService.cardChargeCancel(self.model, self.row)
+  }
+
+  console.log('冲正返回。。', res, self.model, self.config, self.correctModel)
+
+  if (self.model.f_bill_style.includes('普通收据') && self.config.hasBillManage) {
+    // 冲正发票管理数据
+    if (self.correctModel.f_cancel_type === 'newBill') {
+      // 显示发票信息
+      self.printModel.id = res.data.record.id
+      self.printModel.f_type = res.data.type
+      self.printModel.f_bill_style = res.data.record.f_bill_style
+      self.billData.url = self.getBillUrl(res.data.type)
+      console.log('普通收据打印。。。', self.printModel, self.billUrl)
+      self.print = true
+    } else if (self.correctModel.f_cancel_type === 'abort') {
+      await self.$CommonService.correctPaperBill(res.data.record.id, res.data.type, null, null, 'abort')
+      self.$dispatch('refresh')
+    }
+  } else if (self.model.f_bill_style.includes('电子发票')) {
+    // 冲正电子票
+    // await self.$CommonService.correctEticket(self.model.id, self.model.f_canceltype)
+    self.$dispatch('success')
+  } else {
+    self.$dispatch('success')
+  }
+}
+
+let readyGen = async function (self) {
+  console.log('冲正业务config', self.config)
+  self.correctModel.f_cancel_type = self.config.cancelType
+
+  self.model.f_price_id = self.row.f_price_id
+  self.model.f_user_id = self.row.f_user_id
+  self.model.f_user_name = self.row.f_user_name
+  self.model.f_userinfo_id = self.row.f_userinfo_id
+  let res = await self.$resetpost('rs/sql/gasCancel', {data: {f_user_id: self.model.f_user_id}}, {resolveMsg: null, rejectMsg: '获取记录失败！！'})
+  console.log('GASCANCEL:', res.data)
+  self.model.id = res.data[0].id
+  self.model.f_pregas = res.data[0].f_pregas
+  self.model.f_preamount = res.data[0].f_preamount
+  self.model.f_curbalance = res.data[0].f_curbalance
+  self.model.f_collection = res.data[0].f_collection
+  self.model.f_balance = res.data[0].f_balance
+  self.model.f_user_balance = res.data[0].f_user_balance
+  self.model.f_canceltype = res.data[0].f_canceltype
+  self.model.f_bill_style = res.data[0].f_bill_style
+  self.model.f_operator = res.data[0].f_operator
+  self.model.f_date = res.data[0].f_date
+  self.model.f_payment = [res.data[0].f_payment]
+  if (res.data[0].f_fillgas_id && res.data[0].f_fillgas_id.length > 0) {
+    self.model.f_fillgas_id = res.data[0].f_fillgas_id
+    // 开始给关联购气信息赋值
+    for (var i = 0; i < res.data.length; i++) {
+      console.log('换表关联信息。。', res.data[0].f_fillgas_id, res.data[i].id)
+      if (res.data[0].f_fillgas_id == res.data[i].id) {
+        self.$showAlert('此卡存在关联购气信息，请谨慎核对！！！', 'warning', 2000)
+        self.xmodel.id = res.data[i].id
+        self.xmodel.f_pregas = res.data[i].f_pregas
+        self.xmodel.f_preamount = res.data[i].f_preamount
+        self.xmodel.f_curbalance = res.data[i].f_curbalance
+        self.xmodel.f_collection = res.data[i].f_collection
+        self.xmodel.f_balance = res.data[i].f_balance
+        self.xmodel.f_user_balance = res.data[i].f_user_balance
+        self.xmodel.f_canceltype = res.data[i].f_canceltype
+        self.xmodel.f_bill_style = res.data[i].f_bill_style
+        self.xmodel.f_operator = res.data[i].f_operator
+        self.xmodel.f_date = res.data[i].f_date
+        // 跳出循环
+        break
+      }
+      // this.radio[index].$set(i,true)
+    }
+  }
+  if (self.config.cancletime && !self.$login.f.rolesnames.includes('管理员')) {
+    self.isToday = new Date().toDateString() !== new Date(res.data[0].f_date).toDateString()
+  }
+
+  if (self.config.hasBillManage && self.config.cancelType === 'newBill' && self.model.f_bill_style) {
+    // 获取原来收费记录使用的发票类型
+    let param = {
+      id: res.data[0].id,
+      type: res.data[0].f_canceltype
+    }
+    let oldUseType = await self.$resetpost('rs/logic/sale_getOldUseType', {data: param}, {resolveMsg: null, rejectMsg: '获取原始票据信息出错！！'})
+    console.log('获取原始票据信息。。。', oldUseType)
+
+    self.model.f_use_type = oldUseType.data.f_use_type
+    self.model.f_bill_type = [res.data[0].f_bill_style]
+    self.hasValidateBill = self.config.hasBillManage
+  }
+}
+
+export default {
+  title: '卡表冲正',
+  data () {
+    return {
+      config: {
+        cancleother: false,  // 默认可以撤销别人的操作
+        hasBillManage: false,  // 默认不启用发票管理
+        cancelType: 'newBill',
+        cancletime: false // 是否限制当天不能冲正
+      },
+      model: {
+        f_payment: '',
+        f_pregas: '',
+        f_preamount: '',
+        f_totalcost: '',
+        f_curbalance: '',
+        f_collection: '',
+        f_balance: '',
+        f_user_balance: '',
+        f_canceltype: '',
+        f_operator: '',
+        f_date: '',
+        f_fillgas_id: null
+      },
+      // 关联购气信息
+      xmodel: {
+        f_payment: '',
+        f_pregas: '',
+        f_preamount: '',
+        f_totalcost: '',
+        f_curbalance: '',
+        f_collection: '',
+        f_balance: '',
+        f_user_balance: '',
+        f_canceltype: '',
+        f_operator: '',
+        f_date: ''
+      },
+      show: false,
+      isToday: false,
+
+      paytype: this.$appdata.getParam('付款方式'),
+      correctModel: {
+        f_cancel_type: '',
+        f_cancel_reason: ''
+      },
+      printModel: {},
+      print: false,
+      billUrl: '',
+      billData: {
+        url: '',
+        bill: ''
+      },
+
+      // 启用发票管理需要对票号进行验证
+      hasValidateBill: false,
+      validateOk: false,
+
+      jurisdiction: this.$login.r
+
+    }
+  },
+  props: ['row', 'cardData'],
+  ready () {
+    readyGen(this)
+  },
+  watch: {
+    'row' (val) {
+      this.model.f_price_id = val.f_price_id
+      this.model.f_user_id = val.f_user_id
+      this.model.f_userinfo_id = val.f_userinfo_id
+    }
+  },
+  methods: {
+    cancel () {
+      if (this.config.cancleother && !this.$login.f.rolesnames.includes('管理员')) {
+        if (this.model.f_operator != this.$login.f.name) {
+          this.$showAlert('不能撤销不是自己进行的操作', 'warning', 1500)
+          return
+        }
+      }
+      if (this.config.cancletime && !this.$login.f.rolesnames.includes('管理员')) {
+        let a = this.$login.toStandardDateString() + ' 00:00:00'
+        if (this.model.f_date < a) {
+          this.$showAlert('不能撤销不是当天的操作', 'warning', 1500)
+          return
+        }
+      }
+      this.show = true
+    },
+    close () {
+      this.show = false
+    },
+    confirm () {
+      // 关闭 modal框
+      this.close()
+      console.log('看看有没有撤销原因', this.model)
+      cardChargeCancelGen(this)
+    },
+    clean () {
+      this.$info('取消操作')
+      this.$dispatch('cancelclean', this.row)
+    },
+    getBillUrl (type) {
+      let name = ''
+      // 根据type数据 选择调用的Logic
+      if (type === '卡表收费') {
+        name = 'rs/report/card_bill'
+      } else if (type === '发卡售气') {
+        name = 'rs/report/sendCard_bill'
+      }
+      return name
+    },
+    printok () {
+      this.show = false
+      this.print = false
+      this.$dispatch('success')
+    },
+    printCancel () {
+      this.$dispatch('refresh')
+    },
+    validateBill (val) {
+      this.validateOk = !val.isOk
+      this.billData.bill = val.bill
+    },
+    cancelTypeChange () {
+      this.hasValidateBill = this.correctModel.f_cancel_type === 'newBill'
+    }
+  },
+  computed: {
+    cancelTypes () {
+      return [{label: '使用新票号', value: 'newBill'}, {label: '旧发票作废', value: 'abort'}]
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/filiale/bayan/SecuritycheckInfo.vue

@@ -50,7 +50,7 @@
     title: '用户安检历史',
     data () {
       return {
-        model: new PagedList('api/af-revenue/sql/findCheckPaper', 5),
+        model: new PagedList('rs/sql/findCheckPaper', 5),
         row: Object,
         infoshow: false,
         onedata: Object

package/src/filiale/bayan/sale.js

@@ -69,4 +69,6 @@ export default function () {
   Vue.component('disable-record', (resolve) => { require(['./disableRecord'], resolve) })
   // 用户基本信息test
   Vue.component('file-user-essential-info', (resolve) => { require(['./UserEssentialInfoTest'], resolve) })
+  // 购气撤销
+  Vue.component('card-meter-charge-cancel', (resolve) => { require(['./CardMeterChargeCancel'], resolve) })
 }