apply-clients 3.4.78 → 3.4.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.4.78",
+  "version": "3.4.79",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/filiale/shexian/android/AppExplorationUser.vue

@@ -335,7 +335,7 @@ export default {
       this.$refs.cp.$refs.cri.search()
     },
     searchCondition (args) {
-      args.condition =  args.condition + `and (act.defname in ('现场勘查','点火派单','验收')) `
+      args.condition =  args.condition + `and (act.defname in ('工程施工','通气点火','现场勘查','点火派单','验收')) `
       this.model.search(args.condition, args.model)
     },
     click (row) {

package/src/filiale/shexian/android/AppInstallationDetails.vue

@@ -85,7 +85,7 @@
           </div>
           <div class="form-group row vertical-center" :class="item.f_meternumber ? '':'has-error'">
             <label class="col-xs-4 control-label">表&emsp;&emsp;号：</label>
-            <div class="col-xs-8">
+            <div class="col-xs-8" style="width:50%">
               <input class="form-control input_view" style=""
                      placeholder="表号"
                      v-model="item.f_meternumber"
@@ -95,19 +95,20 @@
                      @change="meternumberValidate(i)"
                      :readonly="false"/>
             </div>
+            <button
+              type="button" name="button" class="btn btn-primary" style="float: right;" @click="scan(i)">扫码
+            </button>
           </div>
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label ">表&ensp;封&ensp;号：</label>
-            <div class="col-xs-8"  style="width:50%">
+            <div class="col-xs-8"  >
               <input class="form-control input_view" style=""
                      placeholder="表封号"
                      v-model="item.f_metertitles"
                      :value="item.f_metertitles"
                      :readonly="false"/>
             </div>
-            <button
-              type="button" name="button" class="btn btn-primary" style="float: right;" @click="scan(i)">扫码
-            </button>
+
           </div>
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label">表&ensp;读&ensp;数：</label>
@@ -204,7 +205,7 @@
 import Vue from 'vue'
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
-import {isEmpty} from '../../../components/utils'
+import {isEmpty} from '../../../components/Util'
 // Date格式化
 Date.prototype.Format = function (fmt) {
   var o = {
@@ -412,6 +413,9 @@ export default {
 
       if (this.selectdata.f_apply_type === '团购转散户' || this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建' || this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建') {
         data.condition = `ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+      }else if(this.selectdata.f_apply_source === '自动发起'){
+        data.condition= ` ua.f_process_id= '${this.selectdata.f_parent_process_id}'`+
+          `and ui.f_userinfo_id= '${this.selectdata.f_userinfo_id}'`
       }
       let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getAddresAndUserinfoAndUserfilesAmount`, {data:data}, {
       // let res = await http.load('POST', `rs/sql/getAddresAndUserinfoAndUserfilesAmount`, {data:data}, {