apply-clients 4.1.10-11 → 4.1.10-weinan

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.f_sub_state}}</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>

package/src/components/app_apply/ApplyToDoList.vue

@@ -1,165 +1,144 @@
-<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 = true
-      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 () {
-      //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) '
-      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
-  }
-}
-</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_entry_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_sub_state}}
+                  </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.defname}}
+                  </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'
+  import  {HttpResetClass} from 'vue-client'
+export default{
+  title: '待办报建列表',
+  data () {
+    return {
+      // rows: Object
+      rows: [],
+      editshow:false,
+      row:{
+        type:Object,
+        default:{
+
+        }
+      }
+    }
+  },
+  props: {
+    sourcet:{
+      type:String,
+      default:'横屏'
+    }
+  },
+  methods: {
+    selected (row) {
+      row.canedit = true
+      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 () {
+      var condition = "1=1"
+      var param = {condition: condition,condValue:[],data:{"id": Vue.user.id,orgid: Vue.user.orgid}}
+      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')
+    }
+  },
+  ready () {
+    this.search()
+    var _this = this;
+    this.timeoutHandle = window.setInterval(function() {
+      _this.search()
+    }, 6000000)//60000
+  }
+}
+</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/FieldExploration.vue

@@ -12,8 +12,8 @@
             <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>
-            <!--<v-select @selected="gastype_change" :disabled="!model.canedit" value="model.f_gas_type" :options='fgastype' placeholder='用水类型' close-on-select :value-single="true">-->
+            <label class="text-justify lb-left" >用气类型:</label>
+            <!--<v-select @selected="gastype_change" :disabled="!model.canedit" value="model.f_gas_type" :options='fgastype' placeholder='用气类型' close-on-select :value-single="true">-->
             <!--</v-select>-->
             <select v-model="model.f_gas_type"  class="form-control">
               <option v-for="option in fgastype">
@@ -158,7 +158,7 @@
           type: Boolean,
           default: true
         },
-        fgastype: this.$appdata.getParam('用水类型'),
+        fgastype: this.$appdata.getParam('用气类型'),
         fsurveyname : this.$appdata.getParam('勘查人员')
       }
     },