sale-client 3.5.61 → 3.5.63

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -700,7 +700,7 @@
       },
       async meternumberValidate () {
         let http1 = new HttpResetClass()
-        let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.row.f_meternumber}' and mi.f_filialeid= '${this.$login.f.orgid}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
+        let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.row.f_meternumber}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
         if (res1.data.length > 0) {
           // 替换表号自带的气表品牌和型号
           let meterbrands = this.meterbrands

package/src/components/charge/business/OtherChargeNew.vue

@@ -48,7 +48,6 @@
               <div class="col-sm-4" :class="{'has-success':row.f_unitprice,'has-error':!row.f_unitprice}">
                 <label style="" for="f_unitprice" class=" font_normal_body">*单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价</label>
                 <input class="input_search" style="width:60%" type="number" min="1" @blur.prevent="getcollection()"
-                       v-validate:f_unitprice='{required: true, dctest: config.checkFlag?[0, ">=" ]: [0, ">" ] }'
                        v-model="row.f_unitprice"
                        :value.sync="row.f_unitprice"
                        placeholder="单价" v-next-el='sl'>
@@ -346,8 +345,8 @@ export default {
   },
   methods: {
     setTypeprice (val) {
-      if (val && this.model.otherdetail[val] && this.model.otherdetail[val].f_typenumber) {
-        let unitprice = this.$appdata.getSingleValue(this.model.otherdetail[val].f_typenumber)
+      if (this.model.otherdetail[val] && this.model.otherdetail[val].f_typenumber[0]) {
+        let unitprice = this.$appdata.getSingleValue(this.model.otherdetail[val].f_typenumber[0])
         if (unitprice !== undefined) {
           this.model.otherdetail[val].f_unitprice = unitprice
         }

package/src/components/revenue/comprehen/Maintenance/revenue/StockListmain.vue

@@ -110,8 +110,10 @@
                   <input @keyup.enter="search" style="width:60%" type="checkbox" v-model='checked1' :checked="$parent.$parent.$parent.checked1"
                          @click="$parent.$parent.$parent.checkedALL()"></th>
                 <th><nobr>收费编号</nobr></th>
+                <th><nobr>表号</nobr></th>
                 <th><nobr>用户编号</nobr></th>
                 <th><nobr>用户姓名</nobr></th>
+                <th><nobr>证件号码</nobr></th>
                 <th><nobr>收费形式</nobr></th>
                 <th><nobr>是否有效</nobr></th>
                 <th><nobr>收据类型</nobr></th>
@@ -133,8 +135,10 @@
                 <input @keyup.enter="search" style="width:60%" type="checkbox" checked="checked" name="opertioninput"
                        @click="$parent.$parent.$parent.checked(row)"></td>
               <td style="text-align: center;"><nobr>{{row.id}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.idnumber}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_bill_style}}</nobr></td>
@@ -207,8 +211,10 @@ const myMap = new Map()
         condition: '',
         getfield: {
           'id': '收费编号',
+          'f_meternumber': '表号',
           'f_userinfo_code': '用户编号',
           'f_user_name': '用户姓名',
+          'idnumber': '证件号码',
           'f_payment': '收费形式',
           'f_state': '是否有效',
           'f_bill_style': '收据类型',

package/src/filiale/kelai/CardMeterCenter.vue

@@ -394,6 +394,7 @@
 
   let asyncCardMeterCenter = async function (self) {
     await self.$getConfig(self, 'CardMeterCenter')
+    await self.getList()
     console.log('卡表收费config', self.config)
 
     // 添加 “系统余额透支” 付款方式
@@ -582,7 +583,6 @@
       }
       this.$els.fpregas.focus()
       asyncCardMeterCenter(this)
-      this.getList()
     },
     watch: {
       'model.f_payment.length' (val) {

package/src/filiale/kelai/GarbageCharge.vue

@@ -71,6 +71,7 @@
 <script>
 let readyGen = async function (self) {
   await self.$getConfig(self, 'GarbageCharge')
+  await self.getList()
   // 默认打印格式
   self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
   self.model.f_payment = [self.config.payment]
@@ -122,7 +123,6 @@ export default {
   props: ['row'],
   ready () {
     readyGen(this)
-    this.getList()
   },
   methods: {
     async getList () {

package/src/filiale/kelai/IOTMeterCenter.vue

@@ -385,6 +385,7 @@
   }
   let asyncCardMeterCenter = async function (self) {
     await self.$getConfig(self, 'IOTMeterCenter')
+    await self.getList()
     console.log('卡表收费config', self.config)
 
     // 添加 “系统余额透支” 付款方式
@@ -540,7 +541,6 @@
       this.model.f_pregas = ''
       document.getElementById('pregasFocue').focus()
       asyncCardMeterCenter(this)
-      this.getList()
     },
     watch: {
       'model.f_payment.length' (val) {

package/src/filiale/kelai/MachineMeterCenter.vue

@@ -204,6 +204,7 @@ import {HttpResetClass} from 'vue-client'
 
 let asyncMachineMeterCenter = async function (self) {
   await self.$getConfig(self, 'MachineMeterCenter')
+  await self.getList()
   self.data.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
   self.data.f_payment = [self.config.payment]
   self.data.f_use_type = self.config.billType
@@ -377,7 +378,6 @@ export default {
     }
     document.getElementById('f_collection').focus()
     asyncMachineMeterCenter(this)
-    this.getList()
   },
   events: {
     // 删除Resid数组元素

package/src/filiale/shangluo/sale.js

@@ -4,6 +4,10 @@ let specialComp = {
   'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) },
   'file-user-essential-info': (resolve) => { require(['./UserEssentialInfoTest'], resolve) },
   // 物联网表收费
-  'iot-meter-center': (resolve) => { require(['./IOTMeterCenter'], resolve) }
+  'iot-meter-center': (resolve) => { require(['./IOTMeterCenter'], resolve) },
+  //机表收费
+  'machine-meter-center': (resolve) => { require(['./MachineMeterCenter'], resolve) },
+  //卡表
+  'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) }
 }
 exports.specialComp = specialComp