sale-client 3.6.193 → 3.6.194

package/package.json

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

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

@@ -304,6 +304,7 @@ let getPrice = async function (self) {
 
   self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
   self.model.f_payment = self.config.payment
+  self.model.f_ladder_sync = self.config.ladderSync
   self.mulPrint = self.config.printType instanceof Array
   self.model.f_use_type = self.config.billType
   self.model.f_bill_type = self.model.f_print
@@ -384,7 +385,7 @@ export default {
           f_oldmeter_use_reference: 0 // 旧表使用量参考值
         },
         // 旧表底数
-        f_ladder_sync: '同步',
+        f_ladder_sync: '',
         f_using_base_old: '',
         // 换表补气量
         f_remanent_gas: 0,
@@ -417,6 +418,7 @@ export default {
         billType: '其他费用',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
         printType: '普通收据', // 收据/电子票/专用发票/国税发票
         payment: '现金缴费',
+        ladderSync: '同步',
         open_way: '指令开户',
         hasArrearsChange: false, // 是否可以有欠费换表
         f_change_operator: false, // 换表人是否必填

package/src/components/revenue/comprehen/gasbrand/AddGasBrand.vue

@@ -349,9 +349,9 @@ export default {
       this.model.f_share_times = this.model.f_share_times[0]
       this.model.f_support_bluetooth = this.model.f_support_bluetooth[0]
       this.model.f_isdecimal = this.model.f_meter_type.includes('物联网') ? '是' : this.model.f_isdecimal[0]
-      this.model.f_collection_type = this.model.f_collection_type[0]
-      this.model.f_calculation = this.model.f_calculation[0]
-      this.model.f_system_settlement = this.model.f_system_settlement[0]
+      this.model.f_collection_type = this.model.f_collection_type[0] ? this.model.f_collection_type[0]: ''
+      this.model.f_calculation = this.model.f_calculation[0] ? this.model.f_calculation[0] : ''
+      this.model.f_system_settlement = this.model.f_system_settlement ? this.model.f_system_settlement[0] : ''
       this.model.useOrg = this.useOrg
       this.getArrParam()
       this.$LogicService.addGasBrand(this.model, this.addGasModelArray)

package/src/filiale/liaoyuan/CardList.vue

@@ -299,11 +299,8 @@
       },
       search () {
         let condition = '1=1'
-        if (this.f_orgid) {
-          condition += `and (u.f_filialeid in ${this.f_orgid} or g.f_orgid in ${this.f_orgid}) `
-        } else {
-          condition += `and (u.f_filialeid = '${this.$login.f.orgid}' or g.f_orgid ='${this.$login.f.orgid}')`
-        }
+        condition += `and (u.f_filialeid = '${this.$login.f.orgid}' or g.f_orgid ='${this.$login.f.orgid}')`
+        console.log('condition========>', condition)
         this.$refs.pv.load(this.sqlurl, {data: {condition: condition}}).then((a) => {
           if (a.data.length === 0) {
             this.model.rows = []
@@ -498,11 +495,7 @@
         // if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
         //   args.condition += `and f_filialeids = '${this.$login.f.f_orgids}'`
         // }
-        // if (this.f_orgid) {
-        //   args.condition += `and r.f_orgid in ${this.f_orgid}`
-        // } else {
-        //   args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
-        // }
+        args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
         if (this.authArr.includes('操作记录查询限定')) {
           args.condition += ` and r.f_operatorid = '${this.$login.f.id}'`
         }

package/src/filiale/ningjin/ChangeMeter.vue

@@ -311,6 +311,7 @@ let getPrice = async function (self) {
   await self.$getConfig(self, 'ChargeMeter')
 
   self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+  self.model.f_ladder_sync = self.config.ladderSync
   self.model.f_payment = self.config.payment
   self.mulPrint = self.config.printType instanceof Array
   self.model.f_use_type = self.config.billType
@@ -392,7 +393,7 @@ export default {
           f_oldmeter_use_reference: 0 // 旧表使用量参考值
         },
         // 旧表底数
-        f_ladder_sync: '同步',
+        f_ladder_sync: '',
         f_using_base_old: '',
         // 换表补气量
         f_remanent_gas: 0,
@@ -422,6 +423,7 @@ export default {
         hasBillManage: false,  // 默认不启用发票管理
         billType: '其他费用',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
         printType: '普通收据', // 收据/电子票/专用发票/国税发票
+        ladderSync: '不同步',
         payment: '现金缴费',
         open_way: '指令开户',
         showupload: true, //

package/src/filiale/yuncheng/TransferManage.vue

@@ -31,7 +31,7 @@
             </div>
             <div class="col-sm-8" :class="[$v.f_newidnumber.identityCardValid ? 'has-error' : '']" v-if="model.f_newcredentials[0] === '身份证'">
               <label id="label" class="font_normal_body">*证件号码</label>
-              <input type="text"  v-model="model.f_newidnumber" v-validate:f_newidnumber='{identityCardValid: true}' class="input_search" style="width:80%" placeholder="新身份证号">
+              <input type="text"  v-model="model.f_newidnumber" maxlength="18" v-validate:f_newidnumber='{identityCardValid: true}' class="input_search" style="width:80%" placeholder="新身份证号">
             </div>
             <div class="col-sm-8" v-if="model.f_newcredentials[0] !== '身份证'">
               <label class="font_normal_body">&nbsp;证件号码</label>