apply-clients 7.1.36-yuchuan-21 → 7.1.36-yuchuan-24

package/build/dev-server.js

@@ -6,14 +6,14 @@ var proxyMiddleware = require('http-proxy-middleware')
 var app = express()
 var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
-// var ldap = 'http://193.168.1.44:8600/'
+var ldap = 'http://193.168.1.44:8600/'
 // var applyinstall = 'http://121.36.79.201:8400'
 // var ldap = 'http://193.168.1.64:8082'
-var ldap = 'http://61.134.61.238:8655'
-var applyinstall = 'http://61.134.61.238:8655'
-// var applyinstall = 'http://193.168.1.44:8600/'
-// var fadada = 'http://193.168.1.44:8600/'
-var fadada = 'http://61.134.61.238:8655'
+// var ldap = 'http://61.134.61.238:8555'
+// var applyinstall = 'http://61.134.61.238:8555'
+var applyinstall = 'http://193.168.1.44:8600/'
+var fadada = 'http://193.168.1.44:8600/'
+// var fadada = 'http://61.134.61.238:8555'
 // var fadada = 'http://127.0.0.1:8080/'
 var proxyTable = {
   '/testfiles': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.36-yuchuan-21",
+  "version": "7.1.36-yuchuan-24",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/android/Process/Processes/AppInstallationDetails.vue

@@ -614,6 +614,33 @@ export default {
           throw '表读数必须大于0小于或等于1.5！'
         }
       }
+      if (this.userfile.f_gasbrand_id && this.userfile.f_meternumber) {
+        let data = {
+          f_meternumber: this.userfile.f_meternumber,
+          f_gasbrand_id: this.userfile.f_gasbrand_id
+        }
+        if (this.userfile.f_user_id) {
+          data.f_user_id = this.userfile.f_user_id
+        }
+        let http = new HttpResetClass()
+        let res = await http.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/meterbrandsNumberValidate`, {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '表号验证失败！！'
+        })
+        console.log(`查询结果${res.data}`)
+        console.log(res.data)
+        if (!/^\d{12}$/.test(this.userfile.f_meternumber)) {
+          if(!/^\d{14}$/.test(this.userfile.f_meternumber)){
+            this.$showAlert('表号不符合规则', 'danger', 3000)
+            return
+          }
+        }
+        if (res.data === '表号已存在' || res.data === '表号无效') {
+          this.userfile.f_meternumber = ''
+          this.$showAlert(res.data, 'warning', 3000)
+          return
+        }
+      }
       let data = {
         user: Vue.user,
         userinfo: this.userinfo,
@@ -662,6 +689,12 @@ export default {
         })
         console.log(`查询结果${res.data}`)
         console.log(res.data)
+        if (!/^\d{12}$/.test(this.userfile.f_meternumber)) {
+          if(!/^\d{14}$/.test(this.userfile.f_meternumber)){
+            this.$showAlert('表号不符合规则', 'danger', 3000)
+            return
+          }
+        }
         if (res.data === '表号已存在' || res.data === '表号无效') {
           this.userfile.f_meternumber = ''
           this.$showAlert(res.data, 'warning', 3000)