sale-client 3.6.194 → 3.6.195

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

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

@@ -362,7 +362,7 @@
       console.log(self.config, self.config.hasPrint && !self.$login.r.includes('不打印发票'))
       // 开始打票
       if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
-        if (self.model.f_print.indexOf('电子发票') == -1) {
+        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'
@@ -384,9 +384,10 @@
             self.print = true
           }
         } else {
-          if (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, '卡表收费')
             // await self.$CommonService.openEticket(res, '售气收费')
@@ -567,6 +568,7 @@
         // 下拉框值
         paytype: [],
         printstyle: this.$appdata.getParam('打印格式'),
+        printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
         privilegeList: [{label: '无优惠', value: '0'}],
         BankTransfer: false,
         // 小数是否支持,导致划价产生的多余气量,金额
@@ -700,7 +702,7 @@
         // 收款回车时, 如果确认按钮是灰色不进行任何操作
         if (flag) return
         console.log(this.model.f_print[0])
-        if (this.model.f_print[0] === '电子发票') {
+        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
           }

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

@@ -338,11 +338,10 @@
         }
         await self.$resetpost('rs/logic/updatefiles', data)
       }
-      console.log('物联网收费返回。。。', res.data.id)
       // 开始打票
       console.log('开始打票', self.config)
       if (self.config.hasPrint) {
-        if (self.model.f_print.indexOf('电子发票') == -1) {
+        if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
           console.log('self.config.hasBillManage', self.config.hasBillManage)
           if (self.$login.r.includes('非民用纸质票据拆分')) {
             if (self.row.f_user_type === '非民用') {
@@ -361,8 +360,9 @@
           }
         } else if (self.config.printType === '国税发票') {
           // TODO
-        } else if (self.model.f_print[0] === '电子发票') {
+        } else 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(res.data.id, self.row, '物联网收费')
           // self.$CommonService.openEticket(res.data.id, '其他收费')
           // self.$dispatch('success')
@@ -529,6 +529,7 @@
         // 下拉框值
         paytype: this.$appdata.getParam('付款方式'),
         printstyle: this.$appdata.getParam('打印格式'),
+        printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
         privilegeList: [{label: '无优惠', value: '0'}],
         showfiles: false,
         serialShow: false,
@@ -668,8 +669,7 @@
             }
             this.model.f_sys_balance = curSysBalance
           }
-
-          if (this.model.f_print[0] === '电子发票') {
+          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
             }

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

@@ -258,7 +258,7 @@ let otherChargeGen = async function (self, parameter) {
     //   })
     // }
     if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
-      if (self.model.f_print[0] != '电子发票') {
+      if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
         if (self.config.hasBillManage) {
           self.row.id = resid.data
           self.row.f_bill_type = '其他收费'
@@ -271,8 +271,9 @@ let otherChargeGen = async function (self, parameter) {
       } else if (self.model.f_print[0] === '国税发票') {
         // TODO
         self.$dispatch('success')
-      } else if (self.model.f_print[0] === '电子发票') {
+      } else 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.$CommonService.openEticket(resid.data, '其他收费')
         // self.$dispatch('success')
@@ -355,6 +356,7 @@ export default {
       typenumberList: [],
       brandspec: this.$appdata.getParam('品名及规格'),
       brandType: this.$appdata.getSingleValue('其他收费类型') ? this.$appdata.getSingleValue('其他收费类型') : '收费类型',
+      printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
       printstyle: this.$appdata.getParam('打印格式'),
       paytype: this.$appdata.getParam('付款方式'),
       feetype: this.$appdata.getParam('其他费用'),
@@ -475,7 +477,7 @@ export default {
     },
     // 校验发票信息
     checkInvoiceMsg () {
-      if (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
         }

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

@@ -225,7 +225,7 @@ let asyncMachineMeterCenter = async function (self) {
 
       // 开始打票
       if (self.config.hasPrint) {
-        if (self.data.f_print.indexOf('电子发票') == -1) {
+        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'
@@ -260,8 +260,9 @@ let asyncMachineMeterCenter = async function (self) {
           }
         } else if (self.data.f_print[0] === '国税发票') {
           // TODO
-        } else if (self.data.f_print[0] === '电子发票') {
+        } else 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.$CommonService.openEticket(res.data, '售气收费')
           // 如果不欠费就用下边的预存收据
@@ -339,6 +340,7 @@ let asyncMachineMeterCenter = async function (self) {
         editOverdue: this.$login.r.includes('违约金修改'),
         paytype: [],
         printstyle: this.$appdata.getParam('打印格式') ? this.$appdata.getParam('打印格式') : [],
+        printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
         privilegeList: [{label: '无优惠', value: '0'}],
         // 在向下取整时,保存所有的应交金额
         totalcost: 0,
@@ -387,7 +389,7 @@ let asyncMachineMeterCenter = async function (self) {
       },
       // 校验发票信息
       checkInvoiceMsg () {
-        if (this.data.f_print[0] === '电子发票') {
+        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
           }

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

@@ -73,6 +73,7 @@ export default {
         let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign({
           id,
           f_charge_type,
+          bill_type: model.f_print ? model.f_print : null,
           f_paper_name: model.f_paper_name,
           f_taxpayer_id: model.f_taxpayer_id,
           f_address_phone: model.f_address_phone,

package/src/components/revenue/comprehen/Bill/EticketV4/CustQueryEticket.vue

@@ -131,6 +131,17 @@
                       :options='is_pax' clear-button>
             </v-select>
           </div>
+          <div class="col-sm-6 form-group form-input-group">
+            <label for="f_print" class="font_normal_body">打印格式</label>
+            <v-select id="print"
+                      v-model="f_print"
+                      placeholder='请选择'
+                      :multiple="false"
+                      :value.sync="row.f_print"
+                      :options='printstyle'
+                      close-on-select clear-button v-ref:printstyle>
+            </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"
@@ -190,6 +201,7 @@
         show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
         row: {},
         disabled: false,
+        printstyle: this.$appdata.getParam('打印电子格式') ? this.$appdata.getParam('打印电子格式') : [{label: '电子发票', value: '电子发票'}],
         mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}]
       }
     },
@@ -266,6 +278,7 @@
         this.eticket_msg = true
       },
       confirm () {
+        this.row.f_print = this.row.f_print[0]
         this.eticket_msg = false
         this.disabled = false
         this.eticket_show = true

package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue

@@ -178,7 +178,7 @@
             <th style="text-align:center">{{ row.f_collection }}</th>
             <th style="text-align:center">{{ row.f_total_money }}</th>
             <th style="text-align:center">{{ row.f_tax_money }}</th>
-            <th style="text-align:center">{{ row.f_invoice_type }}</th>
+            <th style="text-align:center">{{ row.f_invoice_type === '0' ? '蓝票' : '红票'}}</th>
             <th style="text-align:center">{{ row.f_bill_code }}</th>
             <th style="text-align:center">{{ row.f_fpqqlsh }}</th>
             <th style="text-align:center">{{ row.f_bill_number }}</th>
@@ -196,7 +196,7 @@
             </th>
             <th style="text-align:center">
               <template v-if="row.f_invoice_source !== '外部录入'">
-                <button class="btn btn-link" v-if="row.f_bill_state==='开票成功'"
+                <button class="btn btn-link" v-if="row.f_bill_state==='开票成功' && row.f_invoice_type === '0'"
                         @click="$parent.$parent.$parent.fp_ch(row)">发票冲红
                 </button>
                 <button class="btn btn-link" v-if="row.f_bill_state==='待开票'"

package/src/components/revenue/comprehen/ComprehenOperation/OverCharge/OverUseCharge.vue

@@ -125,11 +125,13 @@
                              :payment.sync="model.f_payment" :payment-data="paytype"
                              @confirm-payment="confirm()">
         </payment-code-button>
-        <button class="button_search" @click="confirm()"  :disabled='!$v.valid || validateOk'>确认</button>
+        <button class="button_search" @click="checkInvoiceMsg()"  :disabled='!$v.valid || validateOk'>确认</button>
         <button class="button_clear" @click="clean()" >取消</button>
       </div>
     </validator>
   </div>
+  <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>
   <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
   <upload :blodid="blodid" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="超用收费"></upload>
 </template>
@@ -234,7 +236,7 @@ let overChargeGen = async function (self) {
       await self.$resetpost('rs/logic/updatefiles', data)
     }
     if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
-      if (self.model.f_print.indexOf('电子发票') == -1) {
+      if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
         if (self.config.hasBillManage) {
           // 启用发票管理，获取票据管理中的票号并存储记录
           self.row.id = res.data
@@ -246,9 +248,12 @@ let overChargeGen = async function (self) {
           self.print = true
         }
       } else {
-        if (self.model.f_print[0] === '电子发票') {
-          self.$CommonService.openEticket(res.data, '超用收费')
-          self.$dispatch('success')
+        if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
+          // self.$CommonService.openEticket(res.data, '超用收费')
+          self.row.id = res.data
+          self.eticket_show = true
+          self.row.f_print = self.model.f_print[0]
+          await self.$refs.eticketbill.openETicket(res.data, self.row, '超用收费')
         }
       }
     } else {
@@ -316,9 +321,11 @@ export default {
         bill: ''
       },
       print: false,
-
+      eticket_msg: false,
+      eticket_show: false,
       mulPrint: false,
       paytype: this.$appdata.getParam('付款方式'),
+      printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
       printstyle: this.$appdata.getParam('打印格式'),
       mjshow: false
     }
@@ -365,6 +372,44 @@ export default {
         }
       })
     },
+    // 校验发票信息
+    checkInvoiceMsg (flag) {
+      // 校验是否超出最大透支余额
+      // if (this.model.f_payment == '系统余额透支') {
+      //   const maxOverdraftBalance = -(this.$appdata.getSingleValue('最大透支余额') - 0)
+      //   const curSysBalance = (this.row.f_sys_balance - 0) - (this.model.f_totalcost - 0)
+      //   if (curSysBalance < maxOverdraftBalance) {
+      //     this.$showAlert('您的系统余额将超出最大透支余额，请使用别的付款方式！', 'danger', 5000)
+      //     return
+      //   }
+      //   this.model.f_sys_balance = curSysBalance
+      // }
+
+      // 收款回车时, 如果确认按钮是灰色不进行任何操作
+      if (flag) return
+      console.log(this.model.f_print[0])
+      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
+        }
+        if (!this.row.f_email) {
+          this.row.f_email = this.row.f_email
+        }
+        this.eticket_msg = true
+      } else {
+        this.confirm()
+      }
+    },
+    eticket_toggle () {
+      this.eticket_show = false
+      this.$dispatch('success', '超用收费')
+    },
     clean () {
       this.$dispatch('refresh')
     },

package/src/filiale/alashan/business/CardMeterCenter.vue

@@ -340,7 +340,7 @@
       console.log(self.config, self.config.hasPrint && !self.$login.r.includes('不打印发票'))
       // 开始打票
       if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
-        if (self.model.f_print.indexOf('电子发票') == -1) {
+        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'
@@ -357,11 +357,13 @@
             self.print = true
           }
         } else {
-          if (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.invoice_is_pax, '卡表收费')
+            // await self.$refs.eticketbill.openETicket([res], self.row, '是', self.invoice_is_pax, '卡表收费')
+            await self.$refs.eticketbill.openETicket(res, self.row, '卡表收费')
             // await self.$CommonService.openEticket(res, '售气收费')
             // self.print = true
           }
@@ -537,6 +539,7 @@
         // 下拉框值
         paytype: [],
         printstyle: this.$appdata.getParam('打印格式'),
+        printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
         privilegeList: [{label: '无优惠', value: '0'}],
         BankTransfer: false,
         // 小数是否支持,导致划价产生的多余气量,金额
@@ -641,7 +644,7 @@
         // 收款回车时, 如果确认按钮是灰色不进行任何操作
         if (flag) return
         console.log(this.model.f_print[0])
-        if (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
           }

package/src/main.js

@@ -4,7 +4,7 @@ import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
 // import wenxi from './filiale/rizhao/sale'
-import FilialeSale from './filiale/liaoyuan/sale'
+import FilialeSale from './filiale/wenxi/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'