apply-clients 3.4.2-FuGu-30 → 3.4.3

package/build/dev-server.js

@@ -1,119 +1,119 @@
-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()
-// 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://127.0.0.1:8082'
-
-var proxyTable = {
-  '/rs/logic/getSaleInitData': {
-    target: ldap
-  },
-  '/rs/workflow': {
-    target: applyinstall
-  },
-  '/rs/vue': {
-    target: ldap
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: ldap
-  },
-  // 街道查询
-  '/rs/sql/address_getstreetlist': {
-    target: ldap
-  },
-  // 创建街道
-  '/rs/logic/address_updatestreet': {
-    target: ldap
-  },
-  // 创建小区
-  '/rs/logic/address_updatearea': {
-    target: ldap
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: ldap
-  },
-  '/rs/logic/getInitData': {
-    target: ldap?ldap:applyinstall
-  },
-  '/rs/logic/getLogin': {
-    target: ldap
-  },
-  '/rs/file': {    // 文件上传
-    target: applyinstall
-  },
-  '/project': {    // 文件回显
-    target: applyinstall
-  },
-  '/rs': {
-    target: applyinstall
-  },
-  '/ws': {
-    target: applyinstall,
-    ws: true // 代理webSocket
-  }
-}
-
-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(8300, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8300')
-})
+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()
+// 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://127.0.0.1:8080'
+
+var proxyTable = {
+  '/rs/logic/getSaleInitData': {
+    target: ldap
+  },
+  '/rs/workflow': {
+    target: applyinstall
+  },
+  '/rs/vue': {
+    target: ldap
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: ldap
+  },
+  // 街道查询
+  '/rs/sql/address_getstreetlist': {
+    target: ldap
+  },
+  // 创建街道
+  '/rs/logic/address_updatestreet': {
+    target: ldap
+  },
+  // 创建小区
+  '/rs/logic/address_updatearea': {
+    target: ldap
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: ldap
+  },
+  '/rs/logic/getInitData': {
+    target: ldap?ldap:applyinstall
+  },
+  '/rs/logic/getLogin': {
+    target: ldap
+  },
+  '/rs/file': {    // 文件上传
+    target: applyinstall
+  },
+  '/project': {    // 文件回显
+    target: applyinstall
+  },
+  '/rs': {
+    target: applyinstall
+  },
+  '/ws': {
+    target: applyinstall,
+    ws: true // 代理webSocket
+  }
+}
+
+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(8300, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8300')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.4.2-FuGu-30",
+  "version": "3.4.3",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -96,7 +96,7 @@
     "system-clients": "3.1.87",
     "system-phone": "1.2.80-49",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.50-1",
+    "vue-client": "1.24.33",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

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/apply.js

@@ -1,77 +1,87 @@
-import Vue from 'vue'
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-/** ****************服务插件*********************/
-
-export default function () {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-/** ***************************报建模块*********************************/
-  /**  报建流程业务 **/
-  // 报建流程业务总入口
-  Vue.component('exploration-user', (resolve) => { require(['./components/product/Process/ExplorationUser'], resolve) })
-  // 报建流程业务总入口页面list布局
-  Vue.component('exploration-select', (resolve) => { require(['./components/product/Process/ExplorationSelect'], resolve) })
-  // 业务tab(control层)页
-  Vue.component('service-control', (resolve) => { require(['./components/product/Process/Service/ServiceControl'], resolve) })
-  // 公共业务显示(view层)页
-  Vue.component('service-view', (resolve) => { require(['./components/product/ServiceView'], resolve) })
-  Vue.component('onetomany', (resolve) => { require(['./components/product/Onetomany'], resolve) })
-  // 显示退回理由tab页
-  Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/Service/ShowBackReason'], resolve) })
-
-  /** 报建监控业务 **/
-  // 流程监控入口页
-  Vue.component('supervisory-control', (resolve) => { require(['./components/product/Supervisory/SupervisoryControl'], resolve) })
-  // 流程监控列表页
-  Vue.component('supervisory-list', (resolve) => { require(['./components/product/Supervisory/SupervisoryList'], resolve) })
-  // 业务tab(control层)页
-  Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
-  // 流程列表页
-  Vue.component('supervisory-chart', (resolve) => { require(['./components/product/Supervisory/SupervisoryhCart'], resolve) })
-
-  /** 报建功能业务 **/
-  // 报建功能业务总入口
-  Vue.component('install-function', (resolve) => { require(['./components/product/Function/InstallFunction'], resolve) })
-  // 报建功能工程列表
-  Vue.component('installinfoselect', (resolve) => { require(['./components/product/Function/InstallInfoSelect'], resolve) })
-  // 报建菜单页面控制层
-  Vue.component('function-service-control', (resolve) => { require(['./components/product/Function/Service/FunctionServiceControl'], resolve) })
-
-  /** 预约报建 **/
-  // Vue.component('order-apply', (resolve) => { require(['./components/product/Order/OrderApply'], resolve) })
-  // Vue.component('order-apply-list', (resolve) => { require(['./components/product/Order/OrderApplyList'], resolve) })
-  // Vue.component('order-message', (resolve) => { require(['./components/product/Order/OrderMessage'], resolve) })
-
-  // 终止报建页面入口
-  Vue.component('stop-apply', (resolve) => { require(['./components/product/Stop/StopApply'], resolve) })
-  Vue.component('stop-apply-list', (resolve) => { require(['./components/product/Stop/StopApplyList'], resolve) })
-
-  /** 报建收费记录 **/
-  Vue.component('apply-charge-search', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeSearch'], resolve) })
-  Vue.component('apply-charge-list', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeList'], resolve) })
-  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Print/printCharge'], resolve) })
-
-  // 地址管理
-  Vue.component('apply-address-userinfo-management', (resolve) => { require(['./components/product/Process/Processes/addressAndUserinfoManagement'], resolve) })
-  // 施工安装明细
-  Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
-  // 收费管理
-  Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
-
-  // 补充协议
-  Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
-  // 选择用户信息
-  Vue.component('select-userinfo', (resolve) => { require(['./components/product/Process/Processes/selectUserinfo'], resolve) })
-  // 选择报建项目
-  Vue.component('select-apply', (resolve) => { require(['./components/product/Process/Processes/selectApply'], resolve) })
-  // 设备管理
-  Vue.component('apply-devices-management', (resolve) => { require(['./components/product/Process/Processes/devicesManagement'], resolve) })
-  // 派工信息
-  Vue.component('apply-dispatchdetails', (resolve) => { require(['./components/product/Process/Processes/dispatchdetails'], resolve) })
-  Vue.component('apply-dispatch-list', (resolve) => { require(['./components/product/Process/Print/dispatchlist'], resolve) })
-  /** VueUtils **/
-  Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
-  Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/HighMeter'], resolve) })
-}
+import Vue from 'vue'
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+/** ****************服务插件*********************/
+
+export default function (filiale) {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+/** ***************************报建模块*********************************/
+  /**  报建流程业务 **/
+  // 报建流程业务总入口
+  Vue.component('exploration-user', (resolve) => { require(['./components/product/Process/ExplorationUser'], resolve) })
+  // 报建流程业务总入口页面list布局
+  Vue.component('exploration-select', (resolve) => { require(['./components/product/Process/ExplorationSelect'], resolve) })
+  // 业务tab(control层)页
+  Vue.component('service-control', (resolve) => { require(['./components/product/Process/Service/ServiceControl'], resolve) })
+  // 公共业务显示(view层)页
+  Vue.component('service-view', (resolve) => { require(['./components/product/ServiceView'], resolve) })
+  Vue.component('onetomany', (resolve) => { require(['./components/product/Onetomany'], resolve) })
+  // 显示退回理由tab页
+  Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/Service/ShowBackReason'], resolve) })
+
+  /** 报建监控业务 **/
+  // 流程监控入口页
+  Vue.component('supervisory-control', (resolve) => { require(['./components/product/Supervisory/SupervisoryControl'], resolve) })
+  // 流程监控列表页
+  Vue.component('supervisory-list', (resolve) => { require(['./components/product/Supervisory/SupervisoryList'], resolve) })
+  // 业务tab(control层)页
+  Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
+  // 流程列表页
+  Vue.component('supervisory-chart', (resolve) => { require(['./components/product/Supervisory/SupervisoryhCart'], resolve) })
+
+  /** 报建功能业务 **/
+  // 报建功能业务总入口
+  Vue.component('install-function', (resolve) => { require(['./components/product/Function/InstallFunction'], resolve) })
+  // 报建功能工程列表
+  Vue.component('installinfoselect', (resolve) => { require(['./components/product/Function/InstallInfoSelect'], resolve) })
+  // 报建菜单页面控制层
+  Vue.component('function-service-control', (resolve) => { require(['./components/product/Function/Service/FunctionServiceControl'], resolve) })
+
+  /** 预约报建 **/
+  // Vue.component('order-apply', (resolve) => { require(['./components/product/Order/OrderApply'], resolve) })
+  // Vue.component('order-apply-list', (resolve) => { require(['./components/product/Order/OrderApplyList'], resolve) })
+  // Vue.component('order-message', (resolve) => { require(['./components/product/Order/OrderMessage'], resolve) })
+
+  // 终止报建页面入口
+  Vue.component('stop-apply', (resolve) => { require(['./components/product/Stop/StopApply'], resolve) })
+  Vue.component('stop-apply-list', (resolve) => { require(['./components/product/Stop/StopApplyList'], resolve) })
+
+  /** 报建收费记录 **/
+  Vue.component('apply-charge-search', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeSearch'], resolve) })
+  Vue.component('apply-charge-list', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeList'], resolve) })
+
+  // 地址管理
+  Vue.component('apply-address-userinfo-management', (resolve) => { require(['./components/product/Process/Processes/addressAndUserinfoManagement'], resolve) })
+  // 施工安装明细
+  Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
+  // 收费管理
+  Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
+  Vue.component('apply-material-detailed', (resolve) => { require(['./components/product/Material/MaterialDetailed'], resolve) })
+  // 补充协议
+  Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
+  Vue.component('build-order-list', (resolve) => { require(['./components/product/Print/BuildOrder/buildOrderList'], resolve) })
+  /** 团购转散户 **/
+  Vue.component('apply-group-by-paper', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByPaper'], resolve) })
+  Vue.component('apply-group-by-main', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByMain'], resolve) })
+  Vue.component('apply-group-by-list', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByList'], resolve) })
+  Vue.component('business-apply', (resolve) => { require(['./components/product/Business/BusinessApply'], resolve) })
+  // 选择用户信息
+  Vue.component('select-userinfo', (resolve) => { require(['./components/product/Process/Processes/selectUserinfo'], resolve) })
+  // 选择报建项目
+  Vue.component('select-apply', (resolve) => { require(['./components/product/Process/Processes/selectApply'], resolve) })
+  // 设备管理
+  Vue.component('apply-devices-management', (resolve) => { require(['./components/product/Process/Processes/devicesManagement'], resolve) })
+
+  /** VueUtils **/
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
+  Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/HighMeter'], resolve) })
+
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}

package/src/applyAndroid.js

@@ -5,7 +5,7 @@ import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
 import ApplyLoadParams from './stores/ApplyLoadParams'
 /** ****************服务插件*********************/
 
-export default function () {
+export default function (filiale) {
   Vue.use(ApplyGetSaleParam)
   Vue.use(ApplyLoadParams)
   /** ***************************报建模块*********************************/
@@ -22,4 +22,11 @@ export default function () {
   Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
 
   Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
+
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/android`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
 }

package/src/components/android/AppTakePic.vue

@@ -120,7 +120,7 @@ export default {
       if (this.typelabel) {
         return this.$appdata.getParam(this.typelabel)
       }
-      return this.$appdata.getParam('文件类型')
+      return this.$appdata.getParam('使用类型')
     }
   },
   events: {

package/src/components/android/Process/AppExplorationUser.vue

@@ -58,6 +58,21 @@
                 close-on-select ></v-select>
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">报建性质：</label>
+            <div class="col-xs-8" >
+              <v-select
+                width="100%"
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+          </div>
           <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">用户地址：</label>
             <div class="col-xs-8" >
@@ -184,7 +199,8 @@ export default {
       }),
       criteriaShow: false,
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
-      defnames: [{label: '全部', value: ''}]
+      defnames: [{label: '全部', value: ''}],
+      applyNatures: [{label: '全部', value: ''}] // 报建性质
     }
   },
   ready () {
@@ -222,16 +238,19 @@ export default {
     },
     applyTypeChange () {
       if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
-        console.log("当前报建类型",this.$refs.cp.$refs.cri.model.f_apply_type)
         let http = new HttpResetClass()
         http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getDefnameByType`, {
           // http.load('POST', 'rs/logic/getDefnameByType', {
           f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
         }, {resolveMsg: null, rejectMsg: null}).then((res) => {
           this.defnames = [{label: '全部', value: ''}, ...res.data]
+
+          this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
         })
       } else {
         this.defnames = [{label: '全部', value: ''}]
+
+        this.applyNatures = [{label: '全部', value: ''}]
       }
     }
   },