apply-clients 5.0.36 → 5.0.37-2

package/package.json

@@ -1,111 +1,111 @@
-{
-  "name": "apply-clients",
-  "version": "5.0.36",
-  "description": "报建前端模块",
-  "main": "src/index.js",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js",
-    "example": "node build/example-server.js",
-    "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",
-    "e2e": "node test/e2e/runner.js",
-    "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",
-    "url": "https://gitee.com/aote/ApplyInstall.git"
-  },
-  "keywords": [
-    "ApplyInstall"
-  ],
-  "author": "zx <939981212@qq.com>",
-  "license": "ISC",
-  "dependencies": {
-    "co": "4.6.0",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "lib-flexible": "^0.3.2",
-    "px2rem-loader": "^0.1.9",
-    "vue": "^1.0.17",
-    "vue-bubble": "^1.0.3"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.17.0",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "form-create": "^1.6.6",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "ldap-clients": "^0.5.1",
-    "material-client": "^1.1.2",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "sale-client": "^1.4.33",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "1.6.38",
-    "system-phone": "1.1.18",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.23.10",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "^2.1.7",
-    "vux": "^2.9.4",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0"
-  }
-}
+{
+  "name": "apply-clients",
+  "version": "5.0.37-2",
+  "description": "报建前端模块",
+  "main": "src/index.js",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js",
+    "example": "node build/example-server.js",
+    "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",
+    "e2e": "node test/e2e/runner.js",
+    "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",
+    "url": "https://gitee.com/aote/ApplyInstall.git"
+  },
+  "keywords": [
+    "ApplyInstall"
+  ],
+  "author": "zx <939981212@qq.com>",
+  "license": "ISC",
+  "dependencies": {
+    "co": "4.6.0",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "lib-flexible": "^0.3.2",
+    "px2rem-loader": "^0.1.9",
+    "vue": "^1.0.17",
+    "vue-bubble": "^1.0.3"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.17.0",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "form-create": "^1.6.6",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "^0.5.1",
+    "material-client": "^1.1.2",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "sale-client": "1.7.70-ezhou-38",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "1.6.38",
+    "system-phone": "1.2.76-14-ezhou",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.23.10",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "^2.1.7",
+    "vux": "^2.9.4",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "weixin-js-sdk": "^1.2.0"
+  }
+}

package/src/android.js

@@ -3,7 +3,7 @@ import AndroidApp from './AndroidApp'
 import { all } from 'vue-client'
 import apply from './apply'
 import {systemphonegrid} from 'system-phone'
-import applyAndroid from "./applyAndroid";
+import applyAndroid from "./ezhouAndroid";
 
 all()
 apply()

package/src/apply.js

@@ -143,9 +143,23 @@ export default function () {
   // 售气发票打印
   Vue.component('printbill', (resolve) => { require(['./components/product/Common/PrintBill'], resolve) })
   Vue.component('apply-accept-bill', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyAcceptBill'], resolve) })
-
+// 售气发票打印
+  Vue.component('bjpaper-ticket-bill', (resolve) => { require(['./components/product/Process/Processes/Service/PaperTicketBill'], resolve) })
+// APP图片显示
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/Function/functions/ApplyUpload'], resolve) })
 
   Vue.component('apply-stop', (resolve) => { require(['./components/product/stopInfo/ApplyStopInfo'], resolve) })
 
+  Vue.component('apply-report', (resolve) => { require(['./components/product/applyReport/ApplyReport'], resolve) })
 
+  Vue.component('print-report-order', (resolve) => { require(['./components/product/applyReport/PrintApplyReport'], resolve) })
+  /** 工程管理  **/
+  Vue.component('engineer-manage', (resolve) => { require(['./components/product/EngineeringManagement/EngineeringManagement'], resolve) })
+  Vue.component('engineer-select', (resolve) => { require(['./components/product/EngineeringManagement/EngineeringSelect'], resolve) })
+  Vue.component('engineer-upload', (resolve) => { require(['./components/product/EngineeringManagement/EngineerUpload'], resolve) })
+  /** 工程管理流程监控  **/
+  Vue.component('engineer-control', (resolve) => { require(['./components/product/EngineeringSupervisory/EngineeringSupervisoryControl'], resolve) })
+  Vue.component('engineer-stop', (resolve) => { require(['./components/product/EngineeringSupervisory/EngineeringApplyStopInfo'], resolve) })
+  Vue.component('engineer-service-control', (resolve) => { require(['./components/product/EngineeringSupervisory/EngineeringSupervisoryServiceControl'], resolve) })
+  Vue.component('engineer-list', (resolve) => { require(['./components/product/EngineeringSupervisory/EngineeringSupervisoryList'], resolve) })
 }

package/src/components/app_apply/ApplyApp.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="row auto" style="background-color: #FFFFFF">
-    <div class="col-xs-12 text-center daiban" @click = "gotopage('applytodolist')">
+    <div class="col-xs-4 text-center daiban" @click = "gotopage('applytodolist')">
       <img src="../../assets/applytodo.png" class="imgs" alt="">
       <p class="text-center name" style="margin: 10px 0;">报建待办</p>
     </div>
-    <div class="col-xs-6 text-center yiban" @click = "gotopage('applydownlist')">
+    <div class="col-xs-4 text-center yiban" @click = "gotopage('applydownlist')">
       <img src="../../assets/applydown.png" class="imgs" alt="">
       <p class="text-center name" style="margin: 10px 0;">报建已办</p>
     </div>
-<!--    <div class="col-xs-4 text-center upload" @click = "gotopage('applylistupload')">-->
-<!--      <img src="../../assets/applylistupload.png" class="imgs" alt="">-->
-<!--      <p class="text-center name" style="margin: 10px 0;">批量上传</p>-->
-<!--    </div>-->
+    <div class="col-xs-4 text-center upload" @click = "gotopage('applylistupload')">
+      <img src="../../assets/applylistupload.png" class="imgs" alt="">
+      <p class="text-center name" style="margin: 10px 0;">批量上传</p>
+    </div>
   </div>
 </template>
 

package/src/components/app_apply/ApplyDownList.vue

@@ -3,7 +3,7 @@
     <!--<div class="app-botton" @click="back()">-->
     <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
     <!--</div>-->
-    <back-page :need-back='true'  @flag="back()"></back-page>
+<!--<back-page :need-back='true'  @flag="back()"></back-page>-->
     <div class="bq-parent">
       <blockquote  style="color: #499edf;border-left-color: #499edf;font-size: 16px">
         <p>
@@ -37,7 +37,7 @@
                     <img src="../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(row.f_phone)'>
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    流程状态: {{row.f_order_type}}
+                    流程状态: {{row.f_defname_type}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     报建类型: {{row.f_apply_type}}
@@ -83,7 +83,11 @@
     },
     methods: {
       selected (row) {
+        console.log("999999999999")
         row.canedit = false
+        row.defname=row.f_defname_type
+        console.log(row.f_defname_type)
+        console.log(row.defname)
         if(this.sourcet == '横屏'){
           this.$goto('placecontrolerapp', {row: row},'self',this.search)
         }else{
@@ -95,19 +99,7 @@
         _this.$back()
       },
       search () {
-        //pc模拟开发用
-        // console.log('------app开始查询本地已办工单------')
-        // var condition = ' (u.f_app_upload != \'已上传\' or u.f_app_upload is null) '
-        // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getapplymobile`, {data: {'condition': condition}}).then((res) => {
-        //   console.log(res)
-        //   console.log(res.data)
-        //   console.log(`res.data.data.rows=> ${res.data.data.rows}`)
-        //   if(res.data){
-        //     this.rows = res.data.data.rows
-        //   }else{
-        //     this.rows = []
-        //   }
-        // })
+
 
 
         // app正式运行程序
@@ -119,7 +111,7 @@
         let res = this.$androidUtil.bzLogic('getapplymobile',param)
         console.log(`前台本地报建已办工单查询结果data=>>>${res.data}`)
         if(res.data){
-          this.rows = res.data.rows
+          this.rows = res.data
         }else{
           this.rows = []
         }
@@ -140,6 +132,16 @@
         _this.search()
       }, 6000000)//60000
     },
+    created(){
+      var result = HostApp.readLocalFile('workflow_apply.json')
+      if(result.code == 500){
+        this.$showMessage('获取流程配置文件失败，请联系系统管理员')
+        return
+      }
+      var data = JSON.parse(result.data)
+      console.log('前台存入缓存中的data=>' + JSON.stringify(data))
+      Vue.workflow_vue = Vue.prototype.$workflow_vue = data
+    }
   }
 </script>
 

package/src/components/app_apply/ApplyInfo.vue

@@ -10,9 +10,9 @@
       <div class="panel-body">
         <p>报建编号： {{service.f_apply_num}}</p>
         <p>报建类型： {{service.f_apply_type}}</p>
-        <p>流程状态： {{service.f_order_type}}</p>
+        <p>流程状态： {{service.defname}}</p>
         <p>报建日期： {{service.f_apply_date}}</p>
-        <p>报建备注： {{service.f_apply_remarks===null ? '' :service.f_apply_remarks}}</p>
+        <p>报建备注： {{service.t_remarks}}</p>
         <failure-show :value='service.failure'>
         </failure-show>
       </div>

package/src/components/app_apply/ApplyListUpload.vue

@@ -3,7 +3,7 @@
     <!--<div class="app-botton" @click="back()">-->
       <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
     <!--</div>-->
-    <back-page :need-back='true'  @flag="back()"></back-page>
+<!--    <back-page :need-back='true'  @flag="back()"></back-page>-->
     <div class="bq-parent">
       <blockquote  style="color: #499edf;border-left-color: #499edf;font-size: 16px">
         <p>
@@ -13,9 +13,9 @@
         </p>
       </blockquote>
     </div>
-<!--    <div style="text-align:right">-->
-<!--      <button  @click="uploadAll" type="button" class="btn btn-primary radius_btn" style="margin-right: 0.5%">批量上传</button>-->
-<!--  </div>-->
+    <div style="text-align:right">
+      <button  @click="uploadAll" type="button" class="btn btn-primary radius_btn" style="margin-right: 0.5%">批量上传</button>
+  </div>
     <div class="panel panel-default repair-info-content auto">
       <div class="panel-body">
         <div class="panel panel-default well"  v-for="row in rows"  >
@@ -40,7 +40,7 @@
                     <img src="../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(row.f_phone)'>
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    流程状态: {{row.f_order_type}}
+                    流程状态: {{row.defname}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     报建类型: {{row.f_apply_type}}
@@ -232,6 +232,16 @@
         _this.search()
       }, 6000000)//60000
     },
+    created(){
+      var result = HostApp.readLocalFile('workflow_apply.json')
+      if(result.code == 500){
+        this.$showMessage('获取流程配置文件失败，请联系系统管理员')
+        return
+      }
+      var data = JSON.parse(result.data)
+      console.log('前台存入缓存中的data=>' + JSON.stringify(data))
+      Vue.workflow_vue = Vue.prototype.$workflow_vue = data
+    }
   }
 </script>