sale-client 3.6.562 → 3.6.563

package/package.json

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

package/src/components/revenue/machineHandManage/ArrearsQuery.vue

@@ -505,9 +505,9 @@
 
   let readySomething = async function (self) {
     self.getinputtores()
-  // 加载抄表册
-  self.initmeterbook()
-  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    // 加载抄表册
+    self.initmeterbook()
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
     // self.$refs.paged.$refs.cri.search()
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
@@ -548,6 +548,7 @@
         }),
         criteriaShow: false,
         orgCondtionStr: '',
+        condition: '',
         // 下拉框
         meterbrands: [],
         pricenames: [],
@@ -605,7 +606,7 @@
           this.dainputtores = [{label: '全部', value: ''}]
         }
       },
-        async inputtorchange () {
+      async inputtorchange () {
         let val = this.$refs.paged.$refs.cri.model.f_inputtor
         if (val != null && val != '') {
           let param = {
@@ -675,7 +676,8 @@
         let exportdata = this.getCondition
         let otherInData = []
         otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
-        let footerData = [], exportfield = this.getfield
+        let footerData = []
+        let exportfield = this.getfield
         footerData.push('合计')
         let self = this
         for (var field in self.sumsmodel) {
@@ -763,11 +765,8 @@
             str += `and f_input_date<='${this.$refs.paged.$refs.cri.model.inputendDate}'`
           }
           // 构建基础 condition（不叠加旧值）
-          let baseCondition = '1=1 and f_meter_type=\'机表\''
-          if (this.orgCondtionStr) {
-            baseCondition += ` ${this.orgCondtionStr}`
-          }
-          args.condition = baseCondition
+          args.condition = `${args.condition} and f_meter_type='机表'` + this.orgCondtionStr
+          this.condition = args.condition
           this.model.search(args.condition, args.model, str)
           this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         }
@@ -889,7 +888,7 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          condition: this.condition,
           condValue: `${this.model.condValue}`
         }
       },

package/src/filiale/bayan/CardMeterCenter.vue

@@ -299,8 +299,8 @@
     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 || 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))
+      self.model.f_preamount = stringRound(getAmount.data.chargenum)
+      self.model.f_totalcost = stringRound((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       if (self.model.f_payment == '赠气') {

package/src/filiale/bayan/NoCardMeterCenter.vue

@@ -109,7 +109,7 @@
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
             <div class="col-sm-4">
-              <label for="f_write_card" style="color: red" class=" font_normal_body">是否写</label>
+              <label for="f_write_card" style="color: red" class=" font_normal_body">是否写卡</label>
               <v-select id="f_write_card"
                         v-model="model.f_write_card"
                         placeholder='是否写卡'

package/src/filiale/qingtongxia/FilesManage/UserEssentialInfoTest.vue

@@ -39,7 +39,7 @@
                v-if="baseinfo.base.f_credentials === '身份证'">
             <label for="f_idnumber" class="font_normal_body">*证件号码</label>
             <input type="text" maxlength="18" v-model="baseinfo.base.f_idnumber"
-                   v-validate:f_idnumber2='{identityCardValid: true}' class="input_search" style="width:80%"
+                   v-validate:f_idnumber2='{required: true}' class="input_search" style="width:80%"
                    placeholder="证件号码">
           </div>
           <div style="" class="col-sm-8 form-group" v-if="baseinfo.base.f_credentials !== '身份证'">

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/gehua/sale'
+import FilialeSale from './filiale/bayan/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'