sale-client 3.6.124 → 3.6.126

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://121.40.52.133:9001/', 'http://121.40.52.133:9001/']
+const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
 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.124",
+  "version": "3.6.126",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -74,7 +74,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.48",
+    "ldap-clients": "3.0.62",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",
@@ -91,7 +91,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.61",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.94",
+    "vue-client": "1.24.101",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/App.vue

@@ -10,8 +10,10 @@
 </template>
 
 <script>
+import Vue from 'vue'
 
 export default {
-  ready () {}
+  ready () {
+  }
 }
 </script>

package/src/components/chargeBatch/BatchCharge.vue

@@ -130,6 +130,7 @@ export default {
       config: {
         showupload: true, // 显示上传
         hasPrint: true,  // 默认打票
+        postAsync: false,  // 是否异步请求  存完主记录再存明细
         hasBillManage: false,  // 默认不启用发票管理
         hasfindaReail: true,  // 默认开启找零功能
         billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
@@ -283,50 +284,61 @@ export default {
       if (this.civill) {
         param = Object.assign(this.civill, param)
       }
-      try {
-        await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
-      } catch (e) {}
-      // this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
-      this.show = true
-      // 启动定时器定时查询处理结果
-      this.timer = setInterval(async () => {
-        let res = await this.HttpReset.load('POST', 'rs/logic/getBatchOperaPro', {data: {uuid: uuid}}, {resolveMsg: null, rejectMsg: null})
-        if (res.data.percent) {
-          this.percent = res.data.percent
-        }
-        if (res.data.msg || res.data.error) {
-          this.show = false
-          clearInterval(this.timer)
-          this.$closeMessage()
-          if (res.data.error) {
-            this.$showAlert(`${res.data.error}`, 'danger')
-            return
+      let batchId = ''
+      // 如果配置了异步请求
+      if (this.config.postAsync) {
+        // 插入主收费记录
+        let batch = await this.$resetpost('rs/logic/asyncbatchPaymentSellinggas', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+        batchId = param.f_batch_id = batch.data.f_batch_id
+        // 处理记录明细抄表明细
+        await this.$resetpost('rs/logic/async/asyncbatchPaymentFiles', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+      } else {
+        try {
+          await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+        } catch (e) {}
+        // this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
+        this.show = true
+        // 启动定时器定时查询处理结果
+        this.timer = setInterval(async () => {
+          let res = await this.HttpReset.load('POST', 'rs/logic/getBatchOperaPro', {data: {uuid: uuid}}, {resolveMsg: null, rejectMsg: null})
+          if (res.data.percent) {
+            this.percent = res.data.percent
           }
-          await this.$showMessage(res.data.msg)
-          if (this.config.hasPrint) {
-            if (this.data.f_print.indexOf('电子发票') == -1) {
-              console.log('this.config.hasBillManage', this.config.hasBillManage)
-              if (this.config.hasBillManage) {
-                // 启用发票管理，获取票据管理中的票号并存储记录
-                this.row.id = res.data.id
-                this.row.f_bill_type = '物联网收费'
-                this.row.f_bill_style = this.model.f_print[0]
-                this.print = true
-              } else {
-                this.data.id = res.data.id
-                this.print = true
-              }
-            } else if (this.config.printType === '国税发票') {
-              // TODO
-            } else if (this.model.f_print[0] === '电子发票') {
-              this.eticket_show = true
-              await this.$refs.eticketbill.openETicket([res.data.id], this.row, this.invoice_show_gas, this.invoice_is_pax, '物联网收费')
+          if (res.data.msg || res.data.error) {
+            this.show = false
+            clearInterval(this.timer)
+            this.$closeMessage()
+            if (res.data.error) {
+              this.$showAlert(`${res.data.error}`, 'danger')
+              return
             }
+            await this.$showMessage(res.data.msg)
+            batchId = res.data.id
+          }
+        }, 1500)
+      }
+      if (this.config.hasPrint) {
+        if (this.data.f_print.indexOf('电子发票') == -1) {
+          console.log('this.config.hasBillManage', this.config.hasBillManage)
+          if (this.config.hasBillManage) {
+            // 启用发票管理，获取票据管理中的票号并存储记录
+            this.row.id = batchId
+            this.row.f_bill_type = '物联网收费'
+            this.row.f_bill_style = this.model.f_print[0]
+            this.print = true
           } else {
-            this.clean()
+            this.data.id = batchId
+            this.print = true
           }
+        } else if (this.config.printType === '国税发票') {
+          // TODO
+        } else if (this.model.f_print[0] === '电子发票') {
+          this.eticket_show = true
+          await this.$refs.eticketbill.openETicket([batchId], this.row, this.invoice_show_gas, this.invoice_is_pax, '物联网收费')
         }
-      }, 1500)
+      } else {
+        this.clean()
+      }
     },
     clean () {
       this.$dispatch('success')

package/src/components/common/userinfo_detail/ic_detail/AutomaticPurse.vue

@@ -161,7 +161,7 @@ let reprintGen = function *(self, row) {
     methods: {
       async search () {
         console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' `
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_AutomaticPurse', {

package/src/components/common/userinfo_detail/ic_detail/CardHandRecord.vue

@@ -157,7 +157,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_cardhandplanQuery', {

package/src/components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser.vue

@@ -131,7 +131,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_ChangeMeterQuery', {

package/src/components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -318,7 +318,7 @@ export default {
     },
     async search () {
       console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
-      this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+      this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
       this.model.search(this.condition, this.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       let http = new HttpResetClass()

package/src/components/common/userinfo_detail/ic_detail/FillCardQueryUser.vue

@@ -96,7 +96,7 @@
     methods: {
       async search () {
         if (this.row.f_meter_type.includes('卡表')) {
-          this.condition = `${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+          this.condition = `${this.searchValue} = '${this.row[this.searchValue]}' `
           if (this.$refs.paged.$refs.criteria.condition) {
             this.condition += `and ${this.$refs.paged.$refs.criteria.condition}`
           }

package/src/components/common/userinfo_detail/ic_detail/HandQueryUser.vue

@@ -253,7 +253,7 @@
       //   this.model.search(this.condition, this.model)
       // },
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_HandplanQuery', {

package/src/components/common/userinfo_detail/ic_detail/MachineRecordQuery.vue

@@ -150,7 +150,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/machineRecordQuery', {

package/src/components/common/userinfo_detail/ic_detail/RecordQueryUser.vue

@@ -145,7 +145,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_RecordQuery', {

package/src/components/common/userinfo_detail/ic_detail/WebAutomaticPurse.vue

@@ -160,7 +160,7 @@ let reprintGen = function *(self, row) {
     methods: {
       async search () {
         console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' `
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', `${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebAutomaticPurse':'rs/sql/sale_AutomaticPurse'}`, {

package/src/components/common/userinfo_detail/ic_detail/WebHandQueryUser.vue

@@ -238,7 +238,7 @@
       //   this.model.search(this.condition, this.model)
       // },
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', `${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, {

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -277,7 +277,12 @@
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('分公司')]
       },
       getCondition () {
-        return {condition: this.$refs.paged.$refs.cri.condition, orderitem: 'delivery_date DESC ' }
+        return {
+          condition: this.$refs.paged.$refs.cri.condition,
+          orderitem: 'delivery_date DESC ',
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate
+        }
       },
       getfield () {
         let data = {}

package/src/components/webMeter/meterinfo/NewMeterList.vue

@@ -23,7 +23,7 @@
               <div style="float:right">
                 <button class="button_search button_spacing" @click="search()" v-el:cba>查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
-                <export-excel :data="{condition:$parent.$parent.condition}"
+                <export-excel :data="$parent.$parent.getCondition"
                                    :field="$parent.$parent.config.excelHeaders"
                                    sqlurl="rs/logic/saleExport" sql-name="manage_getNewMeterBrandAndModel" template-name='表具查询'
                                    v-ref:exports
@@ -539,6 +539,12 @@
       }
     },
     computed: {
+      getCondition () {
+        return {
+          condition: this.condition,
+          orderitem: this.orderitem
+        }
+      },
      /* Warningstyle () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('燃气表型号')]
       }, */

package/src/components/webMeter/paramSave/ParamSet.vue

@@ -4,7 +4,7 @@
       <criteria :model='model' partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="col-sm-2">
+            <div class="col-sm-3" style="width:20%">
               <label class="font_normal_body" >气表协议类型</label>
               <v-select style="width:60%" title="气表协议类型"
                         placeholder='气表协议类型'
@@ -26,7 +26,7 @@
                 condition="f_gasbrand_id = '{}'"
                 close-on-select></v-select>
             </div>
-            <div class="col-sm-2 form-group">
+            <div class="col-sm-2">
               <label class="font_normal_body">气表型号</label>
               <v-select :value.sync="model.f_meter_style"
                         v-model="model.f_meter_style"
@@ -34,7 +34,7 @@
                         condition="f_gasmodel_id = '{}'"
                         close-on-select></v-select>
             </div>
-            <div class="col-sm-2 ">
+            <div class="col-sm-2">
               <label class="font_normal_body">客户编号</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search "
                      v-model="model.f_userinfo_code"
@@ -437,7 +437,7 @@ export default {
         this.condition = args.condition
         this.model.search(args.condition, args.model)
       } else {
-        this.$showAlert(`请先选择气表品牌`, 'warning', 0)
+        this.$showAlert(`请先选择气表品牌`, 'warning', 2000)
       }
       // this.isCheckAll = false
     },