sale-client 3.6.338 → 3.6.340

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Jul 12 17:16:43 CST 2024
+#Mon Jul 08 09:48:59 CST 2024
 gradle.version=5.2.1

package/SaleClient.iml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/bin" />
+<module external.linked.project.id="SaleClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.1-11" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

package/package.json

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

package/src/components/FilesManage/UserPaperInfoTest.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="auto">
+    <validator name="v">
     <form class="form-horizontal select-overspread ">
       <div class="row">
         <div class="col-sm-8 form-group">
@@ -19,12 +20,15 @@
           <input class="input_search" placeholder="地址-电话" style="width:70%" type="text" v-el:addressphone
                  v-model="baseinfo.base.f_address_phone" v-next-el="papername">
         </div>
-        <div class="col-sm-4 form-group">
-          <label class="font_normal_body" for="f_paper_type">票据类型</label>
+        <div class="col-sm-4 form-group" :class="[$v.pty.required ? 'has-error' : '']">
+          <label class="font_normal_body" for="f_paper_type">*票据类型</label>
+          <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.pty.selectedItems"
+                 v-validate:pty='{required: true }'>
           <v-select :options='papertype'
                     :value-single="true"
                     :value.sync="baseinfo.base.f_paper_type" close-on-select
-                    placeholder='票据类型'></v-select>
+                    placeholder='票据类型'
+          v-ref:pty></v-select>
         </div>
       </div>
       <div class="row">
@@ -48,6 +52,7 @@
       </div>
 
     </form>
+    </validator>
   </div>
 </template>
 <script>

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

@@ -163,7 +163,7 @@ export default {
     }
   },
   ready () {
-    readyGen(this)
+    // readyGen(this)
   },
   methods: {
     loadMeterBooks () {
@@ -180,7 +180,7 @@ export default {
     },
     selfSearch (args) {
       if (!this.orgCondtionStr) {
-        args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        args.condition = `${args.condition}` + ' and f_orgid in ' + `('`+this.$login.f.orgid+`')`
       } else {
         args.condition = `${args.condition}` + this.orgCondtionStr
       }

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

@@ -104,9 +104,11 @@ export default {
           }, {resolveMsg: null, rejectMsg: null})
           this.model = result.data[0]
           console.log('看看维修情况', result, this.model)
-        }
-        if (this.model) {
-          this.pared = 1
+          if (this.model) {
+            this.pared = 1
+          } else {
+            this.pared = 0
+          }
         } else {
           this.pared = 0
         }

package/src/filiale/qianneng/revenue/sms/MessageReport.vue

@@ -93,18 +93,15 @@ export default {
         console.log(res.data)
         if (res.data.success) {
           this.$showMessage(`成功生成短信${res.data.success}条,生成失败${res.data.fail}条`)
-          // this.$refs.list.search()
-          this.$refs.message.$refs.paged.$refs.cri.search()
-          this.$refs.message.model.condition = 'convert(varchar(10),f_create_date,120) = ' + "'" + this.$login.toStandardDateString() + "'"
-          this.$refs.list.ids = []
-          this.$refs.message.ids = []
+          this.$refs.messagelist.$refs.paged.$refs.cri.search()
+          this.$refs.messagelist.ids = []
+        } else {
+          this.$showMessage(`短信生成失败`)
         }
-
       }).catch((error) => {
-        this.$refs.message.$refs.paged.$refs.cri.search()
-        this.$refs.message.model.condition = 'convert(varchar(10),f_create_date,120) = ' + "'" + this.$login.toStandardDateString() + "'"
-        this.$refs.list.ids = []
-        this.$refs.message.ids = []
+        this.$showMessage(`短信生成失败`)
+        this.$refs.messagelist.$refs.paged.$refs.cri.search()
+        this.$refs.messagelist.ids = []
       })
     },
     'success' () {

package/src/filiale/yangchun/CardMeterCenter.vue

@@ -377,39 +377,42 @@
       }
       console.log(self.config, self.config.hasPrint && !self.$login.r.includes('不打印发票'))
       // 开始打票
+      console.warn('电子票打印类型：', self.printInvoiceType)
       if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
-        if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
-          if (self.$login.r.includes('非民用纸质票据拆分')) {
-            if (self.row.f_user_type === '非民用') {
-              self.billData.url = 'rs/report/fmy_card_bill'
-            }
-          }
-          if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
-            self.billData.url = 'rs/report/fee_card_bill'
-          }
-          if (self.config.hasBillManage) {
-            // 启用发票管理，获取票据管理中的票号并存储记录
-            self.row.id = res
-            self.row.f_bill_type = '卡表收费'
-            self.row.f_bill_style = self.model.f_print[0]
-            self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
-            self.print = true
-          } else {
-            self.row.id = res
-            self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
-            self.print = true
+        // if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
+        if (self.$login.r.includes('非民用纸质票据拆分')) {
+          if (self.row.f_user_type === '非民用') {
+            self.billData.url = 'rs/report/fmy_card_bill'
           }
+        }
+        if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
+          self.billData.url = 'rs/report/fee_card_bill'
+        }
+        if (self.config.hasBillManage) {
+          // 启用发票管理，获取票据管理中的票号并存储记录
+          self.row.id = res
+          self.row.f_bill_type = '卡表收费'
+          self.row.f_bill_style = self.model.f_print[0]
+          self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+          self.print = true
         } else {
-          if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
-            self.row.id = res
-            self.eticket_show = true
-            self.row.f_print = self.model.f_print[0]
-            // 应铜川需要卡表显示
-            await self.$refs.eticketbill.openETicket(res, self.row, '卡表收费', self.row.f_print)
-            // await self.$CommonService.openEticket(res, '售气收费')
-            // self.print = true
-          }
+          self.row.id = res
+          self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+          self.print = true
+        }
+        // } else {
+        console.log('电子票打印类型1', self.printInvoiceType)
+        console.log('电子票打印类型2', self.model.f_print[0])
+        if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
+          self.row.id = res
+          self.eticket_show = true
+          self.row.f_print = self.model.f_print[0]
+          // 应铜川需要卡表显示
+          await self.$refs.eticketbill.openETicket(res, self.row, '卡表收费', self.row.f_print, false, self.row.invoice_is_pax)
+          // await self.$CommonService.openEticket(res, '售气收费')
+          self.print = true
         }
+        // }
       } else {
         self.$dispatch('success', '卡表收费', self.row)
       }
@@ -776,7 +779,8 @@
       },
       eticket_toggle () {
         this.eticket_show = false
-        this.$dispatch('success', '卡表收费')
+        this.eticket_msg = false
+        // this.$dispatch('success', '卡表收费')
       },
       clean () {
         this.$info('取消操作')

package/src/filiale/yangchun/EticketV4/EticketOpenPage.vue

@@ -16,17 +16,6 @@
                      condition="tu.f_user_name = '{}'" placeholder="用户姓名"
               >
             </div>
-            <div class="form-group col-sm-2">
-              <label class="font_normal_body">是否有票</label>
-              <v-select
-                v-model="model.mid"
-                placeholder='是否有票'
-                :search="false"
-                condition="mid.count {} "
-                :value.sync="model.mid"
-                :options='$parent.$parent.mid'
-                close-on-select></v-select>
-            </div>
             <div class="row" width="100%">
               <div class="col-sm-4 col-sm-2">
                 <label class="font_normal_body">&nbsp;开始时间</label>
@@ -66,13 +55,12 @@
             <th>客户编号</th>
             <th>客户姓名</th>
             <th>客户电话</th>
-            <th>缴费类型</th>
-            <th>应交金额</th>
-            <th>应交气量</th>
-            <th>上期底数</th>
-            <th>本期底数</th>
-            <th>是否开过票</th>
-            <th>结算时间</th>
+            <th>纳税人识别号码</th>
+            <th>气量</th>
+            <th>金额</th>
+            <th>用户类型</th>
+            <th>用气性质</th>
+            <th>气表类型</th>
             <th>操作</th>
           </tr>
         </template>
@@ -85,13 +73,12 @@
             <th style="text-align:center">{{ row.f_userinfo_code }}</th>
             <th style="text-align:center">{{ row.f_user_name }}</th>
             <th style="text-align:center">{{ row.f_user_phone }}</th>
+            <th style="text-align:center">{{ row.f_taxpayer_id }}</th>
+            <th style="text-align:center">{{ row.gas }}</th>
+            <th style="text-align:center">{{ row.money }}</th>
+            <th style="text-align:center">{{ row.f_user_type }}</th>
+            <th style="text-align:center">{{ row.f_gasproperties }}</th>
             <th style="text-align:center">{{ row.f_meter_classify }}</th>
-            <th style="text-align:center">{{ row.f_oughtfee }}</th>
-            <th style="text-align:center">{{ row.f_oughtamount }}</th>
-            <th style="text-align:center">{{ row.f_last_tablebase }}</th>
-            <th style="text-align:center">{{ row.f_tablebase }}</th>
-            <th style="text-align:center">{{ row.is_bill }}</th>
-            <th style="text-align:center">{{ row.f_hand_date }}</th>
             <th>
               <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
             </th>
@@ -214,7 +201,8 @@ export default {
       invoice_show_gas: '否',
       show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
       row: {},
-      mid: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
+      mid: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
+      condition: ''
     }
   },
   ready () {
@@ -275,10 +263,25 @@ export default {
       }
       this.eticket_msg = true
     },
-    confirm () {
+    async confirm () {
+      console.log('确认开票')
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.selecteds.length === 0 ? this.row.id : this.selecteds.map(item => item.id), this.row, '物联网结算', this.row.f_paper_type, false, this.invoice_is_pax, 't_web_handplan')
+
+      // this.row = row.data[0]
+
+      console.log('选中的： ', this.model.condition)
+      console.log('先看下条件是啥： ', this.model.condition)
+
+      // 因为需要合并，所以这里需要根据查询结算记录
+      let HttpReset = new HttpResetClass()
+      let row = await HttpReset.load('POST', 'rs/sql/OpenETicketQueryDetailed', {
+        data: {
+          condition: `tu.f_userinfo_code = '${this.row.f_userinfo_code}' and ${this.model.condition}`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+      console.log('查询到的记录：', row)
+      this.$refs.eticketbill.openETicket(row.data.map(item => item.id), this.row, '物联网结算', this.row.f_paper_type, false, this.invoice_is_pax, 't_web_handplan')
     },
     selfSearch (args) {
       this.selecteds = []

package/src/filiale/yangchun/MachineMeterCenter.vue

@@ -231,45 +231,44 @@ let asyncMachineMeterCenter = async function (self) {
 
       // 开始打票
       if (self.config.hasPrint) {
-        if (self.printInvoiceType.indexOf(self.data.f_print) === -1) {
-          if (self.$login.r.includes('非民用纸质票据拆分')) {
-            if (self.row.f_user_type === '非民用') {
-              self.billData.url = 'rs/report/fmy_machine_bill'
-            }
+        // if (self.printInvoiceType.indexOf(self.data.f_print) === -1) {
+        if (self.$login.r.includes('非民用纸质票据拆分')) {
+          if (self.row.f_user_type === '非民用') {
+            self.billData.url = 'rs/report/fmy_machine_bill'
           }
-          if (self.config.hasBillManage) {
-            // 启用发票管理，获取票据管理中的票号并存储记录
-            self.data.id = res.data
-            self.data.f_bill_type = '机表收费'
-            self.data.f_bill_style = self.data.f_print[0]
-            self.print = true
-          } else {
-            // 如果不欠费就用下边的预存收据
-            if (self.$parent.$children[0].selecteds) {
-              console.log('1111111', self.$parent.$children[0].selecteds)
-              if (self.$parent.$children[0].selectedRows === 0) {
-                console.log('22222222', self.$parent.$children[0].selectedRows)
-                self.billData.url = 'rs/report/pre_sell'
-              }
-              // 获取选中的handplan的id
-              self.data.handid = ''
-              self.$parent.$children[0].selecteds.forEach((row, index) => {
-                self.data.handid = self.data.handid + "','" + row.handplan_id
-              })
-            } else {
-              console.log('3333333')
+        }
+        if (self.config.hasBillManage) {
+          // 启用发票管理，获取票据管理中的票号并存储记录
+          self.data.id = res.data
+          self.data.f_bill_type = '机表收费'
+          self.data.f_bill_style = self.data.f_print[0]
+          self.print = true
+        } else {
+          // 如果不欠费就用下边的预存收据
+          if (self.$parent.$children[0].selecteds) {
+            console.log('1111111', self.$parent.$children[0].selecteds)
+            if (self.$parent.$children[0].selectedRows === 0) {
+              console.log('22222222', self.$parent.$children[0].selectedRows)
               self.billData.url = 'rs/report/pre_sell'
-              self.data.handid = ''
             }
-            self.data.id = res.data
-            self.print = true
+            // 获取选中的handplan的id
+            self.data.handid = ''
+            self.$parent.$children[0].selecteds.forEach((row, index) => {
+              self.data.handid = self.data.handid + "','" + row.handplan_id
+            })
+          } else {
+            console.log('3333333')
+            self.billData.url = 'rs/report/pre_sell'
+            self.data.handid = ''
           }
-        } else if (self.data.f_print[0] === '国税发票') {
-          // TODO
-        } else if (self.printInvoiceType.indexOf(self.data.f_print[0]) !== -1) {
+          self.data.id = res.data
+          self.print = true
+        }
+        // }
+        if (self.printInvoiceType.indexOf(self.data.f_print[0]) !== -1) {
           self.eticket_show = true
           self.row.f_print = self.data.f_print[0]
-          await self.$refs.eticketbill.openETicket(res.data, self.row, '机表收费')
+          await self.$refs.eticketbill.openETicket(res.data, self.row, '机表收费', self.row.f_print, false, self.row.invoice_is_pax)
           // await self.$CommonService.openEticket(res.data, '售气收费')
           // 如果不欠费就用下边的预存收据
           // if (self.$parent.$children[0].selecteds) {
@@ -588,7 +587,8 @@ let asyncMachineMeterCenter = async function (self) {
       },
       eticket_toggle () {
         this.eticket_show = false
-        this.$dispatch('success')
+        this.eticket_msg = false
+        // this.$dispatch('success')
       },
       // 优惠计算
       async privilegeCalculate () {

package/src/filiale/yangchun/NoCardMeterCenter.vue

@@ -0,0 +1,528 @@
+<template>
+  <div class="flex-row">
+    <div class="span" style="overflow-y: auto;">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <div class="row">
+            <div class="col-sm-4">
+              <label for="f_paytype" class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
+              <v-select id="f_payment"
+                        v-model="f_payment"
+                        placeholder='请选择'
+                        :value.sync="model.f_payment"
+                        :options='paytype'
+                        close-on-select clear-button></v-select>
+            </div>
+            <div class="col-sm-4"
+                 :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
+              <label for="f_pregas" class=" font_normal_body">预购气量</label>
+              <input class="input_search" style="width:60%" type="number"
+                     @blur="pregas()" v-model="model.f_pregas" id="fpregas"
+                     v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
+                     v-next-el='sk'>
+            </div>
+            <div class="col-sm-4">
+              <label for="f_preamount" class=" font_normal_body">预购金额</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+                     v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ] }'
+                     v-scale="[model.f_preamount, 4]" placeholder="预购金额" disabled>
+            </div>
+          </div>
+          <div class="row" style="margin-top:6px;">
+
+            <div class="col-sm-4">
+              <label for="f_print" class="font_normal_body">打印格式</label>
+              <v-select id="print"
+                        v-model="f_print"
+                        placeholder='请选择'
+                        :multiple="mulPrint"
+                        :value.sync="model.f_print"
+                        :options='printstyle'
+                        close-on-select clear-button></v-select>
+            </div>
+            <div class="col-sm-4" v-if="hasLimit&&limitgas">
+              <label class="font_normal_body">购气上限</label>
+              <input class="input_search" style="width:60%" type="number" v-model="maxgas"
+                     v-scale="[maxgas, 2]" placeholder='限购余气' disabled>
+            </div>
+            <div class="col-sm-4 form-group" v-if="hasLimit&&limitmoney">
+              <label class="font_normal_body">金额上限</label>
+              <input class="input_search" style="width:60%" type="number" v-model="maxmoney"
+                     v-scale="[maxmoney, 2]" placeholder='限购金额' disabled>
+            </div>
+            <div class="col-sm-4" v-if="!hasLimit">
+            </div>
+
+            <div class="col-sm-4"
+                 :class="[$v.f_totalcost.required || $v.f_totalcost.dctest ? 'has-error' : 'has-success']">
+              <label for="f_temp_amount" v-if="row.f_collection_type === '按气量'"
+                     class=" font_normal_body">应收金额</label>
+              <label for="f_temp_amount" v-if="row.f_collection_type === '按金额'"
+                     class=" font_normal_body">本次缴费</label>
+              <input class="input_search" style="width:60%" type="number"
+                     @blur="preamount()" v-model="model.f_totalcost"
+                     v-validate:f_totalcost='{required: true, dctest: [0, ">=" ] }' placeholder="应收金额"
+                     v-next-el='sk' v-scale="[model.f_totalcost, 4]">
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-4">
+              <label for="f_balance" class="font_normal_body">上期结余</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_balance"
+                     v-scale="[model.f_balance, 4]" placeholder="上期结余" disabled>
+            </div>
+            <div class="col-sm-4">
+              <label for="f_curbalance" class="font_normal_body">本期结余</label>
+              <input class="input_search" style="width:60%" type="number" v-model="curbalance"
+                     v-scale="[model.f_curbalance, 4]" placeholder="本期结余" disabled>
+            </div>
+
+            <div class="col-sm-4" v-if="row.f_collection_type === '按气量'"
+                 :class="[$v.f_collection.required ? 'has-error' : 'has-success']">
+              <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     v-validate:f_collection='{required: true, dctest: [model.f_totalcost, ">=" ] }'
+                     v-el:sk v-scale="[model.f_totalcost, 2]">
+            </div>
+            <div class="col-sm-4" v-if="row.f_collection_type === '按金额'">
+              <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     v-el:sk v-scale="[model.f_collection, 4]" disabled>
+            </div>
+          </div>
+          <div class="row" style="margin-top:5px;">
+            <div class="col-sm-4" v-if="!mjshow">
+              <label for="f_serial_number" class=" font_normal_body">业务单号</label>
+              <input class="input_search" style="width:60%" type="text"
+                     v-model="model.f_serial_number" placeholder="业务单号">
+            </div>
+            <div class="col-sm-4" v-if="mjshow"
+                 :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+              <label for="f_serial_number" class=" font_normal_body">业务单号</label>
+              <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
+                     v-model="model.f_serial_number" placeholder="业务单号">
+            </div>
+            <div class="col-sm-4">
+              <label for="f_write_card" style="color: red" class=" font_normal_body">是否写卡</label>
+              <v-select id="f_write_card"
+                        v-model="model.f_write_card"
+                        placeholder='是否写卡'
+                        value-single
+                        :value.sync="model.f_write_card"
+                        :options='writecard'
+                        close-on-select clear-button></v-select>
+            </div>
+          </div>
+          <div class="row" style="margin-top:5px;">
+            <div class="col-sm-9">
+            </div>
+            <div class="col-sm-3">
+              <span v-if="$v.f_collection.dctest" style="color:red ">收款不能小于应收金额</span>
+            </div>
+          </div>
+          <div class="row" v-if="model.f_payment[0].includes('POS')">
+            <div class="col-sm-4">
+              <label for="f_voucher_number" class="font_normal_body">凭证号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_voucher_number"
+                     placeholder="凭证号">
+            </div>
+          </div>
+          <div class="row" v-if="!config.notShowFormula">
+            <div class="col-sm-4 col-sm-offset-8">
+              <strong>计算公式:{{ calculatedetail ? calculatedetail : ' 暂无' }}</strong>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-5" v-if="row.f_collection_type === '按气量'">
+              <strong style="color:blue">温馨提示: 此气表品牌是按气量收费!!</strong>
+            </div>
+            <div class="col-sm-4" v-if="row.f_collection_type === '按金额'">
+              <strong style="color:blue">温馨提示: 此气表品牌是按金额收费!!</strong>
+            </div>
+          </div>
+        </form>
+        <print-bill :show="print" :bill-config='config' v-ref:printbill :bill-data='billData' :data='row'
+                    v-on:toggle="close" @printok="printok"></print-bill>
+        <div style="text-align:right;height: 25%;">
+          <payment-code-button :clickable="!$v.valid || clickConfirm"
+                               :payment.sync="model.f_payment" :payment-data="paytype"
+                               @confirm-payment="confirm()">
+          </payment-code-button>
+          <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled='!$v.valid || clickConfirm'>确认</button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
+      </validator>
+      <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
+      <eticket-modal :show="eticket_msg" @closemodalshow="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" :businessid="randomBusinessId" isremark="true"
+              fusetype="无卡收费"></upload>
+    </div>
+  </div>
+</template>
+<script>
+/**
+ *综合业务
+ *卡表收费组件
+ */
+
+  // 输入金额，换算气量
+let preamountGen = async function (self) {
+  let dymoney = 0
+  let calFee = (self.model.f_totalcost - 0) + (self.row.f_balance - 0)
+  let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
+  if (getGas.data.gas) {
+    if (self.row.f_isdecimal === '是') {
+      if (self.row.f_alias === 'QiaoSong') {
+        self.model.f_pregas = (getGas.data.gas - 0).toFixed(1)
+      } else {
+        self.model.f_pregas = (getGas.data.gas - 0).toFixed(4)
+      }
+    } else {
+      let tempnum = Math.floor(getGas.data.gas - 0)
+      let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
+      dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
+      self.model.f_pregas = Math.floor(getGas.data.gas - 0)
+    }
+  }
+  self.model.f_preamount = calFee - (dymoney - 0)
+  self.model.chargeprice = getGas.data.chargeprice
+  Object.assign(self.model, self.model, getGas.data)
+  self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(4)
+    // 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.calText(getGas.data.chargeprice)
+}
+
+// 输入气量，换算金额
+let pregasGen = async function (self) {
+  if (self.row.f_isdecimal === '是') {
+    self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
+  } else {
+    self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
+  }
+  if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
+    self.model.f_meter_type = self.row.f_meter_type
+    let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
+    self.model.f_preamount = getAmount.data.chargenum
+    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
+    self.model.f_collection = self.model.f_totalcost
+    if (self.config.floor) {
+      self.model.f_collection = Math.ceil(self.model.f_collection)
+    }
+    self.calText(getAmount.data.chargeprice)
+  }
+}
+
+// 执行保存逻辑
+let sellgasGen = async function (self) {
+  try {
+    self.model.f_write_money = self.model.f_preamount
+    if (self.row.f_price_type === '阶梯气价' && self.row.f_is_step === '否') {
+      self.model.f_write_money = (self.model.f_pregas * self.model.chargeprice[0].f_price)
+      self.model.f_write_money = self.model.f_write_money.toFixed(2)
+    }
+    // 加入扫码盒付款码支付流水号
+    self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+
+    let res = await self.$CardService.noCardSellGas(self.model, self.row, self.cardallot)
+    console.log('卡表收费返回id', res, self.model)
+    if (self.config.showupload) {
+      let param = []
+      for (let row of self.resid) {
+        param.push({id: row.id})
+      }
+      let data = {
+        param: param,
+        f_blobid: res
+      }
+      await self.$resetpost('rs/logic/updatefiles', data)
+    }
+    // 开始打票
+    if (self.config.hasPrint) {
+      if (self.config.hasBillManage) {
+        // 启用发票管理，获取票据管理中的票号并存储记录
+        self.row.id = res
+        self.row.f_bill_type = '卡表收费'
+        self.row.f_bill_style = self.model.f_print[0]
+        self.row.f_preamount = self.model.f_preamount
+        self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+        self.row.f_collection = self.model.f_collection
+        self.print = true
+      } else {
+        self.row.id = res
+        self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+        self.print = true
+      }
+      console.log('发票类型：', self.model.f_print[0])
+      if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
+        self.eticket_show = true
+        self.row.f_print = self.model.f_print[0]
+        await self.$refs.eticketbill.openETicket(self.row.id, self.row, '售气收费', self.row.f_print, false, self.row.invoice_is_pax)
+        self.row.id = res
+        self.print = true
+      }
+    } else {
+      self.$dispatch('success')
+    }
+    self.clickConfirm = false
+  } catch (error) {
+    self.$showAlert(error, 'danger', 0)
+    self.$dispatch('refresh')
+    self.clickConfirm = false
+  }
+}
+
+let asyncCardMeterCenter = async function (self) {
+  await self.$getConfig(self, 'CardMeterCenter')
+  console.log('卡表收费config', self.config)
+  // 默认打印格式
+  self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+  self.model.f_payment = [self.config.payment]
+  self.mulPrint = self.config.printType instanceof Array
+  // 判断限购
+  let limit_param = {
+    f_userinfo_id: self.row.f_userinfo_id,
+    f_user_id: self.row.f_user_id,
+    f_stairprice_id: self.row.f_stairprice_id
+  }
+  let getLimit = await self.$resetpost('rs/logic/sale_getLimitGas', {data: limit_param}, {
+    resolveMsg: null,
+    rejectMsg: '获取限购值失败！！'
+  })
+  console.log('获取限购值', getLimit)
+  self.hasLimit = getLimit.data.hasLimit
+  if (self.hasLimit) {
+    if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
+      if (getLimit.data.f_limit_value < 0 && getLimit.data.f_limit_amount < 0) {
+        self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
+        self.$dispatch('refresh')
+      } else {
+        if (getLimit.data.f_limit_value) {
+          self.maxgas = (getLimit.data.f_limit_value - 0)
+          self.limitgas = true
+        }
+        if (getLimit.data.f_limit_amount) {
+          self.maxmoney = (getLimit.data.f_limit_amount - 0)
+          self.limitmoney = true
+        }
+      }
+    }
+  }
+}
+export default {
+  title: '无卡收费',
+  data () {
+    return {
+      serialShow: false,
+      resid: [],  // 存放新增的f_files表中id
+      config: {
+        notShowFormula: false, // 不显示计算公式,默认显示
+        hasPrint: true,  // 默认打票
+        hasBillManage: false,  // 默认不启用发票管理
+        floor: false,  // 是否取整收费
+        billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
+        printType: '普通收据', // 收据/电子票/专用发票/国税发票
+        showupload: true,
+        payment: '现金缴费'
+      },
+      model: {
+        f_purchase: 0,
+        f_write_card: '不写卡',
+        f_payment: '',
+        f_pregas: '',
+        f_preamount: 0,
+        f_totalcost: 0,
+        f_curbalance: 0,
+        f_collection: '',
+        f_balance: 0,
+        f_print: [],
+        f_meter_type: '',
+        f_voucher_number: ''
+      },
+      calculatedetail: '',
+      print: false,
+      billData: {
+        url: 'rs/report/card_bill',
+        billnumber: ''
+      },
+      randomBusinessId: '',
+      hasLimit: false,
+      maxgas: 99999999, // 限购
+      maxmoney: 99999999,
+      limitmoney: false,
+      limitgas: false,
+      mulPrint: false,
+      clickConfirm: false, // 控制确认按钮只能点击一次
+      // 下拉框值
+      paytype: this.$appdata.getParam('付款方式'),
+      printstyle: this.$appdata.getParam('打印格式'),
+      writecard: [{label: '写卡', value: '写卡'}, {label: '不写卡', value: '不写卡'}],
+      mjshow: false,
+      eticket_msg: false,
+      eticket_show: false,
+      invoice_is_pax: '不征税',
+      is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
+      printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '数电普票',
+    }
+  },
+  props: ['row'],
+  ready () {
+    // this.getPurchase()
+    this.model.f_price_id = this.row.f_price_id
+    this.model.f_user_id = this.row.f_user_id
+    this.model.f_userfiles_id = this.row.f_userfiles_id
+    this.model.f_userinfo_id = this.row.f_userinfo_id
+    this.model.f_balance = this.row.f_alias === 'QiaoSong' ? Math.trunc(this.row.f_balance) : this.row.f_balance
+    if (this.row.f_collection_type === '按金额') {
+      this.model.f_totalcost = ''
+      this.model.f_pregas = 0
+    }
+    document.getElementById('fpregas').focus()
+    asyncCardMeterCenter(this)
+    this.getRandomId()
+  },
+  events: {
+    // 删除Resid数组元素
+    'delResid' (val) {
+      this.resid.$remove({id: val, f_biobid: ''})
+      // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+    },
+    // 增加Resid数组元素
+    'resid' (val) {
+      this.resid.push({id: val, f_biobid: ''})
+    }
+  },
+  methods: {
+    getRandomId () {
+      this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        let res = Math.random() * 16 | 0
+        let v = c === 'x' ? res : (res & 0x3 | 0x8)
+        return v.toString(16)
+      })
+    },
+    eticket_toggle () {
+      this.eticket_show = false
+      this.eticket_msg = false
+      // this.$dispatch('success', '售气收费')
+    },
+    checkInvoiceMsg (flag) {
+      if (flag) return
+      if (this.printInvoiceType.indexOf(this.model.f_print[0]) !== -1) {
+        if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
+          this.row.f_taxpayer_id = this.row.f_idnumber
+        }
+        if (!this.row.f_paper_name) {
+          this.row.f_paper_name = this.row.f_user_name
+        }
+        if (!this.row.f_address_phone) {
+          this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+        }
+        this.eticket_msg = true
+      } else {
+        this.confirm()
+      }
+    },
+    confirm () {
+      this.$showMessage(`对客户${this.row.f_user_name}进行收费。该操作只做收费，不做写卡，确定要进行该操作吗？`, ['confirm', 'cancel']).then(async (res) => {
+        if (res === 'confirm') {
+          let ss = await this.$refs.paymentcode.flowPath()
+          this.$refs.paymentcode.paymentCodeShow = false
+          console.log('付款码操作返回', ss)
+          if (!ss.result) return
+          this.clickConfirm = true
+          this.model.f_curbalance = this.curbalance
+          this.$dispatch('no-button')
+          sellgasGen(this)
+        }
+      })
+    },
+    clean () {
+      this.$info('取消操作')
+      this.$dispatch('refresh', this.row)
+    },
+    printok () {
+      // 收据打完，判断是否还有其他票据进行请求
+      for (let i = 0; i < this.model.f_print.length; i++) {
+        if (this.model.f_print[i] === '电子发票') {
+          // this.$CommonService.openEticket(this.row.id, '售气收费')
+          console.log('这里不打发票，换到新的了')
+        }
+      }
+      this.$dispatch('success')
+    },
+    pregas () {
+      if (this.model.f_pregas && this.model.f_pregas > 0) {
+        try {
+          // 对气量进行验证
+          if ((this.row.f_topup_ceil - 0) > 0 && (this.model.f_pregas - 0) > (this.row.f_topup_ceil - 0)) {
+            this.$showAlert(`您输入的气量不能大于该表的充值上限: ${this.row.f_topup_ceil}`, 'warning', 5000)
+            this.model.f_pregas = null
+          } else {
+            pregasGen(this)
+          }
+        } catch (error) {
+          this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+          this.$dispatch('error', '发卡售气', this.model, error)
+        }
+      }
+    },
+    preamount () {
+      if ((this.model.f_totalcost && this.model.f_totalcost > 0) || this.row.f_balance > 0) {
+        try {
+          preamountGen(this)
+        } catch (error) {
+          this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+          this.$dispatch('error', '发卡售气', this.model, error)
+        }
+      }
+    },
+    calText (val) {
+      let str = ''
+      val.forEach((item) => {
+        str = str + item.f_price + ' x ' + item.f_gas + '+'
+      })
+      str = str.slice(0, str.length - 1)
+      this.calculatedetail = str
+    },
+    close () {
+      this.print = false
+      this.clean()
+    }
+  },
+  watch: {
+    'model.f_payment' (val) {
+      if (val == '免交') {
+        this.mjshow = true
+      } else {
+        this.mjshow = false
+      }
+    }
+  },
+  computed: {
+    'curbalance' () {
+      if (this.model.f_preamount) {
+        if (this.row.f_collection_type === '按金额') {
+          return ((this.model.f_totalcost - 0) + (this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
+        } else {
+          if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
+            return ((this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
+          } else {
+            return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+          }
+        }
+      } else {
+        return 0
+      }
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/filiale/yangchun/OtherChargeNew.vue

@@ -252,24 +252,22 @@ let otherChargeGen = async function (self, parameter) {
       localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)
       window.localStorage.setItem('sustainMoney', localeSustainMoney)
     }
+    console.warn('电子票打印类型：', self.printInvoiceType)
     if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
-      if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
-        if (self.config.hasBillManage) {
-          self.row.id = resid.data
-          self.row.f_bill_type = '其他收费'
-          self.row.f_bill_style = self.model.f_print[0]
-          self.print = true
-        } else {
-          self.row.id = resid.data
-          self.print = true
-        }
-      } else if (self.model.f_print[0] === '国税发票') {
-        // TODO
-        self.$dispatch('success')
-      } else if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
+      // if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
+      if (self.config.hasBillManage) {
+        self.row.id = resid.dataeticket_toggle
+        self.row.f_bill_type = '其他收费'
+        self.row.f_bill_style = self.model.f_print[0]
+        self.print = true
+      } else {
+        self.row.id = resid.data
+        self.print = true
+      }
+      if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
         self.eticket_show = true
         self.row.f_print = self.model.f_print[0]
-        await self.$refs.eticketbill.openETicket(resid.data, self.row, '其他收费', '其他收费', '其他收费', self.model.f_print[0])
+        await self.$refs.eticketbill.openETicket(resid.data, self.row, '其他收费', self.row.f_print, false, self.row.invoice_is_pax)
       }
     } else {
       self.$dispatch('success')
@@ -480,6 +478,7 @@ export default {
     },
     // 校验发票信息
     checkInvoiceMsg () {
+      console.log('检验发票信息', this.printInvoiceType, this.model.f_print[0])
       if (this.printInvoiceType.indexOf(this.model.f_print[0]) !== -1) {
         if (!this.row.f_taxpayer_id) {
           this.row.f_taxpayer_id = this.row.f_idnumber
@@ -500,7 +499,8 @@ export default {
     },
     eticket_toggle () {
       this.eticket_show = false
-      this.$dispatch('success')
+      this.eticket_msg = false
+      // this.$dispatch('success')
     },
     async setTypename (val, index) {
       this.model.otherdetail[index].f_typenumber = ''

package/src/filiale/yangchun/machineHandAudit.vue

@@ -91,7 +91,7 @@
                           style="width: 60%"
                           multiple="true"
                           :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                          close-on-select v-el:cc>
+                           v-el:cc>
                 </v-select>
               </div>
               <div class="col-sm-2 form-group">
@@ -125,7 +125,7 @@
                           style="width:60%"
                           multiple="true"
                           :options='$parent.$parent.inputtores' placeholder='抄表员'
-                          close-on-select
+
                           v-el:cc></v-select>
               </div>
 

package/src/filiale/yangchun/sale.js

@@ -23,6 +23,8 @@ export default function () {
   Vue.component('file-meter-info', (resolve) => { require(['./MeterinfoTest'], resolve) })
   // 机表收费
   Vue.component('machine-meter-center', (resolve) => { require(['./MachineMeterCenter'], resolve) })
+  // 无卡收费
+  Vue.component('no-card-meter-center', (resolve) => { require(['./NoCardMeterCenter'], resolve) })
   // 卡表收费
   Vue.component('card-meter-center', (resolve) => {
     require(['./CardMeterCenter'], resolve)

package/src/plugins/LogicService.js

@@ -278,7 +278,7 @@ let LogicService = {
     return Vue.resetpost('rs/logic/messageBatchOperate', data, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})
   },
   createCustomMessage (data) {
-    return Vue.resetpost('rs/customMessage/send', {data: data}, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})
+    return Vue.resetpost('rs/customMessage/send', {data: data}, {resolveMsg: null, rejectMsg: null})
   },
   createMessageNew (data) {
     return Vue.resetpost('rs/logic/messageBatchOperateNew', data, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})