sale-client 3.6.152 → 3.6.153

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/']
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

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

@@ -36,7 +36,7 @@
             <div class="col-sm-4 form-group"
                  :class="[$v.f_preamount.required || $v.f_preamount.dctest? 'has-error' : 'has-success']">
               <label for="f_preamount" class=" font_normal_body">预购金额</label>
-              <input class="input_search" style="width:60%" @blur="preamount()" type="number" v-model="model.f_preamount"
+              <input class="input_search" style="width:60%" @blur="preamount()" type="number" v-model="model.f_preamount" id="f_preamount"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ] }'
                      :disabled="config.calculatePreByCollection"
                      v-scale="[model.f_preamount, row.f_fee_decimal||4]" placeholder="预购金额" >
@@ -554,7 +554,7 @@
       this.model.f_balance = this.row.f_alias === 'QiaoSong' ? Math.trunc(this.row.f_balance) : this.row.f_balance
       this.model.f_preamount = ''
       this.model.f_pregas = ''
-      document.getElementById('pregasFocue').focus()
+      document.getElementById('f_preamount').focus()
       asyncCardMeterCenter(this)
       this.getRandomId()
     },

package/src/components/common/userinfo_detail/UserBaseInfo.vue

@@ -178,8 +178,8 @@
               <label class="col-sm-3 control-label">阀门状态</label>
               <div class="col-sm-3">
                 <p class="form-control-static">
-                  {{row.f_valvestate == 0 ? '已开阀' : '已关阀'}}
-                  <button class="btn btn-link" type="button" style="margin-left: 20%" @click="valvecontrol">{{row.f_valvestate == 0 ? '关阀' : '开阀'}}</button>
+                  {{row.f_valvestate === '0'  ? '已开阀' : '已关阀'}}
+                  <button class="btn btn-link" type="button" style="margin-left: 20%" @click="valvecontrol">{{row.f_valvestate === '0'  ? '关阀' : '开阀'}}</button>
                 </p>
               </div>
           </div>

package/src/components/revenue/comprehen/Maintenance/pictureManage/pictureListMaintain.vue

@@ -317,7 +317,11 @@ const myMap = new Map()
                   }
                   let temp = res.data.array[j].f_downloadpath
                   let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
-                  res.data.array[j].f_downloadURL = 'http://' + location.host + '/' + URL
+                  if(res.data.array[j].fusetype == '安检照片') {
+                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/rs/image/file/' + res.data.array[j].f_filename
+                  }else {
+                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/' + URL
+                  }
                   this.files[i].arrays.push(res.data.array[j])
                 }
               }