sale-client 3.6.407 → 3.6.409

package/package.json

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

package/src/components/revenue/base/rightview/CardList.vue

@@ -492,6 +492,14 @@
           }
         } else if (type === '垃圾费收费') {
           name = 'rs/report/garbageChargeReport'
+        } else if (type === '物联网赠费') {
+          name = 'rs/report/iotGiftFee'
+        } else if (type === '物联网赠气') {
+          name = 'rs/report/iotGiftGas'
+        } else if (type === '卡表赠费') {
+          name = 'rs/report/icGiftFee'
+        } else if (type === '卡表赠费') {
+          name = 'rs/report/icGiftGas'
         }
         return name
       },

package/src/components/revenue/comprehen/ComprehenOperation/GiftFee/icTable.vue

@@ -56,6 +56,7 @@
           <button class="button_clear" @click="clean()" >取消</button>
         </div>
       </validator>
+      <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
     </div>
   </div>
   <upload :blodid="row.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="赠气"></upload>
@@ -123,6 +124,10 @@
       await self.$resetpost('rs/logic/otherGasRollback', {data: rollback}, {rejectMsg: '赠气回滚出错', resolveMsg: null})
     }
   }
+  let asyncIcTable = async function (self) {
+    await self.$getConfig(self, 'icTable')
+    console.log('卡表赠气赠费config', self.config)
+  }
 
   export default {
     title: '卡表赠气赠费',
@@ -144,6 +149,14 @@
           f_reason: '',
           f_add_gas: '不计入'
         },
+        config: {
+          hasPrint: false
+        },
+        billData: {
+          url: 'rs/report/icGiftGas',
+          operator: this.$login.f.name,
+          billnumber: ''
+        },
         print: false
       }
     },
@@ -153,6 +166,12 @@
       this.row.cardInfo = this.cardData
       console.log('卡信息', this.row.cardInfo)
       this.getRandomId()
+      asyncIcTable(this)
+      if (this.isGas) {
+        this.billData.url = 'rs/report/icGiftGas'
+      } else {
+        this.billData.url = 'rs/report/icGiftFee'
+      }
     },
     events: {
       // 删除Resid数组元素
@@ -185,7 +204,14 @@
           }
           this.$resetpost('rs/logic/updatefiles', data)
 
-          this.$dispatch('success')
+          if (this.config.hasPrint) {
+            this.row.id = res
+            this.row.f_bill_type = this.isGas ? '卡表赠气' : '卡表赠费'
+            this.row.f_bill_style = '普通收据'
+            this.print = true
+          } else {
+            this.$dispatch('success')
+          }
         })
       },
       pregas () {
@@ -251,6 +277,9 @@
       clean () {
         this.$info('取消操作')
         this.$dispatch('cancelclean', this.row)
+      },
+      printok () {
+        this.$dispatch('success')
       }
     },
     computed: {

package/src/components/revenue/comprehen/ComprehenOperation/GiftFee/iotTable.vue

@@ -59,7 +59,7 @@
     </validator>
     <!--<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>-->
     <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
-    <!--<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>-->
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
   </div>
   <upload :blodid="row.f_userinfo_id"  v-ref:upload  :businessid="randomBusinessId"  :isremark="true" fusetype="赠气"></upload>
 </template>
@@ -90,7 +90,16 @@ export default {
           f_preamount: 0,
           f_add_gas: '计入',
           f_comments: ''
-        }
+        },
+        config: {
+          hasPrint: false
+        },
+        billData: {
+          url: 'rs/report/iotGiftGas',
+          operator: this.$login.f.name,
+          billnumber: ''
+        },
+        print: false
 
       }
     },
@@ -101,8 +110,10 @@ export default {
       this.getRandomId()
       if (this.row.f_collection_type === '按气量') {
         this.model.f_operat_type = ['物联网赠气']
+        this.billData.url = 'rs/report/iotGiftGas'
       } else {
         this.model.f_operat_type = ['物联网赠费']
+        this.billData.url = 'rs/report/iotGiftFee'
       }
     },
     events: {
@@ -168,9 +179,19 @@ export default {
             f_blobid: res.data.id
           }
           this.$resetpost('rs/logic/updatefiles', data)
-          this.clean()
+          if (this.config.hasPrint) {
+            this.row.id = res.data.id
+            this.row.f_bill_type = this.row.f_collection_type === '按气量' ? '物联网赠气' : '物联网赠费'
+            this.row.f_bill_style = '普通收据'
+            this.print = true
+          } else {
+            this.clean()
+          }
         })
       },
+      printok () {
+        this.$dispatch('success')
+      },
       clean () {
         this.$dispatch('refresh')
       }

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterListMaintain.vue

@@ -394,7 +394,7 @@ const myMap = new Map()
         }
         console.log('查询。。。', this.f_orgid)
         if (!this.orgCondtionStr) {
-          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+          args.condition = `${args.condition}` + ' and f_orgid = ' + `'${this.$login.f.orgid}'`
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }

package/src/filiale/rongchuang/bill/CustQueryEticket.vue

@@ -263,8 +263,9 @@
         // }
         console.log('>>> 看看是啥' + JSON.stringify(loginRes))
         if (loginRes.code === '1000' || loginRes.code === '0000') {
-          this.$showAlert(loginType === '1' ? '短信验证码发送成功' : '登录成功', 'success', 1000)
-          this.inputSmsCodeShow = false
+          this.$showAlert(loginType === '0' ? '短信验证码发送成功' : '确认登录成功', 'success', 1000)
+          console.log('>>> 登录模式：' + loginType + '，登录状态：' + loginRes.data.data.status)
+          this.inputSmsCodeShow = loginType === '0' && loginRes.data && loginRes.data.data.status === 1
         } else {
           this.$showAlert(loginRes.msg || '登录失败', 'danger', 3000)
         }

package/src/filiale/shiquan/charge/CardMeterCenter.vue

@@ -467,7 +467,7 @@
     self.limitMsg = getLimit.data.limitMessage
     if (self.hasLimit) {
       if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
-        if (getLimit.data.f_limit_value < 0 && getLimit.data.f_limit_amount < 0) {
+        if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
           self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
           self.$dispatch('refresh')
         } else {