apply-clients 4.0.66 → 4.1.1-weinan

package/src/components/app_apply/ApplyApp.vue

@@ -8,10 +8,10 @@
       <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>
 
@@ -19,7 +19,6 @@
 
   import co from 'co'
   import { PagedList } from 'vue-client'
-  import {HttpResetClass} from 'vue-client'
   import Vue from 'vue'
 
   export default {
@@ -38,7 +37,7 @@
         this.$back()
       },
     },
-    async created(){
+    created(){
       var result = HostApp.readLocalFile('workflow_apply.json')
       if(result.code == 500){
         this.$showMessage('获取流程配置文件失败，请联系系统管理员')
@@ -47,66 +46,7 @@
       var data = JSON.parse(result.data)
       console.log('前台存入缓存中的data=>' + JSON.stringify(data))
       Vue.workflow_vue = Vue.prototype.$workflow_vue = data
-
-      let http = new HttpResetClass()
-      var url = this.$androidUtil.getProxyUrl() + '/rs/logic/getSaleInitData'
-      console.log('即将请求后台需要数据，url=>' + url);
-      console.log("this.$user"+Vue.$user)
-      console.log("this.$user"+this.$user)
-     // console.log('this.login===>'+this.$login.f.f_origids)
-      let res = await http.load('POST', url, {data:{f_filialeids:Vue.user.f_orgids}}, {resolveMsg: null, rejectMsg: '获取资源信息失败'})
-      console.log("请求后台获取下发人员结果转换=>" + JSON.stringify(res))
-      let getdata = res.data
-      let appAdjustableData = {};
-      appAdjustableData.adjustables = [];
-      //存储调压箱信息
-      for(let i=0;i<getdata.adjustable.length;i++){
-        let item = getdata.adjustable[i];
-
-        appAdjustableData.adjustables[i] = {}
-        appAdjustableData.adjustables[i].label = item.f_adjustable_name
-        appAdjustableData.adjustables[i].value = item
-      }
-
-      //存储燃气表信息
-      appAdjustableData.grsbrand={};
-      appAdjustableData.grsbrand.f_meter_brand=[];
-      appAdjustableData.grsbrand.f_manufacturers=[];
-      for(let i=0;i<getdata.gasbrands.length;i++){
-        let item = getdata.gasbrands[i];
-        appAdjustableData.grsbrand.f_meter_brand[i]={};
-        appAdjustableData.grsbrand.f_meter_brand[i].name={};
-        appAdjustableData.grsbrand.f_meter_brand[i].f_meter_style=[];
-        //存储燃气表名
-        appAdjustableData.grsbrand.f_meter_brand[i].name.label = item.f_meter_brand;
-        appAdjustableData.grsbrand.f_meter_brand[i].name.value = item.f_meter_brand;
-        //存储燃气表类型
-        for(let j=0;j<item.gasmodel.length;j++){
-          let branstyle=item.gasmodel[j];
-          appAdjustableData.grsbrand.f_meter_brand[i].f_meter_style[j]={};
-          appAdjustableData.grsbrand.f_meter_brand[i].f_meter_style[j].label=branstyle.f_meter_style;
-          appAdjustableData.grsbrand.f_meter_brand[i].f_meter_style[j].value=branstyle.f_meter_style;
-        }
-        //存储燃气表生成厂家
-        appAdjustableData.grsbrand.f_manufacturers[i]={};
-        appAdjustableData.grsbrand.f_manufacturers[i].label = item.f_manufacturers;
-        appAdjustableData.grsbrand.f_manufacturers[i].value = item.f_manufacturers;
-      }
-
-      // //存储气价
-      // appAdjustableData.price=[];
-      // appAdjustableData.price2=[];
-      // appAdjustableData.price2[0]={};
-      // appAdjustableData.price[0]={};
-      // appAdjustableData.price[0].label="固定气价";
-      // appAdjustableData.price[0].value="固定气价";
-      // appAdjustableData.price2[0].label="居民用气";
-      // appAdjustableData.price2[0].value="居民用气";
-      // console.log(appAdjustableData)
-      Vue.appAdjustableData = Vue.prototype.$appAdjustableData = appAdjustableData;
-      console.log('参数组织完毕', appAdjustableData)
     }
-
   }
 
 </script>

package/src/components/app_apply/ApplyDownList.vue

@@ -27,7 +27,7 @@
                     用户姓名: {{row.f_user_name}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    用户类型: {{row.f_gas_type}}
+                    用户类型: {{row.f_user_type}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     用户地址: {{row.f_address}}
@@ -40,7 +40,7 @@
                     流程状态: {{row.f_order_type}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    报建类型: {{row.f_order_type}}
+                    报建类型: {{row.f_apply_type}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     报建日期: {{row.f_apply_date}}

package/src/components/app_apply/ApplyInfo.vue

@@ -9,7 +9,7 @@
     <div class="panel panel-default auto repair-info-content">
       <div class="panel-body">
         <p>报建编号： {{service.f_apply_num}}</p>
-        <p>报建类型： {{service.f_order_type}}</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>

package/src/components/app_apply/ApplyToDoList.vue

@@ -9,21 +9,8 @@
         <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>
-        <div class="col-sm-10 form-group">
-          <label class="control-label col-sm-6">流程名称</label>
-          <v-select :class="'col-sm-6'"  :value.sync="selectvalue" v-model="selectvalue"
-                    :options='searchoptions' ></v-select>
-        </div>
-        <div class="col-sm-10 form-group">
-          <label class="control-label col-sm-6">用户名称：</label>
-          <div class="col-sm-6">
-            <input type="text" class="form-control" v-model="searchusername"/>
-          </div>
-        </div>
-        <div class="col-sm-10 form-group">
-          <button class="btn btn-warning" @click="search"  style="float:right">查询</button>
-        </div>
       </blockquote>
     </div>
     <div class="panel panel-default repair-info-content auto">
@@ -40,7 +27,7 @@
                     用户姓名: {{row.f_user_name}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    用户类型: {{row.f_gas_type}}
+                    用户类型: {{row.f_user_type}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     用户地址: {{row.f_address}}
@@ -53,7 +40,7 @@
                     流程状态: {{row.f_order_type}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
-                    报建类型: {{row.f_order_type}}
+                    报建类型: {{row.f_apply_type}}
                   </div>
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     报建日期: {{row.f_apply_date}}
@@ -85,17 +72,7 @@ export default{
         default:{
 
         }
-      },
-      searchoptions:[
-          {label: '请选择', value: ''},
-          {label: '民用现场勘查', value: '民用现场勘查'},
-          {label: '工商现场勘查', value: '工商现场勘查'},
-          {label: '户内安装', value: '户内安装'},
-          {label: '点火', value: '点火'}
-      ],
-      selectvalue:"",
-      searchusername:""
-
+      }
     }
   },
   props: {
@@ -135,25 +112,12 @@ export default{
 
       // app正式运行程序
       console.log('------app开始查询本地代办工单------')
-      this.rows = []
-      let searchCondition=""
-      let searchname=""
-      if(this.selectvalue != ""){
-          searchCondition="and u.f_order_type='"+this.selectvalue+"'";
-      }else {
-          searchCondition=""
-      }
-      if(this.searchusername !=""){
-          searchname = "and u.f_user_name like '%"+this.searchusername+"%'";
-      }else{
-          searchname=""
-      }
-      var condition = ' (u.f_app_upload != \'已上传\' or u.f_app_upload is null )'+ searchCondition+searchname;
+      var condition = ' (u.f_app_upload != \'已上传\' or u.f_app_upload is null) '
       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=>>>${JSON.stringify(res.data)}`)
+      console.log(`前台本地报建代办工单查询结果data=>>>${res.data}`)
       if(res.data){
          this.rows = res.data.rows
       }else{

package/src/components/app_apply/ApplyUserInfo.vue

@@ -11,7 +11,7 @@
         <p>客户姓名： {{service.f_user_name}}</p>
         <p>客户电话： {{service.f_phone}}</p>
         <p>客户地址： {{service.f_address}}</p>
-        <p>客户类型： {{service.f_gas_type}}</p>
+        <p>客户类型： {{service.f_user_type}}</p>
         <p>客户片区： {{service.f_residential_area}}</p>
         <p>客户小区： {{service.f_area}}</p>
         <!--<p>申请户数： {{service.f_apply_count}}</p>-->

package/src/components/app_apply/FieldExploration.vue

@@ -5,11 +5,11 @@
         <div class="row auto">
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group mg8">
             <label class="text-justify lb-left" for="f_install_num">实际可安装用户:</label>
-            <input  type="text" class="form-control" id="f_install_num" v-model="model.f_install_num" >
+            <input  type="number" class="form-control" id="f_install_num" v-model="model.f_install_num" >
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" >
             <label class="text-justify lb-left" for="costmatter">缴费户数:</label>
-            <input  type="text" class="form-control" id="costmatter" v-model="model.f_payfee_num" >
+            <input  type="number" class="form-control" id="costmatter" v-model="model.f_payfee_num" >
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group">
             <label class="text-justify lb-left" >用气类型:</label>

package/src/components/app_apply/PlaceControler.vue

@@ -35,13 +35,11 @@
 <script>
   import ApplyUserInfo from "./ApplyUserInfo";
   import ApplyInfo from "./ApplyInfo";
-  import Vue from 'vue'
   // import FieldExploration from "./FieldExploration";
   // import Ventilation from "./Ventilation";
   // import Acceptance from "./Acceptance";
   import ServiceControl from "./ServiceControl";
-  Vue.showFlag = Vue.prototype.showFlag = false
-  Vue.activity_id = Vue.prototype.activity_id = "";
+
   export default {
     title: '报建代办详情',
     props: {
@@ -133,14 +131,12 @@
         // 给各自组件添加参数
         this.tabs['apply-user-info'].props = {service: this.row, shutype: 'shu'}
         // this.tabs['apply-info'].props = {service: this.row, shutype: 'shu'}
-        //this.tabs['apply-defame-work'].props = {model: this.row}
+        // this.tabs['apply-defame-work'].props = {model: this.row, shutype: 'shu'}
 
         this.$goto('apply-user-info', this.tabs[this.componentName].props, 'apply')
-      }
+      },
     },
     ready () {
-      Vue.prototype.$showFlag = this.row.canedit
-      Vue.prototype.$activity_id = this.row.f_apply_num
       var keyName = 'apply-defame-work'
       var valueHeader = this.row.f_order_type
       var value = {