sale-client 3.5.61 → 3.5.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.61",
+  "version": "3.5.62",
   "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/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