sale-client 3.6.60 → 3.6.62

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['https://qnjtkf.cn:8400/', 'https://qnjtkf.cn:8400/']
+const [localUrl, serverRul] = [ 'http://127.0.0.1:8080/', 'http://140.249.18.101: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.60",
+  "version": "3.6.62",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

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

@@ -510,6 +510,7 @@
           showupload: true, // 显示上传
           hasPrint: true,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
+          taxforidnumber: true,  // 身份证号同步到纳税人识别号
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
           payment: '',
@@ -687,7 +688,7 @@
         if (flag) return
         console.log(this.model.f_print[0])
         if (this.model.f_print[0] === '电子发票') {
-          if (!this.row.f_taxpayer_id) {
+          if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
             this.row.f_taxpayer_id = this.row.f_idnumber
           }
           if (!this.row.f_paper_name) {

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

@@ -439,6 +439,7 @@
           priceCalculation: false, // 划气量控制
           showupload: true,  // 默认显示附件上传组件
           hasPrint: false,  // 默认打票
+          taxforidnumber: true,  // 身份证号同步到纳税人识别号
           floor: true,  // 是否取整收费
           hasBillManage: false,  // 默认不启用发票管理
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
@@ -592,7 +593,7 @@
         }
 
         if (this.model.f_print[0] === '电子发票') {
-          if (!this.row.f_taxpayer_id) {
+          if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
             this.row.f_taxpayer_id = this.row.f_idnumber
           }
           if (!this.row.f_paper_name) {

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

@@ -299,6 +299,7 @@ let asyncMachineMeterCenter = async function (self) {
           hasPrint: true,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
           hasfindaReail: true,  // 默认开启找零功能
+          taxforidnumber: true,  // 身份证号同步到纳税人识别号
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
           payment: '现金缴费'
@@ -376,7 +377,7 @@ let asyncMachineMeterCenter = async function (self) {
       // 校验发票信息
       checkInvoiceMsg () {
         if (this.data.f_print[0] === '电子发票') {
-          if (!this.row.f_taxpayer_id) {
+          if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
             this.row.f_taxpayer_id = this.row.f_idnumber
           }
           if (!this.row.f_paper_name) {

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

@@ -216,9 +216,9 @@
         }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
         this.row = row.data[0]
         this.invoice_show_gas = this.row.f_collection_type = '按气量' ? '是' : '否'
-        if (!this.row.f_taxpayer_id) {
-          this.row.f_taxpayer_id = this.row.f_idnumber
-        }
+        // if (!this.row.f_taxpayer_id) {
+        //   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
         }

package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenCard.vue

@@ -160,6 +160,8 @@ let asyncReadyGen = async function (self) {
   self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString().substr(0, 5) + '01-01'
   self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardDateString()
   await self.search()
+  await self.$getConfig(self, 'CardMeterCenter')
+
 }
 export default {
   title: '发票管理',
@@ -179,6 +181,9 @@ export default {
         dep: [],
         user: []
       },
+      config: {
+        taxforidnumber: true
+      },
       eticket_show: false,
       selectAll: false,
       selecteds: [],
@@ -225,7 +230,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       this.row = row.data[0]
       this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
-      if (!this.row.f_taxpayer_id) {
+      if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
         this.row.f_taxpayer_id = this.row.f_idnumber
       }
       if (!this.row.f_paper_name) {

package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenJBPage.vue

@@ -160,6 +160,7 @@ let asyncReadyGen = async function (self) {
   self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString().substr(0, 5) + '01-01'
   self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardDateString()
   await self.search()
+  await self.$getConfig(self, 'MachineMeterCenter')
 }
 export default {
   title: '发票管理',
@@ -179,6 +180,9 @@ export default {
         dep: [],
         user: []
       },
+      config:{
+        taxforidnumber: true
+      },
       eticket_show: false,
       selectAll: false,
       selecteds: [],
@@ -226,7 +230,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       this.row = row.data[0]
       this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
-      if (!this.row.f_taxpayer_id) {
+      if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
         this.row.f_taxpayer_id = this.row.f_idnumber
       }
       if (!this.row.f_paper_name) {

package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenPage.vue

@@ -157,6 +157,7 @@
 import {HttpResetClass, PagedList} from 'vue-client'
 import * as Util from '../../../../../Util'
 let asyncReadyGen = async function (self) {
+  await self.$getConfig(self, 'IOTMeterCenter')
   self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString().substr(0, 5) + '01-01'
   self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardDateString()
   await self.search()
@@ -174,6 +175,9 @@ export default {
       footer: [],
       invoice_is_pax: '征税',
       is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
+      config: {
+        taxforidnumber: true
+      },
       initres: {
         org: [this.$login.f.orgid],
         dep: [],
@@ -214,7 +218,7 @@ export default {
         //
         //     }
         //   })
-        return this.$showAlert('已结算的记录不能再次结算开票','warning',3000)
+        return this.$showAlert('已结算的记录不能再次结算开票', 'warning', 3000)
       }
       let HttpReset = new HttpResetClass()
       let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
@@ -225,7 +229,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       this.row = row.data[0]
       this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
-      if (!this.row.f_taxpayer_id) {
+      if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
         this.row.f_taxpayer_id = this.row.f_idnumber
       }
       if (!this.row.f_paper_name) {
@@ -234,7 +238,7 @@ export default {
       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
@@ -242,7 +246,7 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas,this.invoice_is_pax, '结算收费')
+      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas, this.invoice_is_pax, '结算收费')
     },
     selfSearch (args) {
       this.selecteds = []

package/src/filiale/haile/handplanReplicationRate.vue

@@ -14,8 +14,7 @@
                               v-model="model.startDate"
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_input_date >= '{}'">
+                              :show-reset-button="true">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -24,8 +23,7 @@
                               v-model="model.endDate"
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_input_date <= '{}'">
+                              :show-reset-button="true">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -71,13 +69,16 @@
                   <nobr>小区名称</nobr>
                 </th>
                 <th>
-                  <nobr>抄表数</nobr>
+                  <nobr>应抄户数</nobr>
                 </th>
                 <th>
-                  <nobr>实抄表数</nobr>
+                  <nobr>未抄户数</nobr>
                 </th>
                 <th>
-                  <nobr>档案户数</nobr>
+                  <nobr>已抄无用量</nobr>
+                </th>
+                <th>
+                  <nobr>实抄户数</nobr>
                 </th>
                 <th>
                   <nobr>用气量</nobr>
@@ -95,13 +96,19 @@
                 <nobr>{{row.f_residential_area}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.handplannum}}</nobr>
+                <nobr>{{row.f_user_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_no_hand}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.ishandplan}}</nobr>
+                <nobr>{{row.f_no_hand}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.peoplenum}}</nobr>
+                <nobr>{{row.f_out_hand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_hand_num}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtamount}}</nobr>
@@ -158,9 +165,9 @@ export default {
       other: [],
       footer: [],
       data: {},
-      model: new PagedList('rs/sql/salehandplanRate', 20, {}, {
-         f_oughtamount: 0,
-         f_oughtfee: 0,
+      model: new PagedList('rs/sql/salehandplanRate', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
+        f_oughtamount: 0,
+        f_oughtfee: 0
       }),
       initres: {
         org: [this.$login.f.orgid],
@@ -181,13 +188,14 @@ export default {
         defaultPrint: [],
         excelHeaders: {
           'f_residential_area': '小区名称',
-          'handplannum': '抄表数',
-          'ishandplan': '实抄表数',
-          'peoplenum': '档案户数',
+          'f_user_number': '应抄户数',
+          'f_no_hand': '未抄户数',
+          'f_out_hand': '已抄无用量',
+          'f_hand_num': '实抄户数',
           'f_oughtamount': '用气量',
           'f_oughtfee': '用气金额',
-          'handplansate1':'抄表率'
-          }
+          'handplansate1': '抄表率'
+        }
       },
       inputtores: [{label: '全部', value: ''}],  // 抄表员
       condition: ' 1 = 1'

package/src/filiale/shaoguan/IOTMeterCenter.vue

@@ -543,9 +543,9 @@
       async checkingOrder () {
         console.log('看看业务单号', this.model.f_serial_number, this.row)
         let http = new HttpResetClass()
-        let temp = await http.load('post', 'rs/sql/querySingleTable', {data: {items: 'f_serial_number', tablename: 't_sellinggas', condition: ` 1=1 and f_serial_number='${this.model.f_serial_number}'`}}, {resolveMsg: null, rejectMsg: null})
+        let temp = await http.load('post', 'rs/logic/serialnumberVerify', {data: {f_serial_number: this.model.f_serial_number}}, {resolveMsg: null, rejectMsg: null})
         console.log('看看返回值', temp)
-        if (temp.data.length != 0) {
+        if (temp.data) {
           this.model.f_serial_number = ''
           this.prompts = '业务单号重复请重新输入'
         } else {

package/src/filiale/shaoguan/MachineMeterCenter.vue

@@ -348,9 +348,9 @@ let asyncMachineMeterCenter = async function (self) {
       async checkingOrder () {
         console.log('看看业务单号', this.data.f_serial_number, this.data)
         let http = new HttpResetClass()
-        let temp = await http.load('post', 'rs/sql/querySingleTable', {data: {items: 'f_serial_number', tablename: 't_sellinggas', condition: ` 1=1 and f_serial_number='${this.data.f_serial_number}'`}}, {resolveMsg: null, rejectMsg: null})
+        let temp = await http.load('post', 'rs/logic/serialnumberVerify', {data: {f_serial_number: this.data.f_serial_number}}, {resolveMsg: null, rejectMsg: null})
         console.log('看看返回值', temp)
-        if (temp.data.length != 0) {
+        if (temp.data) {
           this.data.f_serial_number = ''
           this.prompts = '业务单号重复请重新输入'
         } else {

package/src/filiale/shaoguan/OtherChargeNew.vue

@@ -305,10 +305,9 @@
           if (this.model.f_serial_number) {
             console.log('看看业务单号', this.model.f_serial_number, this.row)
             let http = new HttpResetClass()
-            let temp = await http.load('post', 'rs/sql/querySingleTable', {data: {items: 'f_serial_number', tablename: 't_othercharge', condition: ` 1=1 and f_serial_number='${this.model.f_serial_number}'`}}, {resolveMsg: null, rejectMsg: null})
+            let temp = await http.load('post', 'rs/logic/serialnumberVerify', {data: {f_serial_number: this.model.f_serial_number}}, {resolveMsg: null, rejectMsg: null})
             console.log('看看返回值', temp)
-            debugger
-            if (temp.data.length != 0) {
+            if (temp.data) {
               this.model.f_serial_number = ''
               this.prompts = '业务单号重复请重新输入'
             } else {

package/src/filiale/shaoguan/OverUseCharge.vue

@@ -293,9 +293,9 @@ export default {
     async checkingOrder () {
       console.log('看看业务单号', this.model.f_serial_number, this.row)
       let http = new HttpResetClass()
-      let temp = await http.load('post', 'rs/sql/querySingleTable', {data: {items: 'f_serial_number', tablename: 't_sellinggas', condition: ` 1=1 and f_serial_number='${this.model.f_serial_number}'`}}, {resolveMsg: null, rejectMsg: null})
+      let temp = await http.load('post', 'rs/logic/serialnumberVerify', {data: {f_serial_number: this.model.f_serial_number}}, {resolveMsg: null, rejectMsg: null})
       console.log('看看返回值', temp)
-      if (temp.data.length != 0) {
+      if (temp.data) {
         this.model.f_serial_number = ''
         this.prompts = '业务单号重复请重新输入'
       } else {

package/src/filiale/shaoguan/TransferManage.vue

@@ -239,9 +239,9 @@
       async checkingOrder () {
         console.log('看看业务单号', this.model.f_serial_number, this.row)
         let http = new HttpResetClass()
-        let temp = await http.load('post', 'rs/sql/querySingleTable', {data: {items: 'f_serial_number', tablename: 't_transfer', condition: ` 1=1 and f_serial_number='${this.model.f_serial_number}'`}}, {resolveMsg: null, rejectMsg: null})
+        let temp = await http.load('post', 'rs/logic/serialnumberVerify', {data: {f_serial_number: this.model.f_serial_number}}, {resolveMsg: null, rejectMsg: null})
         console.log('看看返回值', temp)
-        if (temp.data.length != 0) {
+        if (temp.data) {
           this.model.f_serial_number = ''
           this.prompts = '业务单号重复请重新输入'
         } else {

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/qianneng/sale'
+import FilialeSale from './filiale/haile/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'