sale-client 3.6.83 → 3.6.85

package/build/dev-server.js

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

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

@@ -75,11 +75,11 @@
                   <label class="font_normal_body">状&emsp;&emsp;态</label>
                   <v-select id="price_states"
                             v-model="model.price_states"
-                            placeholder='未调价'
+                            placeholder='调价状态'
                             style="width: 60%"
                             :value.sync="model.price_states"
                             :options='$parent.$parent.price_states'
-                            condition="nvl(f_new_price,0) {}"
+                            condition="f_change_price {}"
                             close-on-select></v-select>
                 </div>
                 <div class="form-group col-sm-2">
@@ -236,7 +236,7 @@
         criteriaShow: false,
         pricers: [{label: '全部', value: '', flage: ''}],
         price_name: [{label: '全部', value: ''}],
-        price_states: [{label: '全部', value: ''}, {label: '已调价', value: ' >0'}, {label: '未调价', value: ' <=0'}],
+        price_states: [{label: '全部', value: ''}, {label: '已调价', value: ' is not null'}, {label: '未调价', value: ' is null'}],
         source: [{label: '卡表抄表', value: '卡表抄表'}, {label: '机表抄表', value: '机表抄表'}],
         userTypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
         condition: '',

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -298,7 +298,7 @@
 import { HttpResetClass } from 'vue-client'
 let getPrice = async function (self) {
   await self.$LoadParams.loadParam(self.$login.f.orgid)
-  await self.$getConfig(self, 'ChargeMeter')
+  await self.$getConfig(self, 'ChangeMeter')
 
   self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
   self.model.f_payment = self.config.payment
@@ -416,7 +416,7 @@ export default {
         payment: '现金缴费',
         open_way: '指令开户',
         hasArrearsChange: false, // 是否可以有欠费换表
-        isPraseInt: false,
+        castInt: true,
         dispatch: false, // 是否派工
         showupload: true, //
         approve: false  // 是否开启审核
@@ -631,8 +631,9 @@ export default {
     async confirm () {
       let msg = ''
       if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
-        let isPraseInt = this.config.isPraseInt
-        if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base)) || (isPraseInt && this.model.f_using_base_old > this.row.f_meter_base)) {
+        let a = this.config.castInt ? parseInt(this.model.f_using_base_old) : this.model.f_using_base_old
+        let b = this.config.castInt ? parseInt(this.row.f_meter_base) : this.row.f_meter_base
+        if (a > b) {
           msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
@@ -810,8 +811,9 @@ export default {
       }
       let msg = ''
       if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
-        let isPraseInt = this.config.isPraseInt
-        if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base)) || (isPraseInt && this.model.f_using_base_old > this.row.f_meter_base)) {
+        let a = this.config.castInt ? parseInt(this.model.f_using_base_old) : this.model.f_using_base_old
+        let b = this.config.castInt ? parseInt(this.row.f_meter_base) : this.row.f_meter_base
+        if (a > b) {
           msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'

package/src/filiale/gehua/MeterinfoTest.vue

@@ -45,7 +45,7 @@
 <!--            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
                       search @change='brandChange' v-model='row.gasbrand' :disabled="!((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发'))" v-ref:brand></v-select>-->
             <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' :disabled="user_State === '正常'"  v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="!(user_State !== '正常'|| isCalorimeter === '卡表')"  v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">气表型号</label>
@@ -56,7 +56,7 @@
 <!--                      v-model='row.gasmodel' :disabled="!(row.gasbrand.length !== 0 && ((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发')))" v-ref:model></v-select>-->
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
                       close-on-select
-                      v-model='row.gasmodel'  :disabled="!(row.gasbrand.length !== 0 && (user_State !== '正常'))"   v-ref:model></v-select>
+                      v-model='row.gasmodel'  :disabled="!(row.gasbrand.length !== 0 && (user_State !== '正常' || isCalorimeter === '卡表' ))"   v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
@@ -540,6 +540,7 @@
         },
         mapShow: false,
         viewsee: false,
+        isCalorimeter: '',
         row: this.meter,
         show: false,
         field: '',
@@ -576,7 +577,9 @@
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
       this.user_State = this.curuser.f_user_state
-      console.log(this.user_State)
+      if (this.curuser.f_meter_classify.indexOf('卡表') !== -1 && this.curuser.f_whether_hairpin === '未发') {
+        this.isCalorimeter = '卡表'
+      }
       this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
       if (this.row.f_meter_classify) {
         if (this.row.f_meter_classify === '物联网表') {

package/src/filiale/tongchuan/bill/EticketPrint.vue

@@ -54,7 +54,7 @@ export default {
       }
       await this.$resetpost('rs/entity/t_eticket', model, {resolveMsg: null, rejectMsg: '保存发票记录失败'})
     },
-    async openETicket (sellId, row,type, show_gas ='是', is_pax ='征税') {
+    async openETicket (sellId, row, show_gas, is_pax, type) {
       try {
         let model = {
           id: sellId,

package/src/filiale/wenxi/IOTRefund.vue

@@ -151,12 +151,10 @@
         // this.$showAlert('按气量缴费的物联网表退费功能尚未开放！！', 'warning', 3000)
         this.model.f_price = this.data.f_price
 
-        // this.$dispatch('refresh')
-      }
       console.log(123)
-      if(this.data.f_calculation!=='系统结算'){
+      if(this.data.f_calculation!=='系统结算'&& this.data.f_issupport_feededuction==='否'){
         this.check = false
-       this.$showAlert('表端计费表不支持扣费！！', 'warning', 3000)
+       this.$showAlert('该表型不支持扣费！！', 'warning', 3000)
       }
     },
     methods: {

package/src/filiale/wenxi/plugins/FileManageService.js

@@ -209,7 +209,7 @@ let FileManageService = {
       meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
       meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
       // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
-      meter.f_table_state = result.f_user_state === '预备' ? '待开通' : (meter.f_table_state? meter.f_table_state : '正常')
+      meter.f_table_state = result.f_user_state === '预备' ? '待开通' : (meter.f_table_state === '停用'? meter.f_table_state : '正常')
       if (!meter.f_userfiles_id) {
         // meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
         // 所有表变成未发

package/src/plugins/FileManageService.js

@@ -208,7 +208,7 @@ let FileManageService = {
       meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
       meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
       // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
-      meter.f_table_state = result.f_user_state === '预备' ? '待开通' : (meter.f_table_state? meter.f_table_state : '正常')
+      meter.f_table_state = result.f_user_state === '预备' ? '待开通' : (meter.f_table_state === '停用'? meter.f_table_state : '正常')
       if (!meter.f_userfiles_id) {
         // meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
         // 所有表变成未发