apply-clients 7.1.40 → 7.1.41

package/index.html

@@ -6,10 +6,7 @@
   <META HTTP-EQUIV="pragma" CONTENT="no-cache">
   <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
   <META HTTP-EQUIV="expires" CONTENT="0">
-  <title>报建系统</title>
-  <script  src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
-  <!--引入UI组件库（1.1版本） -->
-  <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
+  <title>陕西榆林中燃天然气</title>
   <style media="screen">
     /*url(./static/newmainbg.jpg)*/
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.40",
+  "version": "7.1.41",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -13,9 +13,9 @@
     "dev": "node build/dev-server.js",
     "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
     "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildandroid": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js",
     "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
+    "release": "bash build/release.sh",
+    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js"
   },
   "repository": {
     "type": "git",
@@ -29,13 +29,11 @@
   "dependencies": {
     "@logicflow/core": "^0.4.3",
     "co": "4.6.0",
-    "happypack": "^5.0.1",
-    "jsencrypt": "3.0.0-rc.1",
+    "jsencrypt": "^3.0.0-rc.1",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "lib-flexible": "^0.3.2",
     "px2rem-loader": "^0.1.9",
-    "qrcodejs2": "0.0.2",
     "vue": "^1.0.17",
     "vue-bubble": "^1.0.3"
   },
@@ -62,7 +60,6 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.17.0",
     "extract-text-webpack-plugin": "^1.0.1",
-    "fadada-clients": "1.0.6",
     "file-loader": "^0.8.4",
     "form-create": "^1.6.6",
     "function-bind": "^1.0.2",
@@ -95,9 +92,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "system-clients": "3.1.87",
-    "system-phone": "1.2.87",
+    "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.50-1",
+    "vue-client": "1.23.10",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",
@@ -111,7 +108,6 @@
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0",
-    "weixin-manage-client": "1.0.56"
+    "weixin-js-sdk": "^1.2.0"
   }
 }

package/src/AndroidApp.vue

@@ -2,34 +2,27 @@
   <!-- <app-base> -->
   <div id="android-app">
     <article>
-<!--      <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>
+      <route :comp="{name: 'login-app'}" name="root"></route>
+      <!--<route :comp="{name: 'apply_app'}" name="root"></route>-->
+      <!--<route :comp="{name: 'applytodolist'}" name="root"></route>-->
+      <!--<route :comp="{name: 'paper-state-noncivil'}" name="root"></route>-->
     </article>
     <time-out></time-out>
-    <message-box></message-box>
-    <alert-box></alert-box>
-    <alert-box-batch></alert-box-batch>
+    <message-box>
+    </message-box>
   </div>
 </template>
 
 <script>
 
-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 }
-}
+  }
 </script>

package/src/App.vue

@@ -1,18 +1,20 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <route :comp="{name: 'login'}"></route>
-<!--          <route :comp="{name: 'public-order-apply'}"></route>-->
-<!--          <route :comp="{name: 'public-history-apply'}"></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/android.js

@@ -1,18 +1,15 @@
 import Vue from 'vue'
 import AndroidApp from './AndroidApp'
 import { all } from 'vue-client'
+import apply from './apply'
 import {systemphonegrid} from 'system-phone'
-import {fadadaAndroid} from 'fadada-clients'
-import applyAndroid from './applyAndroid'
+import applyAndroid from "./applyAndroid";
 
 all()
+apply()
 applyAndroid()
 systemphonegrid()
-fadadaAndroid()
-
-require('./android-bootstrap/less/bootstrap.less')
-require('./expandcssAndroid.less')
-
+require('./bootstrap/less/bootstrap.less')
 Vue.android = true
 /* eslint-disable no-new */
 new Vue({

package/src/apply.js

@@ -1,86 +1,69 @@
-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('new-supervisory-chart', (resolve) => { require(['./components/product/Supervisory/NewSupervisoryhCart'], 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('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('build-order-list', (resolve) => { require(['./components/product/Print/BuildOrder/buildOrderList'], resolve) })
-  Vue.component('print-build-order', (resolve) => { require(['./components/product/Print/BuildOrder/printBuildOrder'], resolve) })
-
-  /** 点火派单 **/
-  Vue.component('ignition-dispatch', (resolve) => { require(['./components/product/Ignition/IgnitionDispatch'], resolve) })
-  Vue.component('ignition-record', (resolve) => { require(['./components/product/Ignition/IgnitionRecord'], 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('exhibition-picture', (resolve) => { require(['./components/product/Process/Processes/ExhibitionPicture'], 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-map-com', (resolve) => { require(['./components/product/Process/Processes/ApplyMapCom'], resolve) })
-  Vue.component('apply-satisfaction-show', (resolve) => { require(['./components/product/Process/Processes/satisfactionShow.vue'], 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) })
-
-  // 对外提供单页面
-  Vue.component('public-order-apply', (resolve) => { require(['./public/order/PublicOrderApply'], resolve) })
-  Vue.component('public-history-apply', (resolve) => { require(['./public/history/PublicHistoryApply'], resolve) })
-  Vue.component('history-apply-list', (resolve) => { require(['./public/history/HistoryApplyList'], resolve) })
-  Vue.component('public-supervisoryh-cart', (resolve) => { require(['./public/history/PublicSupervisoryhCart'], resolve) })
-}
+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) })
+  // 显示退回理由tab页
+  Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/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('stop-install', (resolve) => { require(['./components/product/Function/functions/StopInstall'], resolve) })
+  // 终止报建列表页
+  Vue.component('stop-apply-cardlist', (resolve) => { require(['./components/product/Function/StopApplyCrrdList'], resolve) })
+  // 撤销报建终止页
+  Vue.component('apply-record-cancel', (resolve) => { require(['./components/product/Function/functions/ApplyRecordCancel'], 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-charge-report', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeReport'], 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-print-charge', (resolve) => { require(['./components/product/Process/Processes/printCharge'], resolve) })
+  // 补充协议
+  Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
+  Vue.component('test', (resolve) => { require(['./components/product/Test'], resolve) })
+  // 通气点火汇总报表
+  Vue.component('gas-ignition-summary', (resolve) => { require(['./components/product/ReportForm/GasIgnitionSummary'], resolve) })
+
+  /** VueUtils **/
+  Vue.component('back-page', (resolve) => { require(['./components/product/VueUtils/ToolsPage'], resolve) })
+  Vue.component('tree2', (resolve) => { require(['./components/product/VueUtils/Tree'], resolve) })
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
+}

package/src/applyAndroid.js

@@ -1,56 +1,39 @@
-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-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('task-graph', (resolve) => { require(['./components/android/TaskGraph'], resolve) })
-  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
-  Vue.component('app-upload', (resolve) => { require(['./components/android/AppUpload'], resolve) })
-
-  // 地图任务
-  // 现场勘察
-  Vue.component('survey-tsak', (resolve) => { require(['./components/android/Task/Survey/SurveyTsak'], resolve) })
-  // 工程施工
-  Vue.component('build-tsak', (resolve) => { require(['./components/android/Task/Build/BuildTsak'], resolve) })
-  // 工程派工
-  Vue.component('upbuild-tsak', (resolve) => { require(['./components/android/Task/UpBuild/UpBuildTsak'], resolve) })
-
-  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
-  Vue.component('app-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
-  Vue.component('survey-user-sign', (resolve) => { require(['./components/android/Process/Processes/SurveyUserSign'], resolve) })
-
-  // 通气点火
-  Vue.component('ventilation-ignition', (resolve) => { require(['./components/android/Ignition/VentilationIgnition'], resolve) })
-  Vue.component('ventilation-ignition-handle', (resolve) => { require(['./components/android/Ignition/VentilationIgnitionHandle'], resolve) })
-
-  // 签字
-  Vue.component('app-sign-task', (resolve) => { require(['./components/android/Sign/AppSignTask'], resolve) })
-  Vue.component('sign-process', (resolve) => { require(['./components/android/Sign/SignProcess'], resolve) })
-
-  // 出具设计图纸
-  Vue.component('design-rawings', (resolve) => { require(['./components/android/newPackage/designDrawings'], resolve) })
-  // 工程报价
-  Vue.component('project-Price', (resolve) => { require(['./components/android/newPackage/projectPrice'], resolve) })
-  // 客服管理
-  Vue.component('customer-manager', (resolve) => { require(['./components/android/newPackage/customerServiceManager'], resolve) })
-  // 详细数据
-  Vue.component('detailed-data', (resolve) => { require(['./components/android/newPackage/detailedData'], 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 () {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+/** ***************************报建模块*********************************/
+  // 报建 总入口
+  Vue.component('apply_app', (resolve) => { require(['./components/app_apply/ApplyApp'], resolve) })
+  //报建 待办流程页
+  Vue.component('placecontrolerapp', (resolve) => { require(['./components/app_apply/PlaceControler'], resolve) })
+  //报建 已办事项
+  Vue.component('applydownlist', (resolve) => { require(['./components/app_apply/ApplyDownList'], resolve) })
+  //报建 上传
+  Vue.component('applylistupload', (resolve) => { require(['./components/app_apply/ApplyListUpload'], resolve) })
+  //报建 待办事项
+  Vue.component('applytodolist', (resolve) => { require(['./components/app_apply/ApplyToDoList'], resolve) })
+  //报建 用户信息
+  Vue.component('apply-user-info', (resolve) => { require(['./components/app_apply/ApplyUserInfo'], resolve) })
+  //报建 报建流程信息
+  Vue.component('apply-info', (resolve) => { require(['./components/app_apply/ApplyInfo'], resolve) })
+  //报建 现场勘探
+  Vue.component('fieldexploration', (resolve) => { require(['./components/app_apply/FieldExploration'], resolve) })
+  //报建 竣工验收
+  Vue.component('acceptance', (resolve) => { require(['./components/app_apply/Acceptance'], resolve) })
+  //报建 通气点火
+  Vue.component('ventilation', (resolve) => { require(['./components/app_apply/Ventilation'], resolve) })
+
+  Vue.component('back-page', (resolve) => { require(['./components/app_apply/ToolsPage.vue'], resolve) })
+
+  // 业务tab(control层)页
+  Vue.component('service-control-app', (resolve) => { require(['./components/app_apply/ServiceControl'], resolve) })
+  // 公共业务显示(view层)页
+  Vue.component('service-view-app', (resolve) => { require(['./components/app_apply/ServiceView'], resolve) })
+}