apply-clients 3.4.14 → 3.4.15

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://121.36.106.17:8400/'
-var applyinstall = 'http://121.36.106.17:8400/'
+var ldap = 'http://117.33.181.102:8401/'
+var applyinstall = 'http://117.33.181.102:8401/'
 
 var proxyTable = {
   '/rs/logic/getSaleInitData': {

package/package.json

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

package/src/AndroidApp.vue

@@ -2,12 +2,12 @@
   <!-- <app-base> -->
   <div id="android-app">
     <article>
-<!--      <route :comp="{name: 'app-exploration-user'}" name="root"></route>-->
-<!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
-<!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
-<!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
-<!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
-      <route :comp="{name: 'login-app'}" name="root"></route>
+<!--      <route :comp="{name: 'build-tsak'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
+            <route :comp="{name: 'login-app'}" name="root"></route>
     </article>
     <time-out></time-out>
     <message-box></message-box>
@@ -18,18 +18,18 @@
 
 <script>
 
-  import AlertBox from "vue-client/src/components/AlertBox";
-  import AlertBoxBatch from "vue-client/src/components/AlertBoxBatch";
+import AlertBox from "vue-client/src/components/AlertBox";
+import AlertBoxBatch from "vue-client/src/components/AlertBoxBatch";
 
-  export default {
-    ready () {
-      if(!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("Error occured: " + error.message)
-          return false
-        }
+export default {
+  ready () {
+    if(!window.onerror) {
+      window.onerror = function (message, file, line, col, error) {
+        // HostApp.alert("Error occured: " + error.message)
+        return false
       }
-    },
-    components: { AlertBox, AlertBoxBatch }
-  }
+    }
+  },
+  components: { AlertBox, AlertBoxBatch }
+}
 </script>

package/src/android.js

@@ -1,21 +1,21 @@
-import Vue from 'vue'
-import AndroidApp from './AndroidApp'
-import { all } from 'vue-client'
-import apply from './apply'
-import {systemphonegrid} from 'system-phone'
-import applyAndroid from './applyAndroid'
-
-all()
-apply()
-applyAndroid()
-systemphonegrid()
-
-require('./android-bootstrap/less/bootstrap.less')
-require('./expandcssAndroid.less')
-
-Vue.android = true
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { AndroidApp }
-})
+import Vue from 'vue'
+import AndroidApp from './AndroidApp'
+import { all } from 'vue-client'
+import apply from './apply'
+import {systemphonegrid} from 'system-phone'
+import applyAndroid from './applyAndroid'
+
+all()
+apply()
+applyAndroid('guangxi')
+systemphonegrid()
+
+require('./android-bootstrap/less/bootstrap.less')
+require('./expandcssAndroid.less')
+
+Vue.android = true
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { AndroidApp }
+})

package/src/applyAndroid.js

@@ -1,46 +1,53 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-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('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
-  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
-  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
-  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
-  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
-  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
-
-  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
-  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
-  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
-  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
-
-  Vue.component('app-add-material-science', (resolve) => { require(['./components/android/Process/Processes/AppAddMaterialScience'], resolve) })
-
-  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
-  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) })
-
-  // 区域 地址下拉框联动组件
-  Vue.component('app-res-area-select', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelect'], resolve) })
-  Vue.component('app-res-area-select-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelectGroup'], resolve) })
-  Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
-  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
-  // 地图组件
-  Vue.component('app-res-area-map-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaMapGroup'], resolve) })
-  // 扫描二维码
-  Vue.component('app-qrcode-reader', (resolve) => { require(['./components/android/AreaSelect/AppQrcodeReader'], resolve) })
-}
+import Vue from 'vue'
+import { all } from 'vue-client'
+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('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
+  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
+  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
+  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
+  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
+  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
+
+  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
+  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
+  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
+  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
+
+  Vue.component('app-add-material-science', (resolve) => { require(['./components/android/Process/Processes/AppAddMaterialScience'], resolve) })
+
+  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
+  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) })
+
+  // 区域 地址下拉框联动组件
+  Vue.component('app-res-area-select', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelect'], resolve) })
+  Vue.component('app-res-area-select-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelectGroup'], resolve) })
+  Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
+  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
+  // 地图组件
+  Vue.component('app-res-area-map-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaMapGroup'], resolve) })
+  // 扫描二维码
+  Vue.component('app-qrcode-reader', (resolve) => { require(['./components/android/AreaSelect/AppQrcodeReader'], resolve) })
+  // 特殊目录给这里加
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/android`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}

package/src/components/product/Process/Service/ServiceControl.vue

@@ -1200,6 +1200,7 @@
       },
       // 通气点火初始化
       async 'gasReadyEvent' () {
+        debugger
         // 是否有气价信息
         if (!isEmpty(this.show_data.f_price_id)) {
           let priceList = await this.getPrice(this.show_data.f_price_id)