sale-client 3.6.545 → 3.6.546

package/package.json

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

package/src/Util.js

@@ -21,19 +21,19 @@ export function getAttendanceState (item, timeToWork, timeToGo) {
   }
 }
 
-//获取随机uuid
-export function generateUUID() {
+// 获取随机uuid
+export function generateUUID () {
   // 'x' 代表数字与大小写字母中的任意一个
-  const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-  let uuid = '';
+  const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+  let uuid = ''
   // 第一个字符是 '0'-'7' 之间的随机数字，用于版本标识
-  uuid += chars.charAt(Math.floor(Math.random() * 8) + Math.floor(Math.random() * 8) % 8);
+  uuid += chars.charAt(Math.floor(Math.random() * 8) + Math.floor(Math.random() * 8) % 8)
   for (let i = 0; i < 31; i++) {
     // 随机选择字符
-    uuid += chars.charAt(Math.random() * chars.length | 0);
+    uuid += chars.charAt(Math.random() * chars.length | 0)
   }
   // 修正长度和格式，以确保它看起来像是一个标准的UUID
-  return uuid.substr(0, 8)  + uuid.substr(8, 4)  + uuid.substr(12, 4)  + uuid.substr(16, 4)  + uuid.substr(20, 12);
+  return uuid.substr(0, 8) + uuid.substr(8, 4) + uuid.substr(12, 4) + uuid.substr(16, 4) + uuid.substr(20, 12)
 }
 
 export function toStandardYearMonth () {
@@ -53,29 +53,29 @@ export function toStandardDateString () {
   let date = dt.getDate()
   return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
 }
-export function getLastDayOfMonth(dateString) {
+export function getLastDayOfMonth (dateString) {
   // 解析输入日期字符串
-  var parts = dateString.split('-');
-  var year = parseInt(parts[0], 10);
-  var month = parseInt(parts[1], 10);
+  var parts = dateString.split('-')
+  var year = parseInt(parts[0], 10)
+  var month = parseInt(parts[1], 10)
 
   // 创建一个日期对象，表示下个月的第一天
-  var nextMonthFirstDay = new Date(year, month, 1);
+  var nextMonthFirstDay = new Date(year, month, 1)
 
   // 减去一天，得到本月的最后一天
-  nextMonthFirstDay.setDate(nextMonthFirstDay.getDate() - 1);
+  nextMonthFirstDay.setDate(nextMonthFirstDay.getDate() - 1)
 
   // 获取年、月、日
-  var lastDay = nextMonthFirstDay.getDate();
-  var lastMonth = nextMonthFirstDay.getMonth() + 1; // 月份从0开始，需要加1
-  var lastYear = nextMonthFirstDay.getFullYear();
+  var lastDay = nextMonthFirstDay.getDate()
+  var lastMonth = nextMonthFirstDay.getMonth() + 1 // 月份从0开始，需要加1
+  var lastYear = nextMonthFirstDay.getFullYear()
 
   // 格式化日期为 YYYY-MM-DD
   var formattedDate = lastYear + '-' +
     (lastMonth < 10 ? '0' + lastMonth : lastMonth) + '-' +
-    (lastDay < 10 ? '0' + lastDay : lastDay);
+    (lastDay < 10 ? '0' + lastDay : lastDay)
 
-  return formattedDate;
+  return formattedDate
 }
 
 export function toStartAndEndDateString () {

package/src/components/revenue/comprehen/Maintenance/T+MoneyDocking/moneyDockingTow.vue

@@ -80,7 +80,7 @@
 
 <script>
   import { PagedList } from 'vue-client'
-  import * as Util from "../../../../../Util";
+  import * as Util from '../../../../../Util'
 
   export default {
     data () {

package/src/filiale/bayan/CardMeterCenter.vue

@@ -247,9 +247,9 @@
 
     // 输入金额，换算气量
   let preamountGen = async function (self) {
-    let calFee = ((self.model.f_preamount - 0)).toFixed(self.row.f_fee_decimal || 4)
+    let calFee = ((self.model.f_preamount - 0)).toFixed(self.row.f_fee_decimal || 2)
     if (self.model.f_payment == '赠气') {
-      calFee = (self.model.f_preamount - 0).toFixed(self.row.f_fee_decimal || 4)
+      calFee = (self.model.f_preamount - 0).toFixed(self.row.f_fee_decimal || 2)
     }
       // 通过金额进行划价
     let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
@@ -258,19 +258,19 @@
         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(self.row.f_gas_decimal || 4)
+          self.model.f_pregas = (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 2)
         }
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 4))
-          self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney2.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 2))
+          self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney2.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 2)
         }
       } else {
           // 如果不支持小数,将划价出的多余非整数气量进行划价为金额
         let tempnum = Math.floor(getGas.data.gas - 0)
-        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(self.row.f_fee_decimal || 4))
-        self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
+        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(self.row.f_fee_decimal || 2))
+        self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 2)
         self.model.f_pregas = Math.floor(getGas.data.gas - 0)
       }
     }
@@ -283,24 +283,24 @@
       self.model.f_collection = 0
     } else {
       self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
-      self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
+      self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 2)
     }
-    self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
+    self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 2)
     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(self.row.f_gas_decimal || 4)
+      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(self.row.f_gas_decimal || 2)
     } 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 - 0).toFixed(self.row.f_fee_decimal || 4)
-      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
+      self.model.f_preamount = (getAmount.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 2)
+      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 2))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       if (self.model.f_payment == '赠气') {

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

@@ -301,6 +301,10 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     async kp (row) {
+      console.log('>>> row --> ', row)
+      if (!!row.is_bill && row.is_bill === '是') {
+        return this.$showAlert('已结算的记录不能再次结算开票', 'warning', 3000)
+      }
       let HttpReset = new HttpResetClass()
       let _row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
         data: {

package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue

@@ -174,13 +174,13 @@ export default {
       for (let i = 0; i < this.devicesinfonew.length; i++) {
         if (this.devicesinfonew[i].f_devices_type == '报警器') {
           this.alarmExpireDate(i)
-        } else if (this.devicesinfonew[i].f_devices_type == '切断阀') {
+        } else if (this.devicesinfonew[i].f_devices_type == '切断阀' || this.devicesinfonew[i].f_devices_type == '自闭阀') {
           this.expireDate(i)
         }
       }
     },
     expireDate (index) {
-      if (this.devicesinfonew[index].f_devices_type == '切断阀') {
+      if (this.devicesinfonew[index].f_devices_type == '切断阀' || this.devicesinfonew[index].f_devices_type == '自闭阀') {
         if (this.devicesinfonew[index].f_input_date === '' || this.devicesinfonew[index].f_input_date === undefined) {
         } else {
           let b = new Date(this.devicesinfonew[index].f_input_date)
@@ -199,7 +199,7 @@ export default {
       if (this.devicesinfonew[index].f_firstcheck_date === '' || this.devicesinfonew[index].f_firstcheck_date === undefined || this.devicesinfonew[index].f_firstcheck_date === null) {
       } else {
         let b = new Date(this.devicesinfonew[index].f_firstcheck_date)
-        let year = (b.getFullYear() - 0) + 3
+        let year = (b.getFullYear() - 0) + 5
         let year2 = (b.getFullYear() - 0) + 1
         let month = (b.getMonth() - 0) + 1
         var day = b.getDate()
@@ -235,7 +235,8 @@ export default {
       console.log('设备信息', this.devicesinfonew)
       this.devicesinfonew.push({
         f_devices_type: '调压器',
-        f_input_date: this.$login.toStandardTimeString()
+        f_input_date: this.$login.toStandardTimeString(),
+        f_firstcheck_date: this.$login.toStandardTimeString()
       })
     }
   }

package/src/filiale/rongcheng/UserDeviceInfoTest.vue

@@ -222,7 +222,7 @@
               }
             })
             this.$watch(() => device.f_devices_type, (newType) => {
-              if (newType === '自闭阀' && device.f_input_date) {
+              if (device.f_input_date) {
                 this.updateExpireDate(device)
               } else {
                 device.f_expire_date = ''

package/src/filiale/rongcheng/UserGeneralInfoTest.vue

@@ -68,7 +68,7 @@
 <script>
 import UserPaperInfoTest from './UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
-import * as Util from '../../util'
+import * as Util from '../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()

package/src/filiale/shimen/MeterMessage.vue

@@ -0,0 +1,188 @@
+<template>
+  <!--<div class="auto">-->
+    <validator name='v'  @valid="onValid()"  @invalid="onInvalid()">
+        <form novalidate class="form-horizontal">
+          <div class="row auto" >
+
+            <div class="col-sm-4 form-group" :class="[$v.metertype.required ? 'has-error' : '']">
+              <label for="f_meter_type" class="font_normal_body">新表类型</label>
+              <input type="text" class="input_search" style="width: 60%" v-show="false" v-model="$refs.metertype.selectedItems" v-validate:metertype='{required: true }'>
+              <v-select :value.sync="metermessage.f_meter_type"
+                        v-model="metermessage.f_meter_type"
+                        :options='meterType' placeholder='气表类型'
+                        close-on-select v-ref:metertype style="width: 60%"></v-select>
+            </div>
+
+            <div class="col-sm-4 form-group" :class="[$v.brand.required ? 'has-error' : '']">
+              <label for="gasbrand" class="font_normal_body">新表品牌</label>
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems" v-validate:brand='{required: true }'>
+              <v-select :value.sync="metermessage.gasbrand" :options='getMeterBrands(metermessage.f_meter_type)' @change='brandChange' placeholder='气表品牌' close-on-select
+                        search v-model='metermessage.gasbrand' v-ref:brand></v-select>
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.model.required ? 'has-error' : '']">
+              <label for="gasmodel" class="font_normal_body">新表型号</label>
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.model.selectedItems"  v-validate:model='{required: true }'>
+              <v-select :value.sync="metermessage.gasmodel" :options='metermessage.gasbrand[0] ? metermessage.gasbrand[0].gasmodel : [] ' placeholder='气表型号' close-on-select
+                        v-model='metermessage.gasmodel' :disabled= 'metermessage.gasbrand.length === 0 ' @change='modelChange' v-ref:model></v-select>
+            </div>
+
+          </div>
+          <div class="row auto" >
+            <div class="col-sm-4 form-group" :class="[$v.meternumber.required ? 'has-error' : '']">
+              <label for="f_meternumber" class="font_normal_body">新&ensp;表&ensp;号</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search"
+                     @blur="meternumberValidate()"  v-model="metermessage.f_meternumber" v-validate:meternumber='{required: true }' placeholder='表号' >
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.f_metertitles.required ? 'has-error' : '']">
+              <label for="f_metertitles" class="font_normal_body">新表封号</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search"  v-model="metermessage.f_metertitles" placeholder='表封号'>
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']" title="参数名称：【初始表底数最大值】">
+              <label for="f_meter_base" class="font_normal_body">新表底数</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search" v-validate:f_meter_base='{required: true }' @blur='meterbase()' v-model="metermessage.f_meter_base" placeholder='表底数' >
+            </div>
+          </div>
+
+        </form>
+    </validator>
+  <!--</div>-->
+</template>
+
+<script>
+  import {HttpResetClass} from "vue-client";
+
+  /**
+   *公共组件
+   *获取气表信息
+   */
+  export default {
+    data () {
+      return {
+        isdecimal: '否',
+        imgsrc: '/images/mainicon/biaopan.png',
+        imgmeter: '/images/mainicon/addmeter.png',
+        f_meter_base_max: this.$appdata.getSingleValue('初始表底数最大值') ? this.$appdata.getSingleValue('初始表底数最大值') : 10000,
+        meterType: this.$appdata.getParam('气表类型')
+      }
+    },
+    props: ['f_userfiles_id', 'metermessage'],
+    methods: {
+      onValid () {
+        this.$dispatch('valid')
+      },
+      onInvalid () {
+        this.$dispatch('invalid')
+      },
+      brandChange (val) {
+        this.isdecimal = val.length > 0 ? val[0].f_isdecimal : '否'
+        this.meternumberValidate()
+      },
+      modelChange (val) {
+        this.$dispatch('gasmodel', this.metermessage.gasbrand)
+      },
+      resetValidate () {
+        this.$resetValidation()
+      },
+      meterbase () {
+        if (this.isdecimal === '是') {
+          this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(2)
+        } else {
+          this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
+        }
+        if (this.metermessage.f_meter_base > this.f_meter_base_max) {
+          this.$showAlert(`新表底数可录入的最大值为: ${this.f_meter_base_max}, 请核实后重新录入!!!`, 'warning', 3000)
+          this.metermessage.f_meter_base = ''
+        }
+      },
+      getMeterBrands (meterType) {
+        let res = []
+        if (meterType.length > 0) {
+          this.meterbrands.forEach((item) => {
+            if (item.value.f_meter_type === meterType[0]) {
+              res.push(item)
+            }
+          })
+        }
+        return res
+      },
+      async meternumberValidate () {
+        let http1 = new HttpResetClass()
+        let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.metermessage.f_meternumber}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
+        if (res1.data.length > 0) {
+
+
+          // 已经选择了气表 则不再替换
+          if (this.metermessage.f_meter_type <= 0 ){
+            this.metermessage.f_meter_type = [res1.data[0].f_meter_classify]
+          }
+            // 替换表号自带的气表品牌和型号
+          let meterbrands = this.meterbrands
+          for (let row of meterbrands) {
+            if (row.label == res1.data[0].f_meter_brand) {
+              // 已经选择了气表品牌则不再替换
+              if (this.metermessage.gasbrand.length <= 0) this.metermessage.gasbrand = [row.value]
+              // 替换气表型号
+              if (res1.data[0].f_meter_style) {
+                for (let model of row.value.gasmodel) {
+                  if (model.label == res1.data[0].f_meter_style) {
+                    // 已经选择了气表型号则不再替换
+                    if (this.metermessage.gasmodel.length <= 0) this.metermessage.gasmodel = [model.value]
+                    continue
+                  }
+                }
+              }
+              continue
+            }
+          }
+        }
+        if (this.metermessage.f_meternumber && this.metermessage.gasbrand.length > 0) {
+          // 表号位数验证
+          let meternumberLen = this.metermessage.gasbrand[0].f_meternumber_len
+          if (meternumberLen) {
+            if (this.metermessage.f_meternumber.length != meternumberLen) {
+              this.metermessage.f_meternumber = ''
+              this.$showAlert(`表号位数不正确, 当前气表品牌表号位数是: ${meternumberLen}`, 'warning', 3000)
+              return
+            }
+          }
+          // 表计信息验证
+          if (this.metermessage.gasbrand[0].f_meterverification == '是') {
+            if (res1.data.length <= 0) {
+              this.$showAlert(`当前表号: ${this.metermessage.f_meternumber}在表计信息中无记录, 请核实!!!`, 'warning', 3000)
+              this.metermessage.f_meternumber = ''
+              return
+            }
+          }
+          if (this.metermessage.gasbrand[0].f_meter_type === '物联网表') {
+            let param = {
+              f_userfiles_id: this.f_userfiles_id,
+              f_meternumber: this.metermessage.f_meternumber,
+              f_gasbrand_id: this.metermessage.gasbrand[0].id
+            }
+
+            let res = await this.$resetpost('rs/logic/meternumberValidate', param, {
+              resolveMsg: null,
+              rejectMsg: '表号验证失败！！'
+            })
+            console.log('标号验证返回：', res)
+            if (res.data) {
+              this.metermessage.f_meternumber = ''
+              this.$showAlert('表号已存在！！', 'warning', 3000)
+            }
+          }
+        }
+      }
+    },
+    computed: {
+      usertypes () {
+        return this.$appdata.getParam('用户类型')
+      },
+      positions () {
+        return this.$appdata.getParam('安装位置')
+      },
+      meterbrands () {
+        return this.$GetSaleParam.getGasbrand()
+      }
+    }
+  }
+</script>