sale-client 3.4.190 → 3.4.193

package/build/dev-server.js

@@ -10,9 +10,10 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://121.36.106.17:8400/',bendi1 = 'http://121.36.106.17:8400/'
+var bendi = 'http://127.0.0.1:8080',bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
-var fuwu = 'http://121.36.106.17:8400/'
+var fuwu = 'http://192.168.50.4:8400'
+// var fuwu = 'http://121.36.106.17:8400/'
 //铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
 //铜川测试
@@ -98,8 +99,8 @@ var proxyTable = {
   },
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
-    target: 'http://121.36.106.17:8400/'
-    // target:fuwu
+    // target: 'http://121.36.106.17:8400/'
+    target: bendi
   }
 }
 

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/charge/business/CardMeterCenter.vue

@@ -204,61 +204,7 @@
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
       </validator>
-      <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
-          <h4 class="modal-title">发票信息</h4>
-        </header>
-        <article slot="modal-body" class="modal-body">
-          <div class="auto select-overspread form-horizontal">
-            <div class="row auto">
-              <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
-                <label class="control-label">开票名称:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_paper_name" placeholder="开票名称">
-              </div>
-              <div class="col-sm-6 form-group form-input-group">
-                <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
-                <v-select v-model="invoice_is_pax"
-                          placeholder='请选择'
-                          :value.sync="invoice_is_pax"
-                          close-on-select
-                          :width="60"
-                          :value-single="true"
-                          :search="false"
-                          :options='is_pax' clear-button>
-                </v-select>
-              </div>
-              <div class="col-sm-12 form-group form-input-group">
-                <label class="control-label">开户行及账号:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_paper_account" placeholder="购方开户行及账号">
-              </div>
-              <div class="col-sm-12 form-group form-input-group" >
-                <label class="control-label">纳税人识别号:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
-              </div>
-              <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
-                <label class="control-label">开票地址电话:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_address_phone" placeholder="开票地址">
-              </div>
-              <div class="col-sm-12 form-group form-input-group">
-                <label class="control-label">邮箱推送:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_email" placeholder="邮箱推送">
-              </div>
-            </div>
-          </div>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button type="button" class="btn button_search"
-                  :disabled="!(row.f_paper_name&&row.f_address_phone)"
-                  @click='confirm'>确认收费
-          </button>
-        </footer>
-      </modal>
+      <eticket-modal :show="eticket_msg" @close-modal-show="eticket_msg = false" :row="row" @confirm="confirm"></eticket-modal>
       <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
       <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
     </div>
@@ -337,8 +283,8 @@
         self.model.f_collection = 0
       } else {
         self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
-        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)
@@ -390,8 +336,8 @@
       // 开始打票
       if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
         if (self.model.f_print.indexOf('电子发票') == -1) {
-          if(self.$login.r.includes('非民用纸质票据拆分')){
-            if(self.row.f_user_type === '非民用'){
+          if (self.$login.r.includes('非民用纸质票据拆分')) {
+            if (self.row.f_user_type === '非民用') {
               self.billData.url = 'rs/report/fmy_card_bill'
             }
           }
@@ -409,7 +355,7 @@
           if (self.model.f_print[0] === '电子发票') {
             self.row.id = res
             self.eticket_show = true
-            //应铜川需要卡表显示
+            // 应铜川需要卡表显示
             await self.$refs.eticketbill.openETicket([res], self.row, '是', self.invoice_is_pax, '卡表收费')
             // await self.$CommonService.openEticket(res, '售气收费')
             // self.print = true
@@ -474,16 +420,16 @@
       }
     }
     let nowrite_param = {
-      f_userfiles_id: self.row.f_userfiles_id,
+      f_userfiles_id: self.row.f_userfiles_id
     }
     let getNoWriteCard = await self.$resetpost('rs/sql/getnowritecard', {data: nowrite_param}, {
       resolveMsg: null,
       rejectMsg: '获取最近卡表收费记录失败！！'
     })
-    if(getNoWriteCard.data.length >0){
+    if (getNoWriteCard.data.length > 0) {
       self.$showMessage(`三小时内存在写卡失败的记录，是否重新写卡？`, ['confirm', 'cancel']).then(async (res) => {
         if (res === 'confirm') {
-          let url = 'http://127.0.0.1:8003/'+ getNoWriteCard.data[0].f_cardpost
+          let url = 'http://127.0.0.1:8003/' + getNoWriteCard.data[0].f_cardpost
           let param = JSON.parse(getNoWriteCard.data[0].f_cardparam)
           let cardRes = await self.$resetpost(url, param, {resolveMsg: null, rejectMsg: '重新写卡失败'})
           if (cardRes.data.Err || cardRes.data.Exception) {
@@ -493,12 +439,11 @@
             self.$resetpost('rs/logic/writeCardAgin', getNoWriteCard.data[0], {resolveMsg: '重新写卡成功', rejectMsg: '重新写卡失败'})
             self.$dispatch('success')
           }
-        }else{
+        } else {
           self.$dispatch('refresh', self.row)
         }
       })
     }
-
   }
   export default {
     title: '卡表收费',
@@ -511,7 +456,7 @@
           notShowFormula: false, // 不显示计算公式,默认显示
           autoCollection: true, // 自动填写收款
           showupload: true, // 显示上传
-          hasPrint: false,  // 默认打票
+          hasPrint: true,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
@@ -667,7 +612,7 @@
           if (!this.row.f_address_phone) {
             this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
           }
-          if(!this.row.f_email){
+          if (!this.row.f_email) {
             this.row.f_email = this.row.f_email
           }
           this.eticket_msg = true
@@ -772,10 +717,10 @@
         str = str.slice(0, str.length - 1)
         this.calculatedetail = str
         if (num > 1) {
-          if(this.$login.r.find(item=>item=='阶梯提示无按钮')){
+          if (this.$login.r.find(item => item == '阶梯提示无按钮')) {
             this.$showAlert('友好提示：本次购气已跨阶梯', 'warning', 3000)
-          }else{
-            this.$showMessage('友好提示：本次购气已跨阶梯',['confirm','cancel']);
+          } else {
+            this.$showMessage('友好提示：本次购气已跨阶梯', ['confirm', 'cancel'])
           }
         }
       },

package/src/components/charge/business/IOTMeterCenter.vue

@@ -190,56 +190,7 @@
     </div>
     <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
   </div>
-  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
-      <h4 class="modal-title">发票信息</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="auto select-overspread form-horizontal">
-        <div class="row auto">
-          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
-            <label class="control-label">开票名称:</label>
-            <input class="form-control col-sm-2"
-                   v-model="row.f_paper_name" placeholder="开票名称">
-          </div>
-          <div class="col-sm-6 form-group form-input-group">
-            <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
-            <v-select v-model="invoice_is_pax"
-                      placeholder='请选择'
-                      :value.sync="invoice_is_pax"
-                      close-on-select
-                      :width="60"
-                      :value-single="true"
-                      :search="false"
-                      :options='is_pax' clear-button>
-            </v-select>
-          </div>
-          <div class="col-sm-12 form-group form-input-group">
-            <label class="control-label">开户行及账号:</label>
-            <input class="form-control col-sm-2"
-                   v-model="row.f_paper_account" placeholder="购方开户行及账号">
-          </div>
-          <div class="col-sm-12 form-group form-input-group" :class="[!row.f_taxpayer_id ? 'has-error' : '']">
-            <label class="control-label">纳税人识别号:</label>
-            <input class="form-control col-sm-2"
-                   v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
-          </div>
-          <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
-            <label class="control-label">开票地址电话:</label>
-            <input class="form-control col-sm-2"
-                   v-model="row.f_address_phone" placeholder="开票地址">
-          </div>
-        </div>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn button_search"
-              :disabled="!(row.f_taxpayer_id&&row.f_paper_name&&row.f_address_phone)"
-              @click='confirm'>确认收费
-      </button>
-    </footer>
-  </modal>
+  <eticket-modal :show="eticket_msg" @close-modal-show="eticket_msg = false" :row="row" @confirm="confirm"></eticket-modal>
   <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
   <upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="物联网表收费"></upload>
 <!--  <modal :show.sync="showfiles" width="80%"style="width:auto;"  v-ref:modal middle backdrop="false">-->
@@ -300,8 +251,8 @@
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
     self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(2)
-    if(self.config.floor){
-      self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+    if (self.config.floor) {
+      self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
     }
     // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
     self.model.f_collection = self.model.f_totalcost
@@ -326,8 +277,8 @@
       self.model.f_totalcost = (self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4)
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
-      if(self.config.floor){
-        self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+      if (self.config.floor) {
+        self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
       }
       self.model.f_collection = self.model.f_totalcost
       if (self.model.f_payment == '赠气') {
@@ -379,8 +330,8 @@
       if (self.config.hasPrint) {
         if (self.model.f_print.indexOf('电子发票') == -1) {
           console.log('self.config.hasBillManage', self.config.hasBillManage)
-          if(self.$login.r.includes('非民用纸质票据拆分')){
-            if(self.row.f_user_type === '非民用'){
+          if (self.$login.r.includes('非民用纸质票据拆分')) {
+            if (self.row.f_user_type === '非民用') {
               self.billData.url = 'rs/report/fmy_iot_bill'
             }
           }
@@ -468,7 +419,7 @@
           priceCalculation: false, // 划气量控制
           showupload: true,  // 默认显示附件上传组件
           hasPrint: false,  // 默认打票
-          floor: true,  //是否取整收费
+          floor: true,  // 是否取整收费
           hasBillManage: false,  // 默认不启用发票管理
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
@@ -526,8 +477,8 @@
       }
     },
     props: ['row'],
-    mounted() {
-            this.$refs.email.focus()
+    mounted () {
+      this.$refs.email.focus()
     },
     ready () {
       this.paytype = this.$appdata.getParam('付款方式')

package/src/components/charge/business/OtherChargeNew.vue

@@ -149,62 +149,7 @@
         <print-bill :show="print" :data='row' :bill-config='config' :bill-data='billData' v-on:toggle="close"
                     @printok="printok" v-ref:printbill></print-bill>
         <ticket-print :show="eticket_show" @toggle="eticket_toggle" v-ref:eticketbill></ticket-print>
-        <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
-          <header slot="modal-header" class="modal-header">
-            <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
-            <h4 class="modal-title">发票信息</h4>
-          </header>
-          <article slot="modal-body" class="modal-body">
-            <div class="auto select-overspread form-horizontal">
-              <div class="row auto">
-                <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
-                  <label class="control-label">开票名称:</label>
-                  <input class="form-control col-sm-2"
-                         v-model="row.f_paper_name" placeholder="开票名称">
-                </div>
-                <div class="col-sm-6 form-group form-input-group">
-                  <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
-                  <v-select v-model="invoice_is_pax"
-                            placeholder='请选择'
-                            :value.sync="invoice_is_pax"
-                            close-on-select
-                            :width="60"
-                            :value-single="true"
-                            :search="false"
-                            disabled
-                            :options='is_pax' clear-button>
-                  </v-select>
-                </div>
-                <div class="col-sm-12 form-group form-input-group">
-                  <label class="control-label">开户行及账号:</label>
-                  <input class="form-control col-sm-2"
-                         v-model="row.f_paper_account" placeholder="购方开户行及账号">
-                </div>
-                <div class="col-sm-12 form-group form-input-group">
-                  <label class="control-label">纳税人识别号:</label>
-                  <input class="form-control col-sm-2"
-                         v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
-                </div>
-                <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
-                  <label class="control-label">开票地址电话:</label>
-                  <input class="form-control col-sm-2"
-                         v-model="row.f_address_phone" placeholder="开票地址">
-                </div>
-                <div class="col-sm-12 form-group form-input-group">
-                  <label class="control-label">邮箱推送:</label>
-                  <input class="form-control col-sm-2"
-                         v-model="row.f_email" placeholder="邮箱推送">
-                </div>
-              </div>
-            </div>
-          </article>
-          <footer slot="modal-footer" class="modal-footer">
-            <button type="button" class="btn button_search"
-                    :disabled="!(row.f_paper_name&&row.f_address_phone)"
-                    @click='confirm'>确认收费
-            </button>
-          </footer>
-        </modal>
+        <eticket-modal :show="eticket_msg" @close-modal-show="eticket_msg = false" :row="row" @confirm="confirm"></eticket-modal>
         <!-- <print-other-charge-bill :show="print" v-ref:printbill :row='row' :logic='model' v-on:success="close" v-on:toggle="close"></print-other-charge-bill> -->
         <!-- <tax-other-bill :show="taxprint"  v-ref:taxprintbill :row='row' :logic='model' v-on:success="close" v-on:toggle="close"></tax-other-bill> -->
         <div style="text-align:right;height: 25%;">

package/src/components/charge/business/machine/MachineMeterCenter.vue

@@ -135,61 +135,7 @@
       <validate-bill v-if="hasValidateBill" :data="data" @validate-bill="validateBill"></validate-bill>
       <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="close" :data='data' @printok="printok" v-ref:printbill></print-bill>
       <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
-      <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
-          <h4 class="modal-title">发票信息</h4>
-        </header>
-        <article slot="modal-body" class="modal-body">
-          <div class="auto select-overspread form-horizontal">
-            <div class="row auto">
-              <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
-                <label class="control-label">开票名称:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_paper_name" placeholder="开票名称">
-              </div>
-              <div class="col-sm-6 form-group form-input-group">
-                <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
-                <v-select v-model="invoice_is_pax"
-                          placeholder='请选择'
-                          :value.sync="invoice_is_pax"
-                          close-on-select
-                          :width="60"
-                          :value-single="true"
-                          :search="false"
-                          :options='is_pax' clear-button>
-                </v-select>
-              </div>
-              <div class="col-sm-12 form-group form-input-group">
-                <label class="control-label">开户行及账号:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_paper_account" placeholder="购方开户行及账号">
-              </div>
-              <div class="col-sm-12 form-group form-input-group"  >
-                <label class="control-label">纳税人识别号:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
-              </div>
-              <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
-                <label class="control-label">开票地址电话:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_address_phone" placeholder="开票地址">
-              </div>
-              <div class="col-sm-12 form-group form-input-group">
-                <label class="control-label">邮箱推送:</label>
-                <input class="form-control col-sm-2"
-                       v-model="row.f_email" placeholder="邮箱推送">
-              </div>
-            </div>
-          </div>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button type="button" class="btn button_search"
-                  :disabled="!(row.f_paper_name&&row.f_address_phone)"
-                  @click='confirm'>确认收费
-          </button>
-        </footer>
-      </modal>
+      <eticket-modal :show="eticket_msg" @close-modal-show="eticket_msg = false" :row="row" @confirm="confirm"></eticket-modal>
       <div class="text-right" style="margin-top: 1%">
         <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
         <payment-code-button :clickable="!$v.valid || validateOk"
@@ -278,8 +224,8 @@ let asyncMachineMeterCenter = async function (self) {
       // 开始打票
       if (self.config.hasPrint) {
         if (self.data.f_print.indexOf('电子发票') == -1) {
-          if(self.$login.r.includes('非民用纸质票据拆分')){
-            if(self.row.f_user_type === '非民用'){
+          if (self.$login.r.includes('非民用纸质票据拆分')) {
+            if (self.row.f_user_type === '非民用') {
               self.billData.url = 'rs/report/fmy_machine_bill'
             }
           }
@@ -352,7 +298,7 @@ let asyncMachineMeterCenter = async function (self) {
           showupload: true, // 显示上传
           hasPrint: true,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
-          hasfindaReail:  true,  //默认开启找零功能
+          hasfindaReail: true,  // 默认开启找零功能
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
           payment: '现金缴费'
@@ -439,7 +385,7 @@ let asyncMachineMeterCenter = async function (self) {
           if (!this.row.f_address_phone) {
             this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
           }
-          if(!this.row.f_email){
+          if (!this.row.f_email) {
             this.row.f_email = this.row.f_email
           }
           this.eticket_msg = true
@@ -706,6 +652,8 @@ let asyncMachineMeterCenter = async function (self) {
             await this.speckText('请注意，当前收款小于欠费')
           }
         }
+        // 没获取优惠之前默认和收款一样,防止获取优惠太慢导致收款金额与实际收款不符
+        this.data.f_after_discount = this.data.f_collection
         // 获取计算优惠
         this.getPrivilegeList()
       }

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -143,7 +143,7 @@
     </div>
     <div class="auto" style="float: right;">
       <button class="button_clear " @click="cancelmain()" >返回</button>
-      <button v-if="row.f_meter_brand.includes('西美')"
+      <button v-if="row.f_meter_brand.includes('西美')&&row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="clearBarrier">清除障碍</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="openUser">开户</button>

package/src/components/revenue/Common/EticketPrint.vue

@@ -34,7 +34,7 @@ export default {
   },
   methods: {
     cancel () {
-      console.log("电子哈哈哈，你走了没")
+      console.log('电子哈哈哈，你走了没')
       this.eticket_src = ''
       this.return_msg = '正在查询中，请稍后'
       this.$dispatch('toggle')
@@ -69,12 +69,12 @@ export default {
           f_buy_name: row.f_paper_name,
           f_pay_id: row.f_taxpayer_id,
           f_buy_address: row.f_address_phone,
-          f_mail_push:row.f_email,
+          f_mail_push: row.f_email,
           f_buy_openbank: row.f_paper_account,
           invoice_show_gas: show_gas === '是',
           is_pax: is_pax === '征税'
         }
-        console.log('组织开票数据并保存',model)
+        console.log('组织开票数据并保存', model)
         // TODO 组织开票数据并保存
         let ticket_id = await this.$resetpost('rs/logic/TCcombineData', model, {resolveMsg: null, rejectMsg: '保存开票信息失败'})
         return this.openEticketGen(ticket_id.data)
@@ -82,6 +82,32 @@ export default {
         this.$showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
       }
     },
+    async openCustETicket (custModel, invoice_is_pax) {
+      try {
+        let model = Object.assign({
+          f_dept_id: this.$login.f.depids,
+          f_operator: this.$login.f.name,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depname: this.$login.f.deps,
+          f_operatorid: this.$login.f.id,
+          f_filialeids: this.$login.f.f_orgids,
+          f_buy_name: custModel.f_paper_name,
+          f_pay_id: custModel.f_taxpayer_id,
+          f_buy_address: custModel.f_address_phone,
+          f_mail_push: custModel.f_email,
+          f_buy_openbank: custModel.f_paper_account,
+          invoice_show_gas: !!(custModel.amount && custModel.price),
+          detail_price: {amount: custModel.amount, price: custModel.price, name: custModel.name, money: custModel.money},
+          is_pax: invoice_is_pax === '征税'
+        }, custModel)
+        // TODO 组织开票数据并保存
+        let ticket_id = await this.$resetpost('rs/logic/TCcombineCustData', model, {resolveMsg: null, rejectMsg: '保存开票信息失败'})
+        return this.openEticketGen(ticket_id.data)
+      } catch (error) {
+        this.$showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
+      }
+    },
     /**
      * src赋值 外部调用
      *  */

package/src/components/revenue/HandManager/MbpeopleList.vue

@@ -205,10 +205,10 @@ import Vue from 'vue'
 let loadParamGem = async function (self) {
     await self.$LoadParams.loadParam()
     self.getfield = self.config.excelHeaders
-    self.$refs.paged.$refs.cri.model.f_meter_classify = ['机表']
+    // self.$refs.paged.$refs.cri.model.f_meter_classify = ['机表']
     self.$refs.paged.$refs.cri.model.f_book_name = ['is null']
     await self.initAdjustables()
-    await self.search()
+    // await self.search()
   }
   export default {
     name: 'MbpeopleList',

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -53,6 +53,14 @@
           <label class = "col-sm-5 ">物联网次数</label>
           <span class = "col-sm-7" >{{data?data.f_iot_times:dafault.f_iot_times}}</span>
         </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">表累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee:dafault.f_total_fee}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">户累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee_all:dafault.f_total_fee_all}}</span>
+        </div>
         <div class="row" v-if="(data.f_meter_type === '机表' || data.f_meter_type === '物联网表') && data.f_deduction_gas > 0">
           <label class = "col-sm-5 " >剩余抵扣量</label>
           <span class = "col-sm-7" >{{data?data.f_deduction_gas:dafault.f_deduction_gas}}</span>
@@ -161,6 +169,7 @@
       return {
         dafault: {
           f_total_gas_all: 0,
+          f_total_fee_all:0,
           f_balance_amount: 0,
           f_balance_gas: 0,
           f_initial_base: 0,