sale-client 3.6.524 → 3.6.526

package/package.json

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

package/src/filiale/bayan/NoCardMeterCenter.vue

@@ -213,9 +213,9 @@
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       self.model.f_collection = self.model.f_totalcost
-      if(self.config.floor){
-        self.model.f_collection=Math.ceil(self.model.f_collection)
-      }
+      // if(self.config.floor){
+      //   self.model.f_collection=Math.ceil(self.model.f_collection)
+      // }
       self.calText(getAmount.data.chargeprice)
     }
   }
@@ -326,7 +326,7 @@
           notShowFormula: false, // 不显示计算公式,默认显示
           hasPrint: true,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
-          floor: false,  //是否取整收费
+          floor: false,  // 是否取整收费
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
           showupload: true,

package/src/filiale/rongchuang/ChangeMeter.vue

@@ -185,14 +185,19 @@
         </div>
         <div class="row" v-if="!model.f_type.includes('换卡控流量计')">
           <div class="col-sm-4 form-group" :class="[$m.type.required ? 'has-error' : '']">
-            <label class="font_normal_body">气价类型</label>
+            <label class="font_normal_body" style="color: #d9534f; font-weight: bold;">
+              气价类型
+              <span style="color: #f0ad4e; margin-left: 5px;" title="换表前请检查用户气价是否正确，如需调整请及时修改！">
+                <i class="fa fa-exclamation-circle"></i>
+              </span>
+            </label>
             <v-select :value.sync="newinfo.pricetype" v-model="newinfo.pricetype"
                       placeholder='气价类型' :options="pricetypes"
                       close-on-select v-ref:type>
             </v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
-            <label class="font_normal_body">气价名称</label>
+            <label class="font_normal_body" style="color: #d9534f; font-weight: bold;">气价名称</label>
             <v-select :value.sync="newinfo.pricename" v-model="newinfo.pricename"
                       placeholder='气价名称' :options="getPricenames()"
                       close-on-select :disabled='newinfo.pricetype.length === 0 ' v-ref:name></v-select>
@@ -276,6 +281,9 @@
           <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_changetables_reason"></textarea>
         </div>
         <div style="text-align:right;height:auto;">
+          <span style="float: left; color: #f0ad4e; line-height: 34px;">
+            <span style="display: inline-block; width: 16px; height: 16px; background: #f0ad4e; border-radius: 50%; text-align: center; line-height: 16px; color: white; margin-right: 5px;">!</span> 温馨提示：换表前请检查用户气价是否正确，如需调整请及时修改！
+          </span>
           <button class="button_search" v-show="config.approve == true ? applyButtonShow : false" type="button" @click="apply()"
                   :disabled="(!meterinfo && !(model.f_type.includes('清零') || model.f_type.includes('换卡控流量计'))) || !$v.valid"
           >换表审核

package/src/filiale/shimen/ReissueBill.vue

@@ -0,0 +1,315 @@
+<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">{{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'>
+              <div v-html="bill.data"></div>
+            </div>
+            <div class="row" v-if="config.hasBillManage">
+              <div v-if="!messShow">
+                <!--<span><strong>发票号:{{model.f_using_number}}</strong></span>-->
+                <div v-if="model.f_rprint_type === 'new'">
+                  <div class="form-group form-input-group col-sm-4">
+                    <label class="control-label col-sm-2">新票号:</label>
+                    <div class="col-sm-2">
+                      <input type="text" class="form-control col-sm-2" v-model="model.newNumber.number" readonly>
+                    </div>
+                  </div>
+                </div>
+                <div v-if="model.f_rprint_type === 'old'">
+                  <div class="form-group form-input-group col-sm-4">
+                    <label class="control-label col-sm-2">原票号:</label>
+                    <div class="col-sm-2">
+                      <input type="text" class="form-control col-sm-2" v-model="model.oldNumber.number" readonly>
+                    </div>
+                  </div>
+                </div>
+                <div v-if="model.f_rprint_type === 'no'">
+                  <div class="form-group form-input-group col-sm-4">
+                    <label class="control-label col-sm-2">票号:</label>
+                    <div class="col-sm-2" style="padding-top: 15px">
+                      不占用票号
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="row" v-if="config.hasBillManage" style="margin-top: 1%">
+              <div class="form-group form-input-group col-sm-4">
+                <label class="col-sm-2 control-label">补打类型:</label>
+                <div class="col-sm-2">
+                  <v-select
+                    v-model="model.f_rprint_type"
+                    placeholder='请选择'
+                    :value.sync="model.f_rprint_type"
+                    :options='rprinttype'
+                    :value-single="true"
+                    :width="80"
+                    @change="printTypeChane"
+                    close-on-select clear-button>
+                  </v-select>
+                </div>
+              </div>
+              <div v-if="isOnlyNew && model.f_rprint_type !== 'no' && config.hasBillManage">
+                <div class="form-group form-input-group col-sm-4" :class="[$v.billtype.required ? 'has-error' : 'has-success']">
+                  <label class="col-sm-2 control-label">票据类型</label>
+                  <div class="col-sm-2" >
+                    <v-select :value.sync="model.f_bill_type"
+                              :options='printtypes'
+                              placeholder='请选择'
+                              v-model="model.f_bill_type"
+                              @change="useTypeChange"
+                              :value-single="true"
+                              close-on-select v-ref:billtype>
+                    </v-select>
+                    <input type="text" v-show="false" v-model="$refs.billtype.selectedItems" v-validate:billtype='{required: true }'>
+                  </div>
+                </div>
+
+                <div class="form-group form-input-group col-sm-4" :class="[$v.usetype.required ? 'select-error' : '']">
+                  <label class="col-sm-2 control-label">使用类型</label>
+                  <div class="col-sm-2" >
+                    <v-select :value.sync="model.f_use_type"
+                              :options='usetypes'
+                              placeholder='请选择'
+                              v-model="model.f_use_type"
+                              @change="useTypeChange"
+                              :value-single="true"
+                              close-on-select v-ref:usetype>
+                    </v-select>
+                    <input type="text" v-show="false" v-model="$refs.usetype.selectedItems" v-validate:usetype='{required: true }'>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="row" style="margin-top: 1%">
+              <div class="form-group form-input-group col-sm-12">
+                <label for="f_cause" class=" col-sm-2 control-label">补打原因:</label>
+                <div class="col-sm-10">
+              <textarea class="form-control" v-model="model.f_cause" rows="1" placeholder="补打原因"></textarea>
+                </div>
+              </div>
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='print(true)' :disabled="!valid">选择打印机打印</button>
+        <button type="button" class="btn btn-success" @click='print()' :disabled="!valid">打印</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 readyGen = async function (self) {
+    await self.$getConfig(self, 'ReissueBill')
+    console.log('补打业务config', self.config)
+    self.model.f_rprint_type = 'no'
+    await getBillData(self)
+  }
+
+  let getBillGen = async function (self) {
+    // 判断发票管理是否启用
+    if (self.config.hasBillManage) {
+      if (self.model.f_rprint_type === 'old') {
+        await getOld(self)
+      } else if (self.model.f_rprint_type === 'new') {
+        await getNew(self)
+      }
+      // 不占用票号补打不需要获取票号
+    }
+  }
+
+  let getOld = async function (self) {
+    let param = {
+      id: self.data.id,
+      type: self.data.type
+    }
+    let getOld = await self.$resetpost('rs/logic/sale_getOldBillNumber', param, {resolveMsg: null, rejectMsg: null})
+    console.log('获取原始票号', getOld)
+    // 验证原始票号是否存在
+    if (getOld.data.id && getOld.data.number) {
+      self.model.oldNumber.number = getOld.data.number
+      self.model.oldNumber.id = getOld.data.id
+    } else {
+      self.$showAlert('此次正常操作时没有出票，只能使用新票号或不占用票号进行补打', 'warning', 2000)
+      self.model.f_rprint_type = 'new'
+      self.isOnlyNew = true
+    }
+  }
+
+  let getNew = async function (self) {
+    // 获取原来收费记录使用的发票类型
+    let param = {
+      id: self.data.id,
+      type: self.data.type
+    }
+    let oldUseType = await self.$resetpost('rs/logic/sale_getOldUseType', param, {resolveMsg: null, rejectMsg: '获取原始票据信息出错！！'})
+    console.log('获取原始票据信息。。。', oldUseType)
+
+    let newparam = {
+      f_bill_user: self.$login.f.name, // 票据使用人
+      f_filialeids: self.$login.f.orgid // 所属分公司
+    }
+
+    if (oldUseType.data.billtype && oldUseType.data.f_use_type) {
+      newparam.f_bill_type = oldUseType.data.billtype
+      newparam.f_use_type = oldUseType.data.f_use_type
+    } else {
+      if (self.model.f_use_type && self.model.f_bill_type) {
+        newparam.f_bill_type = self.model.f_bill_type
+        newparam.f_use_type = self.model.f_use_type
+      } else {
+        self.isOnlyNew = true
+        // self.model.f_bill_type = '普通收据'
+        self.$showAlert('请选择票据使用类型', 'warning', 2000)
+        return
+      }
+    }
+    let getNew
+  try {
+    getNew = await self.$resetpost('rs/logic/sale_getNewBillNumber', newparam, {resolveMsg: null, rejectMsg: null})
+  } catch (e) {
+    self.model.newNumber.number = ''
+    self.model.newNumber.id = ''
+    self.$showAlert('未获取到发票号', 'warning', 2000)
+    return
+  }
+    console.log('获取新票号', getNew)
+    self.model.newNumber.number = getNew.data.number
+    self.model.newNumber.id = getNew.data.id
+  }
+
+  /**
+   * ready执行过程
+   */
+  let getBillData = async function (self) {
+    // 显示票据
+    self.bill = new DataModel(self.data.billUrl, {reprint: "'补打'",operator: `'${self.$login.f.name}'`,})
+    await self.bill.search(self.data.id)
+    // self.bill.data = '我是补打发票'
+    await getBillGen(self)
+  }
+
+  export default {
+    title: '票据补打',
+    data () {
+      return {
+        config: {
+          hasBillManage: true  // 默认不启用发票管理
+        },
+        bill: Object,
+        model: {
+          oldNumber: {
+            number: '',
+            id: ''
+          },
+          newNumber: {
+            number: '',
+            id: ''
+          },
+          f_end_number: null,
+          f_cause: null,
+          f_rprint_type: 'no'
+        },
+        messShow: false,
+
+        isOnlyNew: false,
+        rprinttype: this.data.type === '卡表收费' || this.data.type === '物联网表收费' || this.data.type === '机表收费'
+          ? [{label: '原票号补打', value: 'old'}, {label: '新票号补打', value: 'new'}, {label: '不占用票号补打', value: 'no'}]
+          : [{label: '原票号补打', value: 'old'}, {label: '不占用票号补打', value: 'no'}],
+        usetypes: this.$appdata.getParam('发票使用类型'),
+        printtypes: this.$appdata.getParam('分配票据格式')
+      }
+    },
+    props: ['show', 'data', 'billUrl'],
+    ready () {
+      console.log('data', this.data)
+      readyGen(this)
+    },
+    computed: {
+      valid () {
+        // 当选择"不占用票号补打"时，忽略票据类型和使用类型的验证
+        if (this.model.f_rprint_type === 'no') {
+          return !!this.model.f_cause
+        }
+        return this.$v ? this.$v.valid : false
+      }
+    },
+    methods: {
+      printTypeChane () {
+        if (this.model.f_rprint_type === 'new') {
+          getNew(this)
+        } else if (this.model.f_rprint_type === 'old') {
+          getOld(this)
+        } else if (this.model.f_rprint_type === 'no') {
+          // 不占用票号补打不需要获取票号
+          this.model.newNumber.number = ''
+          this.model.newNumber.id = ''
+          this.model.oldNumber.number = ''
+          this.model.oldNumber.id = ''
+        }
+      },
+
+      useTypeChange () {
+        if (this.model.f_rprint_type === 'new') {
+          getNew(this)
+        }
+      },
+      clean () {
+        this.$dispatch('cancel', '票据补打', this.row)
+      },
+      async print (select) {
+        // 如果需要使用票号但没有票号，则提示错误
+        if (this.config.hasBillManage && this.model.f_rprint_type !== 'no' && !this.model.newNumber.number) {
+          this.$showMessage('当前没有票号')
+          return
+        }
+        // 进行补打
+        try {
+          console.log('开具收据的参数：', this.data.id, this.data.f_bill_type)
+          if (this.config.hasBillManage && this.model.f_rprint_type !== 'no') {
+            await this.$CommonService.reissuePaperBill(this.data.id, this.data.f_bill_type, this.model)
+          } else {
+            this.data.f_cause = this.model.f_cause
+            await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！'})
+          }
+          console.log('开始打印、、', select)
+          if (select) {
+            this.$refs.reportprint.print(true)
+          } else {
+            this.$refs.reportprint.print()
+          }
+        } catch (error) {
+          this.$dispatch('refresh')
+        }
+      }
+    },
+    events: {
+      'print' () {
+        console.log('发送补打成功事件')
+        this.$dispatch('reissue-success')
+      },
+      'print-error' () {
+        this.$showAlert('打印失败，若有需要，请补打发票', 'error', 3)
+        this.$dispatch('error', '票据补打', this.data, null)
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

package/src/filiale/shimen/sale.js

@@ -20,4 +20,6 @@ export default function () {
   Vue.component('iot-meter-center', (resolve) => { require(['./IOTMeterCenter'], resolve) })
   // 物联网表收费
   Vue.component('card-meter-center', (resolve) => { require(['./CardMeterCenter'], resolve) })
+  // 票据补打
+  Vue.component('reissue-bill', (resolve) => { require(['./ReissueBill'], 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/yangchun/sale'
+import FilialeSale from './filiale/qianneng/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'