apply-clients 5.0.35-2 → 5.0.35-20

package/.eslintrc.js

@@ -1,16 +1,16 @@
-module.exports = {
-  root: true,
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'standard',
-  // required to lint *.vue files
-  plugins: [
-    'eslint-plugin-html'
-  ],
-  // add your custom rules here
-  'rules': {
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
-}
+// module.exports = {
+//   root: true,
+//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+//   extends: 'standard',
+//   // required to lint *.vue files
+//   plugins: [
+//     'eslint-plugin-html'
+//   ],
+//   // add your custom rules here
+//   'rules': {
+//     // allow paren-less arrow functions
+//     'arrow-parens': 0,
+//     // allow debugger during development
+//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+//   }
+// }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "5.0.35-2",
+  "version": "5.0.35-20",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -83,7 +83,7 @@
     "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",

package/src/android.js

@@ -1,18 +1,18 @@
-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('./bootstrap/less/bootstrap.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 "./ezhouAndroid";
+
+all()
+apply()
+applyAndroid()
+systemphonegrid()
+require('./bootstrap/less/bootstrap.less')
+Vue.android = true
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { AndroidApp }
+})

package/src/apply.js

@@ -143,6 +143,8 @@ 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) })
 
 
   Vue.component('apply-stop', (resolve) => { require(['./components/product/stopInfo/ApplyStopInfo'], resolve) })

package/src/components/app_apply/ApplyDownList.vue

@@ -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}}
@@ -48,9 +48,9 @@
 
                 </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 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>
@@ -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{
@@ -107,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 = []
         }

package/src/components/app_apply/ApplyInfo.vue

@@ -1,56 +1,56 @@
-<template>
-  <div class="repair-bg" id="work-history">
-    <div class="bq-parent" v-if="shutype == 'heng'">
-      <blockquote class="blockquote">
-        <p>报建流程信息</p>
-      </blockquote>
-    </div>
-    <!-- 报建流程信息 -->
-    <div class="panel panel-default auto repair-info-content">
-      <div class="panel-body">
-        <p>报建编号： {{service.f_apply_num}}</p>
-        <p>报建类型： {{service.f_apply_type}}</p>
-        <p>流程状态： {{service.f_order_type}}</p>
-        <p>报建日期： {{service.f_apply_date}}</p>
-        <p>报建备注： {{service.f_apply_remarks}}</p>
-        <failure-show :value='service.failure'>
-        </failure-show>
-      </div>
-    </div>
-  </div>
-  </template>
-  <script>
-  export default {
-    title: '报建流程信息',
-    data () {
-      return {
-        // service: null
-        f_userinfo_code : ''
-      }
-    },
-    props: {
-      service: { // 传入一条报修单信息
-       //"f_apply_num":"123456",
-        type: Object
-      },
-      shutype:'heng'
-    },
-    ready () {
-    },
-    methods: {
-      selfSearch () {
-        if(!this.rowOne) {
-          return
-        }
-      }
-    },
-    watch: {
-      'rowOne' () {
-        this.selfSearch()
-      }
-    },
-    components: {
-
-    }
-  }
-  </script>
+<template>
+  <div class="repair-bg" id="work-history">
+    <div class="bq-parent" v-if="shutype == 'heng'">
+      <blockquote class="blockquote">
+        <p>报建流程信息</p>
+      </blockquote>
+    </div>
+    <!-- 报建流程信息 -->
+    <div class="panel panel-default auto repair-info-content">
+      <div class="panel-body">
+        <p>报建编号： {{service.f_apply_num}}</p>
+        <p>报建类型： {{service.f_apply_type}}</p>
+        <p>流程状态： {{service.defname}}</p>
+        <p>报建日期： {{service.f_apply_date}}</p>
+        <p>报建备注： {{service.t_remarks}}</p>
+        <failure-show :value='service.failure'>
+        </failure-show>
+      </div>
+    </div>
+  </div>
+  </template>
+  <script>
+  export default {
+    title: '报建流程信息',
+    data () {
+      return {
+        // service: null
+        f_userinfo_code : ''
+      }
+    },
+    props: {
+      service: { // 传入一条报修单信息
+       //"f_apply_num":"123456",
+        type: Object
+      },
+      shutype:'heng'
+    },
+    ready () {
+    },
+    methods: {
+      selfSearch () {
+        if(!this.rowOne) {
+          return
+        }
+      }
+    },
+    watch: {
+      'rowOne' () {
+        this.selfSearch()
+      }
+    },
+    components: {
+
+    }
+  }
+  </script>

package/src/components/app_apply/ApplyListUpload.vue

@@ -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}}