apply-clients 5.0.35 → 5.0.36-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "5.0.35",
+  "version": "5.0.36-2",
   "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-14-ezhou",
     "url-loader": "^0.5.7",
     "vue-client": "1.23.10",
     "vue-hot-reload-api": "^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>
 

package/src/components/app_apply/ApplyToDoList.vue

@@ -1,17 +1,49 @@
 <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>-->
+    <!--<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>
+      <blockquote  style="padding: 10px 10px;margin: 0 0 0px;color: #499edf;border-left-color: #499edf;font-size: 16px">
+        <div class=" row">
           待办报建<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>
+          <div style="margin-right: 3%;float:right;height: 30px " class="button_spacing" :class="{'button_shrink_top':criteriaShow,'button_shrink_bottom':!criteriaShow}"  @click="hidden()"></div>
+
+        </div>
       </blockquote>
+
+    </div>
+    <div style="height: auto;width: 100%" v-if="criteriaShow">
+      <div class="row app-row">
+        <div class="col-xs-4">
+          <img src="../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+          <label  class="font text-left">用户姓名：</label>
+        </div>
+        <div class="col-xs-8" >
+          <input  class="search_input input-font" v-model=model.f_user_name condition="f_user_name like '%{}%'" />
+        </div>
+      </div>
+      <div class="row app-row">
+        <div class="col-xs-4">
+          <img src="../../assets/用户地址.png" style="width: 20px;margin-bottom: 5px" alt="">
+          <label  class="font text-left">用户地址：</label>
+        </div>
+        <div class="col-xs-8" >
+          <input  class="search_input input-font" v-model=model.f_address condition="f_user_name like '%{}%'" />
+        </div>
+      </div>
+      <div class="row app-row">
+        <div class="col-xs-4">
+          <img src="../../assets/用户电话.png" style="width: 20px;margin-bottom: 5px" alt="">
+          <label  class="font text-left">用户电话：</label>
+        </div>
+        <div class="col-xs-8" >
+          <input  class="search_input input-font" v-model=model.f_phone condition="f_user_name like '%{}%'" />
+        </div>
+      </div>
     </div>
     <div class="panel panel-default repair-info-content auto">
       <div class="panel-body">
@@ -37,7 +69,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}}
@@ -59,13 +91,16 @@
   </div>
 </template>
 <script>
-  import  Vue from 'vue'
+import  Vue from 'vue'
+import  {HttpResetClass} from 'vue-client'
 export default{
   title: '待办报建列表',
   data () {
     return {
       // rows: Object
       rows: [],
+      model:{},
+      criteriaShow:false,
       editshow:false,
       row:{
         type:Object,
@@ -82,12 +117,22 @@ export default{
     }
   },
   methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
     selected (row) {
+      var _this = this
+      var pardate = {
+        _this: _this,
+        title: '报建待办详情',
+        safe: true
+      }
+      _this.$dispatch('gotoson',pardate)
       row.canedit = true
-      if(this.sourcet == '横屏'){
-        this.$goto('placecontrolerapp', {row: row},'self',this.search)
+      if(_this.sourcet == '横屏'){
+        _this.$goto('placecontrolerapp', {row: row},'self',this.search)
       }else{
-        this.$goto('placecontrolerapp', {row: row},'self',this.search)
+        _this.$goto('placecontrolerapp', {row: row},'self',this.search)
       }
     },
     back () {
@@ -95,41 +140,108 @@ export default{
       _this.$back()
     },
     search () {
-      //pc模拟开发用
-      // console.log('------app开始查询本地代办工单------')
-      // var condition = ' (u.f_app_upload != \'已上传\' or u.f_app_upload is null) and f_order_type  is not 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}`)
-      //   if(res.data){
-      //     this.rows = res.data.data.rows
-      //   }else{
-      //     this.rows = []
-      //   }
-      // })
-
-
       // app正式运行程序
       console.log('------app开始查询本地代办工单------')
-      var condition = ' (u.f_app_upload != \'已上传\' or u.f_app_upload is null) '
+      var condition = "defname in ('现场勘查','验收','通气','现场勘查定价','安装通气')"
+
+      console.log(JSON.stringify(this.model))
+      if (this.model.f_user_name){
+        condition+=` and f_user_name like '%${this.model.f_user_name}%'`
+      }
+      if (this.model.f_address){
+        condition+=` and f_address like '%${this.model.f_address}%'`
+      }
+      if (this.model.f_phone){
+        condition+=` and f_phone like '%${this.model.f_phone}%'`
+      }
       console.log(`login_user_id=>>>${Vue.user.id}`)
-      var param = {"condition": condition,"id": Vue.user.id}
+      console.log(`分公司=>>>${Vue.user.f_fengongsi}`)
+      var param = {condition: condition,condValue:[],data:{"id": Vue.user.id,"fengongsi":Vue.user.f_fengongsi,f_product_id:0}}
+
       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}`)
+      let http=new HttpResetClass()
+      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,{data:param}).then(res=>{
+        console.log(`前台本地报建代办工单查询结果data=>>>${JSON.stringify(res.data)}`)
+        if(res.data){
+          this.rows = res.data
+        }else{
+          this.rows = []
+        }
+      })
     },
     makeAPhoneCall(phoneNumber) {
       this.$androidUtil.makeAPhoneCall(phoneNumber)
     },
     upload () {
       this.$goto('up-load')
+    },
+    getpinpai(){
+      Vue.prototype.$pinpai=[]
+      let data={
+        items:"id,f_meter_brand",
+        tablename:"t_gasbrand",
+        condition:`f_filialeids = '${Vue.user.f_orgids}'`,
+        orderitem:'id'
+      }
+      new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+        console.log("666666666666666666662")
+        console.log(JSON.stringify(res))
+        console.log(typeof res)
+        //console.log(JSON.stringify(res.data[0]))
+        let result=res.data
+        result.forEach(ress=>{
+          Vue.prototype.$pinpai.push({
+            id:ress.id,
+            label:ress.f_meter_brand,
+            value:ress.f_meter_brand
+          })
+        })
+      })
+    },
+    getqijia(){
+      let data={
+        items:"f_price_name",
+        tablename:"t_stairprice",
+        condition:`f_filialeids = '${Vue.user.f_orgids}' and f_state= '有效' and getdate()>=f_perform_date and getdate()<=f_end_date `,
+        orderitem:'id'
+      }
+      Vue.prototype.$qijia=[]
+      new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+        console.log("66666666666666666666")
+        console.log(JSON.stringify(res))
+        console.log(typeof res)
+        //console.log(JSON.stringify(res.data[0]))
+        let result=res.data
+        result.forEach(ress=>{
+          Vue.prototype.$qijia.push({
+            label:ress.f_price_name,
+            value:ress.f_price_name
+          })
+        })
+      })
+    },
+    getxinghao(){
+      let data={
+        items:"gm.f_meter_style,gb.id",
+        tablename:"t_gasmodel gm left join t_gasbrand gb on  gm.f_gasbrand_id=gb.id",
+        condition:`gb.f_filialeids = '${Vue.user.f_orgids}'`,
+        orderitem:'gm.id'
+      }
+      Vue.prototype.$xinghao=[]
+      new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+        console.log("66666666666666666666")
+        console.log(JSON.stringify(res))
+        console.log(typeof res)
+        //console.log(JSON.stringify(res.data[0]))
+        let result=res.data
+        result.forEach(ress=>{
+          Vue.prototype.$xinghao.push({
+            id:ress.id,
+            label:ress.f_meter_style,
+            value:ress.f_meter_style
+          })
+        })
+      })
     }
   },
   ready () {
@@ -138,28 +250,63 @@ export default{
     this.timeoutHandle = window.setInterval(function() {
       _this.search()
     }, 6000000)//60000
+    this.getpinpai()
+    this.getqijia()
+    this.getxinghao()
+  },
+  created(){
+    let result = HostApp.readLocalFile('workflow_apply.json')
+    if(result.code == 500){
+       this.$showMessage('获取流程配置文件失败，请联系系统管理员')
+       return
+    }
+    let 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;
-  }
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.button_shrink_top {
+  width: 30px;
+  height: 30px;
+  background-size: 30px 30px;
+  background-image: url("../../../static/newStyle/stretch_top.png")
+}
+
+.button_shrink_bottom {
+  width: 30px;
+  height: 30px;
+  background-size: 30px 30px;
+  background-image: url("../../../static/newStyle/stretch_bottom.png")
+}
+.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/ApplyUserInfo.vue

@@ -12,8 +12,8 @@
         <p>客户电话： {{service.f_phone}}</p>
         <p>客户地址： {{service.f_address}}</p>
         <p>客户类型： {{service.f_user_type}}</p>
-<!--        <p>客户片区： {{service.f_residential_area}}</p>-->
-<!--        <p>客户小区： {{service.f_area}}</p>-->
+        <p>客户片区： {{service.f_residential_area}}</p>
+        <p>客户小区： {{service.f_area}}</p>
         <!--<p>申请户数： {{service.f_apply_count}}</p>-->
         <!--<p>房屋类型： {{service.f_house_type}}</p>-->
       </div>

package/src/components/app_apply/FieldExploration.vue

@@ -34,7 +34,6 @@
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group">
             <label class="text-justify lb-left">勘查日期:</label>
             <datepicker
-              :readonly="true"
               :value.sync="model.f_survey_time"
               :disabled-days-of-Week="[]"
               :format="'yyyy-MM-dd HH:mm:ss'"