apply-clients 5.0.35-4 → 5.0.35-40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "5.0.35-4",
+  "version": "5.0.35-40",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -83,14 +83,14 @@
     "ncp": "^2.0.0",
     "nightwatch": "^0.8.18",
     "rimraf": "^2.5.0",
-    "sale-client": "^1.4.33",
+    "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.1.18",
+    "system-phone": "1.2.76-13-ezhou",
     "url-loader": "^0.5.7",
     "vue-client": "1.23.10",
     "vue-hot-reload-api": "^1.2.0",

package/src/AndroidApp.vue

@@ -1,28 +1,28 @@
-<template>
-  <!-- <app-base> -->
-  <div id="android-app">
-    <article>
-      <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>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    ready () {
-      if(!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("Error occured: " + error.message)
-          return false
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <!-- <app-base> -->
+  <div id="android-app">
+    <article>
+      <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>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    ready () {
+      if(!window.onerror) {
+        window.onerror = function (message, file, line, col, error) {
+          // HostApp.alert("Error occured: " + error.message)
+          return false
+        }
+      }
+    }
+  }
+</script>

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,14 @@ 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) })
 }

package/src/components/app_apply/ApplyDownList.vue

@@ -1,164 +1,168 @@
-<template>
-  <div class="repair-bg auto" id="repair-first" style="padding-bottom:5px;overflow:auto">
-    <!--<div class="app-botton" @click="back()">-->
-    <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
-    <!--</div>-->
-<!--<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>
-          已办报建<span v-if="rows">（{{rows.length}}单）</span>
-          <span v-if="!rows">（暂无已上传报建单）</span>
-          <img @click="search" src="../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">
-        </p>
-      </blockquote>
-    </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"  >
-          <div class="panel-body bg-info" style="padding: 10px">
-            <div class="row form-group">
-              <div class="col-sm-12 col-xs-12 col-md-12">
-                <div class="row" >
-                  <div :class="{'text-danger': row.f_remindersign}" class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    报建编号: {{row.f_apply_num}}<!--<span v-if="row.f_remindersign">(催单)</span>-->
-                  </div>
-                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    用户姓名: {{row.f_user_name}}
-                  </div>
-                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    用户类型: {{row.f_user_type}}
-                  </div>
-                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    用户地址: {{row.f_address}}
-                  </div>
-                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    用户电话: {{row.f_phone}}
-                    <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}}
-                  </div>
-                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    报建类型: {{row.f_apply_type}}
-                  </div>
-                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    报建日期: {{row.f_apply_date}}
-                  </div>
-
-                </div>
-              </div>
-<!--              <div class="col-sm-12 col-xs-12 col-md-12">-->
-<!--                <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="selected(row)">查看</button>-->
-<!--              </div>-->
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import  Vue from 'vue'
-  export default{
-    title: '已办报建列表',
-    data () {
-      return {
-        // rows: Object
-        rows: [],
-        editshow:false,
-        row:{
-          type:Object,
-          default:{
-
-          }
-        }
-      }
-    },
-    props: {
-      sourcet:{
-        type:String,
-        default:'横屏'
-      }
-    },
-    methods: {
-      selected (row) {
-        row.canedit = false
-        if(this.sourcet == '横屏'){
-          this.$goto('placecontrolerapp', {row: row},'self',this.search)
-        }else{
-          this.$goto('placecontrolerapp', {row: row},'self',this.search)
-        }
-      },
-      back () {
-        let _this = this
-        _this.$back()
-      },
-      search () {
-
-
-
-        // app正式运行程序
-        console.log('------app开始查询本地已办工单------')
-        var condition = ' u.f_app_upload = \'已上传\' '
-        console.log(`login_user_id=>>>${Vue.user.id}`)
-        var param = {"condition": condition,"id": Vue.user.id}
-        console.log(`param=>>>${JSON.stringify(param)}`)
-        let res = this.$androidUtil.bzLogic('getapplymobile',param)
-        console.log(`前台本地报建已办工单查询结果data=>>>${res.data}`)
-        if(res.data){
-          this.rows = res.data.rows
-        }else{
-          this.rows = []
-        }
-        console.log(`this.rows=>>>${this.rows}`)
-
-      },
-      makeAPhoneCall(phoneNumber) {
-        this.$androidUtil.makeAPhoneCall(phoneNumber)
-      },
-      upload () {
-        this.$goto('up-load')
-      }
-    },
-    ready () {
-      this.search()
-      var _this = this;
-      this.timeoutHandle = window.setInterval(function() {
-        _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>
-
-<style>
-  .app-botton {
-    position:fixed;
-    background: #87b2dd;
-    color: #FFF;
-    padding: 8px;
-    text-align: center;
-    font-size: 1.2em;
-    z-index: 10;
-    opacity:0.5;
-    bottom: 50px;
-    margin-top: -10px;
-    height: 40px;
-  }
-  .class-a{
-    border:1px solid red;
-  }
-  .padd-div-shu{
-    padding-bottom: 5px;
-  }
-</style>
+<template>
+  <div class="repair-bg auto" id="repair-first" style="padding-bottom:5px;overflow:auto">
+    <!--<div class="app-botton" @click="back()">-->
+    <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
+    <!--</div>-->
+<!--<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>
+          已办报建<span v-if="rows">（{{rows.length}}单）</span>
+          <span v-if="!rows">（暂无已上传报建单）</span>
+          <img @click="search" src="../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">
+        </p>
+      </blockquote>
+    </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"  >
+          <div class="panel-body bg-info" style="padding: 10px">
+            <div class="row form-group">
+              <div class="col-sm-12 col-xs-12 col-md-12">
+                <div class="row" >
+                  <div :class="{'text-danger': row.f_remindersign}" class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    报建编号: {{row.f_apply_num}}<!--<span v-if="row.f_remindersign">(催单)</span>-->
+                  </div>
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    用户姓名: {{row.f_user_name}}
+                  </div>
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    用户类型: {{row.f_user_type}}
+                  </div>
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    用户地址: {{row.f_address}}
+                  </div>
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    用户电话: {{row.f_phone}}
+                    <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_defname_type}}
+                  </div>
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    报建类型: {{row.f_apply_type}}
+                  </div>
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    报建日期: {{row.f_apply_date}}
+                  </div>
+
+                </div>
+              </div>
+              <div class="col-sm-12 col-xs-12 col-md-12">
+                <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="selected(row)">查看</button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import  Vue from 'vue'
+  export default{
+    title: '已办报建列表',
+    data () {
+      return {
+        // rows: Object
+        rows: [],
+        editshow:false,
+        row:{
+          type:Object,
+          default:{
+
+          }
+        }
+      }
+    },
+    props: {
+      sourcet:{
+        type:String,
+        default:'横屏'
+      }
+    },
+    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{
+          this.$goto('placecontrolerapp', {row: row},'self',this.search)
+        }
+      },
+      back () {
+        let _this = this
+        _this.$back()
+      },
+      search () {
+
+
+
+        // app正式运行程序
+        console.log('------app开始查询本地已办工单------')
+        var condition = ' u.f_app_upload = \'已上传\' '
+        console.log(`login_user_id=>>>${Vue.user.id}`)
+        var param = {"condition": condition,"id": Vue.user.id}
+        console.log(`param=>>>${JSON.stringify(param)}`)
+        let res = this.$androidUtil.bzLogic('getapplymobile',param)
+        console.log(`前台本地报建已办工单查询结果data=>>>${res.data}`)
+        if(res.data){
+          this.rows = res.data
+        }else{
+          this.rows = []
+        }
+        console.log(`this.rows=>>>${this.rows}`)
+
+      },
+      makeAPhoneCall(phoneNumber) {
+        this.$androidUtil.makeAPhoneCall(phoneNumber)
+      },
+      upload () {
+        this.$goto('up-load')
+      }
+    },
+    ready () {
+      this.search()
+      var _this = this;
+      this.timeoutHandle = window.setInterval(function() {
+        _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>
+
+<style>
+  .app-botton {
+    position:fixed;
+    background: #87b2dd;
+    color: #FFF;
+    padding: 8px;
+    text-align: center;
+    font-size: 1.2em;
+    z-index: 10;
+    opacity:0.5;
+    bottom: 50px;
+    margin-top: -10px;
+    height: 40px;
+  }
+  .class-a{
+    border:1px solid red;
+  }
+  .padd-div-shu{
+    padding-bottom: 5px;
+  }
+</style>

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}}</p>
+        <p>报建备注： {{service.t_remarks}}</p>
         <failure-show :value='service.failure'>
         </failure-show>
       </div>