apply-clients 3.3.71 → 3.3.73-31

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.30.94:8555'
-    // target: 'http://192.168.30.86:8077'
-  },
-  '/AndroidRest/rs': {
-    target: 'http://192.168.30.94: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,14 +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 ldap = 'http://192.168.20.28:8400'
-var ldap = 'http://192.168.20.28:8400'
-// var ldap = 'http://61.163.127.69:8555'
-// var applyinstall = 'http://192.168.20.27:8400'
-var applyinstall = 'http://127.0.0.1:8080'
-// var applyinstall = 'http://61.163.127.69:8555'
-
+var ldap = 'http://192.168.20.27:8555'
+var applyinstall = 'http://192.168.20.27:8555'
 var proxyTable = {
   '/wx': {
     target: ldap
@@ -56,7 +50,7 @@ var proxyTable = {
     target: ldap
   },
   '/rs/logic/getInitData': {
-    target: ldap?ldap:applyinstall
+    target: ldap
   },
   '/rs/logic/getLogin': {
     target: ldap

package/et --hard a251245ba614c0c56fa5f8635a803359716e66e8

@@ -0,0 +1,299 @@
+commit 7ca626be97595d83306544d73f12a361f6fadbb0 (HEAD -> master, origin/master, origin/HEAD)
+Author: 杜朋 <000000>
+Date:   Fri Apr 8 17:15:32 2022 +0800
+
+    改请求
+
+commit aa551092d2ee782b7deb7d80629af5c05387a413
+Author: 庞高展 <979817893@qq.com>
+Date:   Fri Apr 8 15:40:23 2022 +0800
+
+    添加安装地址
+
+commit 7f1e4ff9c73ca6b1e5334d6a37ca39bb35213696
+Author: 庞高展 <979817893@qq.com>
+Date:   Fri Apr 8 11:42:19 2022 +0800
+
+    调增区域组件地址
+
+commit 59e417331300aeb3f95b3d4607c5bd2d334f55fe
+Author: 杜朋 <000000>
+Date:   Wed Apr 6 18:00:11 2022 +0800
+
+    周口手机app新需求
+
+commit a0f4e84f40fb542fcafa7bda01144c7abe45290f
+Author: 李猛 <609363665@qq.com>
+Date:   Wed Apr 6 15:25:27 2022 +0800
+
+    流程监控判断材料领用状态更新
+
+commit b932b80671cc7bce31dfd953898bd707011fe335
+Author: 庞高展 <979817893@qq.com>
+Date:   Wed Apr 6 14:51:56 2022 +0800
+
+    去除材料明细材料审核搜索条件
+
+commit e16fcf1bcf68a0691d1d6d5c73031af32d51e597
+Author: 李猛 <609363665@qq.com>
+Date:   Tue Apr 5 17:58:26 2022 +0800
+
+    流程监控查询修订
+
+commit 82256939a172bf5e2147f9c74e9cc0706887559d
+Author: 李猛 <609363665@qq.com>
+Date:   Tue Apr 5 14:15:05 2022 +0800
+
+    版本升级（报警器）
+
+commit 736e8590467f9fd427154b5f50fd4ed1040c270b
+Author: 李猛 <609363665@qq.com>
+Date:   Thu Mar 31 16:56:09 2022 +0800
+
+    流程监控增加领用人、发货人等字段
+
+commit e879dfd3ee4b411a5746f2c2b714d9136ec6ea32
+Author: 李猛 <609363665@qq.com>
+Date:   Wed Mar 30 11:58:14 2022 +0800
+
+    提示内容修订
+
+commit 5f52dc01ea45adf08577bcafb7bfff6a9ba2146c
+Author: 李猛 <609363665@qq.com>
+Date:   Wed Mar 30 08:30:20 2022 +0800
+
+    报警器流程缴费时提示语句修改
+
+commit c47f752028aa2731f63cf9c9ff97e7d0b307ee42
+Author: 庞高展 <979817893@qq.com>
+Date:   Tue Mar 29 17:21:11 2022 +0800
+
+    材料明细导出excel 新增字段
+
+commit 80047ddb15bf222a0f9fd6f18c23dc0e0ccf8cbb
+Author: 庞高展 <979817893@qq.com>
+Date:   Tue Mar 29 08:03:19 2022 +0800
+
+    更改报警器验证地址
+
+commit 0195970b906f6d32deafc0120ba3197fe15973d4
+Author: 庞高展 <979817893@qq.com>
+Date:   Mon Mar 28 17:44:16 2022 +0800
+
+    更改报警器校验接口地址
+
+commit 7529503525318cf62e7e6e1cb07a03904b0c5c73
+Author: 庞高展 <979817893@qq.com>
+Date:   Mon Mar 28 11:28:46 2022 +0800
+
+    更改app 获取区域地址
+
+commit 31a867784beaac1445f69adebfb5d3affb7dab12
+Author: 李猛 <609363665@qq.com>
+Date:   Mon Mar 28 08:40:08 2022 +0800
+
+    手机报建类型
+
+commit 63f36d57169951898f087bb9c023f739112d2b1e
+Author: 成佳宁 <000000>
+Date:   Sun Mar 27 13:12:24 2022 +0800
+
+    3.27测试版本更新（信息公司）
+
+commit 6fa4ec4045a40d4983e8bfa8aa2cb6362f620751
+Author: 庞高展 <979817893@qq.com>
+Date:   Fri Mar 25 17:35:19 2022 +0800
+
+    代码上传
+
+commit 7a79bc657d2bc49411826894b66b16d12cc7e402
+Author: 庞高展 <979817893@qq.com>
+Date:   Fri Mar 25 17:17:26 2022 +0800
+
+    报警器流程选取材料优化
+
+commit 92269e4a6ddfc1c6a26d3603efb21c70ae4c171f
+Author: 庞高展 <979817893@qq.com>
+Date:   Fri Mar 25 13:52:54 2022 +0800
+
+    配置请求路径
+
+commit f93c9a37817ab829a3fe9fbf83255bf4826fbca9
+Author: 庞高展 <979817893@qq.com>
+Date:   Fri Mar 25 13:17:14 2022 +0800
+
+    报警器流程报建档案信息推送到汉威系统
+
+commit 44d18383c404c5390eadc49db4a2491a9be1bc18
+Author: 王钲辉 <wangzh1617@163.com>
+Date:   Thu Mar 24 11:47:52 2022 +0800
+
+    报建需求修改
+
+commit 5239a88d49d3f230f70f2fc63db051b481ed25bf
+Author: 庞高展 <979817893@qq.com>
+Date:   Thu Mar 24 10:50:44 2022 +0800
+
+    区域地址必选, 保存区域地址
+
+commit 03a7cc0b31166298581c28993bb3ce76f797a879
+Author: 庞高展 <979817893@qq.com>
+Date:   Mon Mar 21 11:44:11 2022 +0800
+
+    前端地址下拉框组件及推送插入点
+
+commit ad79329fc91a999a4c1e6dfcbf08962317144192
+Author: 李猛 <609363665@qq.com>
+Date:   Fri Mar 18 17:19:47 2022 +0800
+
+    报警器流程地址三级联动处理
+
+commit c36298fab6c91a595ce7f1ba9be51572086b3bd2
+Author: 何文强 <767849845@qq.com>
+Date:   Thu Mar 17 16:52:29 2022 +0800
+
+    版本升级
+
+commit f7d05454517643c6a60f02a94801c4f43755953c
+Author: 杜朋 <000000>
+Date:   Thu Mar 17 10:21:34 2022 +0800
+
+    验证问题处理
+
+commit f58d7193a771033f07b0eb788b7dd1433e20b36f
+Author: 何文强 <767849845@qq.com>
+Date:   Wed Mar 16 15:13:47 2022 +0800
+
+    手机端报装发起问题修改
+
+commit 2a96465378151c974841ba9b051b4496b8aa2ef8
+Author: 成佳宁 <000000>
+Date:   Wed Mar 16 13:41:42 2022 +0800
+
+    3.16测试版本更新
+
+commit 0d46995f5c03d9ddec9c187c77ca202b36caedcf
+Author: 李猛 <609363665@qq.com>
+Date:   Tue Mar 15 09:39:57 2022 +0800
+
+    28测试
+
+commit 11edd322629153c93415fa5ecec9cb7c3cc32f89
+Author: pgz <979817893@qq.com>
+Date:   Mon Mar 14 16:25:36 2022 +0800
+
+    pc端新增报警器流程
+
+commit a251245ba614c0c56fa5f8635a803359716e66e8
+Author: 杜朋 <000000>
+Date:   Mon Mar 14 14:13:07 2022 +0800
+
+      "version": "3.3.74",
+
+commit 09f0dd25c3d4f824cfbb7658d1343941ca8472a9
+Author: 杜朋 <000000>
+Date:   Mon Mar 14 13:42:27 2022 +0800
+
+    app显示报装备注
+    app实现手机号码及身份证验证
+
+commit a5d2ec560e8b96263cbc32d2c903fe12045408d4
+Merge: 5e665e4 18c6bfe
+Author: 何文强 <767849845@qq.com>
+Date:   Mon Mar 14 09:52:18 2022 +0800
+
+    Merge remote-tracking branch 'origin/master'
+
+commit 18c6bfe060a51b66e59c5af8080378dd959d2b41
+Author: 杜朋 <000000>
+Date:   Fri Mar 11 14:51:26 2022 +0800
+
+      "version": "3.3.73",
+
+commit fc0d5186b8dba01f46cab481b2b0581b9977f4cf
+Author: 杜朋 <000000>
+Date:   Fri Mar 11 14:44:12 2022 +0800
+
+    身份证及手机号验证
+
+commit 5e665e4331c61bede1586c53dac1f2b51c07a10f
+Merge: ffdd6ad 1e5a9fb
+Author: 何文强 <767849845@qq.com>
+Date:   Fri Mar 11 13:51:49 2022 +0800
+
+    Merge remote-tracking branch 'origin/master'
+    
+    # Conflicts:
+    #       package.json
+
+commit ffdd6ad6bbf55e494920b9ad563bdaa0d8619f0e
+Author: 何文强 <767849845@qq.com>
+Date:   Fri Mar 11 13:51:29 2022 +0800
+
+    手机端报装发起
+
+commit 1e5a9fb4ac02465273c1633c076903c59854df6a
+Author: 李奇璋 <3481126153@qq.com>
+Date:   Thu Mar 10 17:17:32 2022 +0800
+
+    + apply-clients@3.3.72
+
+commit f4835a8d70ea5d5f5f478cd9dd35c075597f63b5
+Author: 李奇璋 <3481126153@qq.com>
+Date:   Thu Mar 10 17:12:47 2022 +0800
+
+    修改附件
+
+commit 07c88a6e3089b423c44988e0f696551930a3ddf8
+Author: 李奇璋 <3481126153@qq.com>
+Date:   Wed Mar 9 14:51:08 2022 +0800
+
+    修改附件
+
+commit 1e5aa7c9f30de8b0da94940e87bb4c575fd810a8
+Author: 李猛 <609363665@qq.com>
+Date:   Fri Mar 4 15:56:14 2022 +0800
+
+    手机端访问配置
+
+commit 7a26568583704484f9d00947fdd35d4c68db2c07
+Author: 李猛 <609363665@qq.com>
+Date:   Mon Jan 24 09:34:01 2022 +0800
+
+    报建签名
+
+commit 86ca7335cb92c30d8dc68a4827f2d859d8d82739
+Author: 李猛 <609363665@qq.com>
+Date:   Thu Jan 20 11:30:58 2022 +0800
+
+    流程监控增加施工单位查询条件，pc/手机端
+
+commit 22948ac0698f9400fe9eac35a7d85cd488d160cd
+Author: 李猛 <609363665@qq.com>
+Date:   Fri Jan 14 15:40:14 2022 +0800
+
+    发包
+
+commit 808bdb693b9e9e5c5372b57735f14c048cc15515
+Author: 张恒 <1425279634@qq.com>
+Date:   Thu Jan 13 13:37:24 2022 +0800
+
+    pc稍后处理逻辑修改
+
+commit 658f18a17cd9ca9082e4ae90ff01eaeb9f083e30
+Author: 张恒 <1425279634@qq.com>
+Date:   Thu Jan 13 13:18:55 2022 +0800
+
+    app稍后处理bug处理
+
+commit d393093a6916e9fac82e47595b6e0fb0c76d2143
+Author: 李猛 <123456>
+Date:   Wed Jan 12 18:04:45 2022 +0800
+
+    流程业务bug处理
+
+commit 114799c4fa6568b4ac46b1bdd61663bfa1c7f2af
+Author: 张恒 <1425279634@qq.com>
+Date:   Tue Jan 11 12:06:42 2022 +0800
+
+    + apply-clients@3.3

package/package.json

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

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

@@ -34,6 +34,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 +109,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>
@@ -519,6 +520,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: {