manage-client 3.3.98 → 3.3.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.98",
+  "version": "3.3.99",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -54,6 +54,12 @@
                     :defaultfield="$parent.$parent.defaultfield"
                     titletable="缴费记录报表" :starthead="$parent.$parent.getstart"
                               :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <button
+                    class="button_export  button_spacing"
+                    @click="$parent.$parent.batchPrintBill(null,'批量票据补打')"
+                    v-if="$parent.$parent.authArr.includes('批量补打票据')">
+                    批量补打票据
+                  </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>
@@ -547,6 +553,9 @@
                   <th>
                       <nobr>三阶气费</nobr>
                   </th>
+                  <th v-show="$parent.$parent.$parent.authArr.includes('收费查询票据补打')">
+                      <nobr>操作</nobr>
+                  </th>
 
                 <th><nobr>附件</nobr></th>
               </tr>
@@ -755,6 +764,9 @@
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
                 </td>
+              <td style="text-align: center;" v-if="$parent.$parent.$parent.authArr.includes('收费查询票据补打')" ><nobr>
+                <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.batchPrintBill(row,'票据补打')">票据补打</button>
+              </nobr></td>
               <td style="text-align: center;"><nobr>
                 <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
               </nobr></td>
@@ -823,6 +835,12 @@
     </modal>
   </div>
   <high-meter-idcard :show.sync="false"  v-ref:highcard  ></high-meter-idcard>
+  <manage-batch-print-bill
+    v-if="batchPrintBillShow"
+    :show="batchPrintBillShow"
+    :data="batchPrintData"
+    :type="operate_type">
+  </manage-batch-print-bill>
 </template>
 
 <script>
@@ -912,6 +930,9 @@
           f_stair3amount:0,
           f_stair3fee:0,
         }),
+        batchPrintData: [],
+        batchPrintBillShow: false,
+        operate_type: '',
         criteriaShow: false,
         orgCondtionStr: '',
         // 下拉框
@@ -968,6 +989,31 @@
       })
     },
     methods: {
+      async batchPrintBill(row, type){
+        this.operate_type = type
+        if (this.$refs.paged.$refs.cri.model.f_state.length === 1 && this.$refs.paged.$refs.cri.model.f_state[0] === '有效') {
+          if (type === '票据补打') {
+            this.batchPrintData.push(row)
+            this.$showMessage(`您确定补打本张票据吗？？？`, ['confirm', 'cancel']).then(async (res) => {
+              if (res === 'confirm') {
+                this.batchPrintBillShow = true
+              }
+            })
+          } else {
+            this.batchPrintData = this.$refs.paged.$refs.grid.model.rows
+            if (this.batchPrintData.length > 0) {
+              this.$showMessage(`您确定补打本页${this.batchPrintData.length}张票据吗？？？`, ['confirm', 'cancel']).then(async (res) => {
+                if (res === 'confirm') {
+                  this.batchPrintBillShow = true
+                }
+              })
+            } else {
+              this.$showMessage(`请先查询数据！！！`, ['confirm'])
+            }
+        }
+          this.$showMessage(`请选择有效的收费记录进行票据补打！！！`, ['confirm'])
+        }
+      },
       async pricetypechanged(){
         this.$refs.paged.$refs.cri.model.f_price_name = []
         this.pricenames = []
@@ -1215,6 +1261,10 @@
       'getidcard'(IdCard){
         // console.log(param)
         this.$refs.paged.$refs.cri.model.f_info_idnumber=IdCard.strID
+      },
+      'print-cancel' () {
+        this.batchPrintBillShow = false
+        this.batchPrintData = []
       }
     },
     watch: {
@@ -1267,6 +1317,11 @@
       }
     },
     computed: {
+      authArr () {
+        console.log('this.$login.r:',this.$login.r)
+        console.log('this.$login.r.includes:',this.$login.r.includes('批量打印票据'))
+        return this.$login.r ? this.$login.r : []
+      },
       getstart(){
         return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
       },

package/src/components/sale/common/BatchPrintBill.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="auto">
+    <modal :show.sync="show" v-ref:modal large backdrop="false" style="overflow-y: auto !important;">
+      <header slot="modal-header" class="modal-header" style="text-align: center;">
+        <h4 class="modal-title" v-if="type === '票据补打'">{{ data[0].f_type }}票据明细</h4>
+        <h4 class="modal-title" v-else>{{ data.type }}票据明细</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row" style="display: flex;justify-content: center;" id='reissue-bill' v-if="type === '票据补打'">
+              {{{bill2.data}}}
+            </div>
+            <div class="row" style="display: flex;justify-content: center;" id='reissue-bill' v-show="false">
+              {{{bill.data}}}
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='print()' >打印</button>
+        <report-print id='reissue-bill' top='5mm' left='5mm' width='90%' height='80%' :notrepeat="false"
+                      :showbtn="false" v-ref:reportprint></report-print>
+        <button class="btn btn-default" @click="clean()">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import {DataModel} from "vue-client";
+
+let getBillData = async function (self) {
+  console.log('看看执行了吗？')
+  // 显示票据
+  let billurl = self.getBillUrl(self.data[0].f_type)
+  self.bill2 = new DataModel(billurl, {reprint: "'补打'"})
+  await self.bill2.search(self.data[0].id)
+}
+
+export default {
+  title: '批量打印票据',
+  data() {
+    return {
+      messText: '',
+      bill: {data: ''},
+      bill2: Object,
+      sellingData: [],
+      timeOut: this.$appdata.getSingleValue('打印票据间隔时间') ? this.$appdata.getSingleValue('打印票据间隔时间') : 1000,
+      printControl: null
+    }
+  },
+  props: ['show', 'data', 'type'],
+  ready() {
+    this.$nextTick(function () {
+      if (this.type === '票据补打') {
+        getBillData(this)
+      }
+    })
+  },
+  methods: {
+    clean() {
+      this.$dispatch('print-cancel', '票据补打', this.row)
+    },
+    async print (select) {
+      console.log('select', select)
+      let self = this
+      // 进行补打
+      try {
+        if (self.type === '票据补打') {
+          self.$refs.reportprint.print()
+        } else {
+          console.log('走的批量补打')
+          for (let row of self.data) {
+            let billUrl = await self.getBillUrl(row.f_type)
+            let bill = await self.$resetpost(billUrl, {
+              data: {
+                condition: row.id,
+                reprint: "'补打'"
+              }
+            }, {resolveMsg: null})
+            self.bill.data = bill.data
+            self.$nextTick(function () {
+              setTimeout(function () {
+                self.asyncPrint(select)
+              }, parseInt(self.timeOut))
+            })
+            self.printControl = null
+          }
+          self.$dispatch('reissue-success')
+        }
+      } catch (error) {
+        self.$dispatch('refresh')
+      }
+    },
+    getBillUrl (type) {
+      let name = ''
+      // 根据type数据 选择调用的Logic
+      if (type === '过户') {
+        name = 'rs/report/transfer_bill'
+      } else if (type === '换表') {
+        name = 'rs/report/change_meter'
+      } else if (type === '机表收费') {
+        name = 'rs/report/machine_bill'
+      } else if (type === '物联网收费' || type === '物联网开户' || type === '物联网赠气') {
+        name = 'rs/report/iot_bill'
+      } else if (type === '物联网补费' || type === '物联网扣费' || type === '物联网补气' || type === '物联网扣气' || type === '机表补费' || type === '机表扣费') {
+        name = 'rs/report/MakeUp'
+      } else if (type === '超用收费') {
+        name = 'rs/report/overuse_bill'
+      } else if (type === '其他收费') {
+        name = 'rs/report/otherCharge_bill'
+      } else if (type === '补卡') {
+        name = 'rs/report/replace_sell'
+      } else if (type === '发卡售气') {
+        name = 'rs/report/sendCard_bill'
+      } else if (type === '卡表收费' || type === '卡表赠气' || type === '卡表收费撤销') {
+        name = 'rs/report/card_bill'
+      } else if (type === '预存缴费') {
+        name = 'rs/report/pre_sell'
+      } else if (type === '退费') {
+        name = 'rs/report/refund_sell'
+      } else if (type === '调价补费') {
+        name = 'rs/report/compensation_bill'
+      } else if (type === '数码表收费') {
+        name = 'rs/report/digtial_bill'
+      }
+      return name
+    },
+    async asyncPrint (select) {
+      return new Promise(async (resolve) => {
+        this.printControl = resolve
+        this.$refs.reportprint.print(select)
+      })
+    }
+  },
+  events: {
+    'print'() {
+      this.printControl('打印完成')
+    },
+    'print-error'() {
+      this.$showAlert('打印失败，若有需要，请补打发票', 'error', 3)
+      this.$dispatch('error', '票据补打', this.data, null)
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/filiale/ancheng/businessquery/FMYGasQuery.vue

@@ -145,6 +145,21 @@
                             condition="f_gasproperties = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价名称</label>
+                  <v-select :value.sync="model.f_price_name"
+                            v-model="model.f_price_name"
+                            :options="$parent.$parent.getPricenames"
+                            condition="f_price_name = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <!--表册片区-->
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">表册片区</label>
@@ -230,6 +245,9 @@
                 <th>
                   <nobr>气表类型</nobr>
                 </th>
+                <th>
+                  <nobr>气价名称</nobr>
+                </th>
                 <th>
                   <nobr>气价详情</nobr>
                 </th>
@@ -314,6 +332,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_classify}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_price_value}}</nobr>
               </td>
@@ -735,6 +756,51 @@ import exportConfig from './../exportConfig'
       credentials () {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('证件类型')]
       },
+      pricetypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      // 获取气价
+      getPricenames() {
+        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
+        let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
+        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
+        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          let rs = []
+          let priceArr = []
+          if ( pricetype.length >0) {
+            let params = {
+              f_price_type: pricetype[0],
+              filter: this.f_filialeid,
+              prices: this.prices
+            }
+            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+              let temp = {}
+              temp.label = item.label
+              temp.value = item.value.f_price_name
+              if(f_user_type && f_user_type.length >0){
+                if(f_user_type== item.value.f_user_type) {
+                  if (f_gasproperties && f_gasproperties !=='') {
+                    if (f_gasproperties == item.value.f_gasproperties) {
+                      priceArr.push(temp)
+                    }
+                  } else {
+                    priceArr.push(temp)
+                  }
+                }
+              }else {
+                priceArr.push(temp)
+              }
+            })
+            rs = [{label: '全部', value: ''}, ...priceArr]
+          }
+          if (rs.length === 0) {
+            console.log('rs读出来是空')
+            this.$refs.paged.$refs.cri.model.f_price_name = ''
+          }
+          return rs
+        }
+      },
       metertype () {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
       }

package/src/filiale/ancheng/exportConfig.js

@@ -414,6 +414,7 @@ export default{
     "f_meternumber": "表号",
     "f_meter_brand": "气表品牌",
     "f_meter_classify": "气表类型",
+    "f_price_name": "气价名称",
     "f_price_value": "气价详情",
     "f_balance": "账户余额",
     "f_pregas": "预购气量",

package/src/saleManage.js

@@ -666,4 +666,6 @@ export default function () {
 
   // 月用气量查询
   Vue.component('web-meter-month-gas-guery', (resolve) => { require(['./components/sale/businessquery/WebMeterMonthGasQuery'], resolve) })
+  // 批量打印票据
+  Vue.component('manage-batch-print-bill', (resolve) => { require(['./components/sale/common/BatchPrintBill'], resolve) })
 }