apply-clients 3.3.72 → 3.3.75

package/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ApplyClient</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

package/build/dev-server-app.js

@@ -1,76 +1,76 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var proxyTable = {
-  '/rs': {
-    target: 'http://192.168.20.27:8555'
-    // target: 'http://192.168.30.86:8077'
-  },
-  '/AndroidRest/rs': {
-    target: 'http://192.168.20.27:8555'
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var proxyTable = {
+  '/rs': {
+    target: 'http://192.168.20.27:8555'
+    // target: 'http://192.168.30.86:8077'
+  },
+  '/AndroidRest/rs': {
+    target: 'http://192.168.20.27:8555'
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/build/dev-server.js

@@ -8,8 +8,8 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://192.168.50.4:8400'
-var applyinstall = 'http://192.168.50.4:8400'
+var ldap = 'http://192.168.20.28:8400'
+var applyinstall = 'http://192.168.20.28:8400'
 var proxyTable = {
   '/wx': {
     target: ldap
@@ -32,6 +32,9 @@ var proxyTable = {
   '/rs/logic/updateApplyOrder': {
     target: ldap
   },
+  '/rs/sql/getStockMaterial': {
+    target: 'http://127.0.0.1:8080'
+  },
   '/rs/logic/getSaleInitData': {
     target: ldap
   },
@@ -58,9 +61,6 @@ var proxyTable = {
   '/rs/file': {    // 文件上传
     target: applyinstall
   },
-  '/files': {
-    target: applyinstall
-  },
   '/project': {    // 文件回显
     target: applyinstall
   },

package/package.json

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

package/src/App.vue

@@ -1,20 +1,20 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <route :comp="{name: 'login'}"></route>
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-  export default {
-
-
-  }
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <route :comp="{name: 'login'}"></route>
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+  export default {
+
+
+  }
+</script>

package/src/applyAndroid.js

@@ -26,6 +26,9 @@ export default function () {
   Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
   Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
   Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
-
+  // 选择用户信息
+  Vue.component('select-userinfo', (resolve) => { require(['./components/android/Process/Processes/selectUserinfo'], resolve) })
+  // 选择报建项目
+  Vue.component('select-apply', (resolve) => { require(['./components/android/Process/Processes/selectApply'], resolve) })
   Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
 }

package/src/components/android/AppServiceView.vue

@@ -1,9 +1,11 @@
 <template>
   <div class="form-horizontal select-overspread">
+    <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
+    <form>
     <div v-for="(index,item) in data.fields">
       <!--input-->
       <div :style="item.style ? item.style : ''"
-           v-if="(item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email') && !item.hidden && (item.device === 'app' || !item.device)"
+           v-if="(item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email') && !item.hidden && (item.device === 'app' || !item.device)&& (item.label !== '证件号码')&&(item.label !== '身份证') && (item.label !== '用户电话')"
            :class="[item.required && !(item.value) ? 'apply-has-error' : '', item.bootstraped ? item.bootstraped + ' form-group app-input':'col-xs-12 form-group app-input']">
         <label class="control-label-justify">{{item.label}}</label>
         <div :style="item.value_style ? item.value_style:''"
@@ -22,6 +24,54 @@
         </div>
       </div>
 
+      <!--input身份证验证-->
+      <div :style="item.style ? item.style : ''"
+       v-if="(item.label==='身份证') || (data.f_credentials === '身份证' && item.label === '证件号码')"
+           :class="[$v.f_idnumber2.identityCardValid ? 'apply-has-error' : '',item.bootstraped ? item.bootstraped + ' form-group app-input':'col-xs-12 form-group app-input']">
+        <label class="control-label-justify">{{item.label}}</label>
+        <div :style="item.value_style ? item.value_style:''"
+             :class="item.value_bootstraped ? item.value_bootstraped : 'col-xs-8'">
+          <input class="" style="width: 100%"
+                 :type="item.type"
+                 maxlength="18"
+                 v-model="data.fields[index].value"
+                 :placeholder="item.placeholder"
+                 :value="data.fields[index].value"
+                 onKeypress="return(/[\d\.]/.test(String.fromCharCode(event.keyCode)))"
+                 :readonly="item.readonly"
+                 v-validate:f_idnumber2='{identityCardValid: true}'
+                 @change="onchange(index)"
+                 @blur="onblur(index)"
+                 @input="oninput(index)"
+          />
+        </div>
+      </div>
+
+
+      <!--input手机号验证-->
+      <div :style="item.style ? item.style : ''"
+           v-if="item.label === '用户电话'"
+           :class="[$v.f_user_phone.minlength || $v.f_user_phone.maxlength ? 'apply-has-error' : '',item.bootstraped ? item.bootstraped + ' form-group app-input':'col-xs-12 form-group app-input']">
+        <label class="control-label-justify">{{item.label}}</label>
+        <div :style="item.value_style ? item.value_style:''"
+             :class="item.value_bootstraped ? item.value_bootstraped : 'col-xs-8'">
+          <input class="" style="width: 100%"
+                 maxlength="18"
+                 type="number"
+                 onKeypress="return(/[\d\.]/.test(String.fromCharCode(event.keyCode)))"
+                 oninput="if(value.length > 11) value=value.slice(0,11)"
+                 v-validate:f_user_phone="{minlength: 11, maxlength: 11  }"
+                 v-model="data.fields[index].value"
+                 :placeholder="item.placeholder"
+                 :value="data.fields[index].value"
+                 :readonly="item.readonly"
+                 @change="onchange(index)"
+                 @blur="onblur(index)"
+                 @input="oninput(index)"
+          />
+        </div>
+      </div>
+
       <!--select-->
       <div :style="item.style ? item.style : ''"
            v-if="item.type==='select' && !item.hidden  && (item.device === 'app' || !item.device)"
@@ -34,6 +84,7 @@
             :placeholder="item.placeholder"
             :search="item.search"
             close-on-select value-single
+            @select-search="selectSearch($arguments,index)"
             :options="data.fields[index].options"
             v-model="data.fields[index].value"
             :value.sync="data.fields[index].value"
@@ -108,7 +159,7 @@
       </div>
     </div>
 
-    <div class="col-sm-12 col-xs-12">
+    <div class="col-sm-12 col-xs-12" id="test11">
       <accordion one-at-a-time="true">
         <panel v-for="(i,item) in data.onetomany" :header="item.title" :is-open="false" type="primary">
           <app-onetomany :onetomany="item" :index="i"></app-onetomany>
@@ -128,7 +179,16 @@
               :disabled="button.disabled && disable_button"
               style="min-width:100px"
               :class="button.disabled && disable_button ? 'btn btn-default button_spacing' : 'btn btn-primary button_spacing'"
-              v-if="!button.hidden"
+              v-if="!button.hidden && button.button_name !=='提交'&& button.button_name !=='确认'"
+              @click.prevent="click_but(button)"
+      >
+        {{button.button_name}}
+      </button>
+      <button v-for="(index,button) in data.buttons"
+              :disabled="(button.disabled && disable_button) || (!$v.valid)"
+              style="min-width:100px"
+              :class="button.disabled && disable_button || (!$v.valid) ? 'btn btn-default button_spacing' : 'btn btn-primary button_spacing'"
+              v-if="!button.hidden && (button.button_name ==='提交'||button.button_name ==='确认')"
               @click.prevent="click_but(button)"
       >
         {{button.button_name}}
@@ -238,6 +298,7 @@
         </button>
       </footer>
     </modal>
+</form>>
   </div>
 </template>
 <script>
@@ -519,6 +580,12 @@ export default {
           }
         }
       }
+    },
+    selectSearch(event, index) {
+      if (this.data.fields[index].selectSearch) {
+        this.$dispatch(this.data.fields[index].selectSearch, event[0], index)
+      }
+      this.$dispatch('selectSearch', event[0], index)
     }
   },
   events: {