apply-clients 3.4.85 → 3.4.88

package/package.json

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

package/src/filiale/hongda/android/AppAddMaterialScience.vue

@@ -8,6 +8,7 @@
           <th class="textNoLineBreak">材料型号</th>
           <th class="textNoLineBreak">材料单位</th>
           <th class="textNoLineBreak">材料数量</th>
+          <th class="textNoLineBreak">应免数量</th>
           <th class="textNoLineBreak">材料价格</th>
           <th class="textNoLineBreak">材料状态</th>
           <th class="textNoLineBreak">
@@ -33,6 +34,9 @@
           <td style="text-align: center;">
             <nobr>{{row.f_material_number}}</nobr>
           </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_quantity_payable}}</nobr>
+          </td>
           <td style="text-align: center;">
             <nobr>{{row.f_material_price}}</nobr>
           </td>
@@ -121,6 +125,16 @@
               />
             </div>
           </div>
+          <div class="form-group col-sm-6" :class="[item.f_quantity_payable ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">应免数量：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="number"
+                     placeholder="应免数量"
+                     v-model="item.f_quantity_payable"
+                     :value="item.f_quantity_payable"
+              />
+            </div>
+          </div>
           <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">材料价格：</label>
             <div class="col-sm-8">
@@ -215,7 +229,8 @@
             f_material_style: '',
             f_material_unit: '',
             f_material_number: '',
-            f_material_price:''
+            f_material_price:'',
+            f_quantity_payable:0
           }
         ],
         meterialOptions: [],
@@ -237,7 +252,7 @@
         }
         let res = await http.load(
           'POST',
-          `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable?aaa=123`,
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
           {data: data},
           {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
         )
@@ -253,7 +268,8 @@
             f_material_style: '',
             f_material_unit: '',
             f_material_number: '',
-            f_material_price:''
+            f_material_price:'',
+            f_quantity_payable:0
           }
         ],
           this.showMaterialModal = true
@@ -270,7 +286,8 @@
           f_material_style: '',
           f_material_unit: '',
           f_material_number: '',
-          f_material_price:''
+          f_material_price:'',
+          f_quantity_payable:0
         })
         this.isShow.push(false)
       },
@@ -301,14 +318,8 @@
         this.materials[index].f_material_name = material.f_material_name
         this.materials[index].f_material_style = material.f_material_style
         this.materials[index].f_material_unit = material.f_material_unit
-        this.materials[index].f_material_number = material.f_material_number
         this.materials[index].f_material_price = material.f_material_price
-        if (material.f_material_name === "报警器-汉威") {
-          this.isShow[index] = true
-        } else {
-          this.isShow[index] = false
-        }
-        this.isShow.splice(0, 1, this.isShow[0])
+
       },
       // 新增材料
       async addMaterial() {
@@ -358,7 +369,8 @@
             f_material_style: row.f_material_style,
             f_material_unit: row.f_material_unit,
             f_material_number: row.f_material_number,
-            f_material_price: row.f_material_price
+            f_material_price:row.f_material_price,
+            f_quantity_payable:row.f_quantity_payable
           }
         ]
         this.showMaterialModal = true
@@ -370,7 +382,7 @@
         data.f_material_unit = this.materials[0].f_material_unit
         data.f_material_number = this.materials[0].f_material_number
         data.f_material_price = this.materials[0].f_material_price
-
+        data.f_quantity_payable = this.materials[0].f_quantity_payable
         let http = new HttpResetClass()
         let res = await http.load(
           'POST',

package/src/filiale/hongda/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/hongda/android/AppInstallationDetails.vue

@@ -0,0 +1,494 @@
+<template>
+  <div>
+    <list :model="model" partial='list'>
+      <div partial class="auto app-text panel">
+        <div class="panel-body panel-self">
+          <div class="row">
+            <p class="col-xs-3 text-left font"><b>客户编号</b></p>
+            <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_userinfo_code }}</p>
+          </div>
+          <div class="row">
+            <p class="col-xs-3 text-left font"><b>客户名称</b></p>
+            <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_user_name }}</p>
+          </div>
+          <div class="row">
+            <p class="col-xs-3 text-left font"><b>客户电话</b></p>
+            <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_user_phone }}</p>
+          </div>
+          <div class="row">
+            <p class="col-xs-3 text-left font"><b>地址信息</b></p>
+            <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_address }}</p>
+          </div>
+          <div class="row">
+            <p class="col-xs-3 text-left font"><b>表具数量</b></p>
+            <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{row.f_userfiles_num === null ? 0 : row.f_userfiles_num}}</p>
+          </div>
+          <div class="row text-right">
+            <button class="btn btn-info"
+                    :disabled="(row.f_cumulative_payment_money < $parent.$parent.selectdata.f_price && ($parent.$parent.selectdata.f_apply_type === '散户集体报建' || $parent.$parent.selectdata.f_apply_type === '煤改气报建')) || $parent.$parent.mark === 1"
+                    @click.prevent="$parent.$parent.showUserFileModal(row)">
+              {{row.f_userfiles_num > 0 ? '修正' : '添加'}}
+            </button>
+          </div>
+        </div>
+      </div>
+    </list>
+
+    <modal v-if="showUserFile" :show.sync="showUserFile" v-ref:modal :large="true" :backdrop="false" title="安装明细" width="100%">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeUserFile"><span>&times;</span></button>
+        <h4 class="modal-title">安装明细</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="form-group row vertical-center">
+          <label class="col-xs-4 control-label">地址信息：</label>
+          <div class="col-xs-8">
+            <input class="form-control input_view" style=""
+                   v-model="useradders.f_address"
+                   :value="useradders.f_address"
+                   :readonly="true"/>
+          </div>
+        </div>
+
+        <div v-for="(i, item) in userinfo.userfiles" class="form-group col-xs-12 panel panel-info">
+          <div class="panel-heading head row" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-xs-6 text-left">表具{{$index+1}}信息</div>
+            <div class="col-xs-6 text-right"><button
+              class="btn btn-danger"
+              v-if="!item.f_userfiles_id"
+              @click.prevent="deleteUserFile(i)"
+            >删除</button></div>
+          </div>
+          <div class="form-group row vertical-center" :class="item.f_gasbrand_id ? '':'has-error'">
+            <label class="col-xs-4 control-label">气表品牌：</label>
+            <div class="col-xs-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.gasbrand"
+                v-model="item.gasbrand"
+                :options="meterbrands"
+                @change="gasbrandChange(i)"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group row vertical-center" :class="item.f_gasmodel_id ? '':'has-error'">
+            <label class="col-xs-4 control-label">气表型号：</label>
+            <div class="col-xs-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.gasmodel"
+                v-model="item.gasmodel"
+                :options="item.gasbrand.gasmodel"
+                @change="gasmodelChange(i)"
+                :valueSingle="true"></input-select>
+            </div>
+          </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">
+              <input class="form-control input_view" style=""
+                     placeholder="表号"
+                     v-model="item.f_meternumber"
+                     type="number"
+                     οnkeyup="this.value=this.value.replace(/\s+/g,'')"
+                     :value="item.f_meternumber"
+                     @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">
+              <input class="form-control input_view" style=""
+                     placeholder="表封号"
+                     v-model="item.f_metertitles"
+                     :value="item.f_metertitles"
+                     :readonly="false"/>
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">表&ensp;读&ensp;数：</label>
+            <div class="col-xs-8">
+              <input class="form-control input_view" style=""
+                     onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+                     type="number"
+                     placeholder="表读数"
+                     v-model="item.f_meter_base"
+                     :value="item.f_meter_base"
+                     :readonly="false"/>
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">初始底数：</label>
+            <div class="col-xs-8">
+              <input class="form-control input_view" style=""
+                     onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+                     type="number"
+                     v-model="item.f_initial_base"
+                     :value="item.f_initial_base"
+                     placeholder="初始底数"
+                     :readonly="false"/>
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">表&emsp;&emsp;向：</label>
+            <div class="col-xs-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.f_aroundmeter"
+                v-model="item.f_aroundmeter"
+                :options="aroundmeters"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">安装位置：</label>
+            <div class="col-xs-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.f_position"
+                v-model="item.f_position"
+                :options="positions"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">安&ensp;装&ensp;人：</label>
+            <div class="col-xs-8">
+              <input class="form-control input_view" style=""
+                     v-model="item.f_install_person"
+                     :value.sync="installperson(item.f_install_person)"
+                     placeholder="安装人"
+                     readonly/>
+<!--              <input-select-->
+<!--                class="select select_list"-->
+<!--                :value.sync="item.f_install_person"-->
+<!--                v-model="item.f_install_person"-->
+<!--                :options="installperson"-->
+<!--                :valueSingle="true"></input-select>-->
+            </div>
+          </div>
+          <div class="form-group row vertical-center">
+            <label class="col-xs-4 control-label">安装日期：</label>
+            <div class="col-xs-8">
+              <input class="form-control input_view" style=""
+                     v-model="item.f_install_date"
+                     :value.sync="installdate(item.f_install_date)"
+                     placeholder="安装日期"
+                     readonly/>
+<!--              <datepicker-->
+<!--                placeholder="安装日期"-->
+<!--                :value.sync="item.f_install_date"-->
+<!--                v-model="item.f_install_date"-->
+<!--                format="yyyy-MM-dd HH:mm:ss"-->
+<!--                :show-reset-button="reset">-->
+<!--              </datepicker>-->
+            </div>
+          </div>
+        </div>
+
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <!-- 去除一户多表 -->
+        <button type="button" class="btn btn-primary" @click="addUserFile" v-if="false">添加表具</button>
+        <button type="button" class="btn btn-primary" @click="saveUserFile">确认</button>
+      </footer>
+    </modal>
+  </div>
+
+</template>
+<script>
+import Vue from 'vue'
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import {isEmpty} from '../../../components/Util'
+// Date格式化
+Date.prototype.Format = function (fmt) {
+  var o = {
+    'M+': this.getMonth() + 1, // 月份
+    'd+': this.getDate(), // 日
+    'H+': this.getHours(), // 小时
+    'm+': this.getMinutes(), // 分
+    's+': this.getSeconds(), // 秒
+    'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+    'S': this.getMilliseconds() // 毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  }
+  return fmt
+}
+
+export default {
+  title: '安装明细',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showUserFile: false,
+      model: {
+        rows: null
+      },
+      meterbrands: [],      // 气表品牌
+      useradders: null,
+      userinfo: {}
+    }
+  },
+  ready () {
+    this.search()
+    this.getMeterbrands()
+  },
+  methods: {
+    scan(index) {
+      HostApp.__this__ = this,
+        HostApp.scanCode({callback: "javascript:HostApp.__this__.getCode("+index+");"})
+    },
+    getCode(index) {
+      var datapa = HostApp.getCode().data;
+      console.log(datapa)
+      this.userinfo.userfiles[index].f_meternumber = datapa
+    },
+    // 删除未保存的表具
+    async deleteUserFile (index) {
+      this.userinfo.userfiles.splice(index, 1)
+    },
+    // 追加表具
+    addUserFile() {
+      this.userinfo.userfiles.push({})
+    },
+    // 保存档案
+    async saveUserFile() {
+      // 检查必填项
+      for (let i = 0; i < this.userinfo.userfiles.length; i++) {
+        let userfile = this.userinfo.userfiles[i]
+        if (userfile.f_gasbrand_id === null || userfile.f_gasbrand_id === '') {
+          this.$showMessage(`表具${i+1}气表品牌没有选择！！！`)
+          return
+        }
+        if (userfile.f_gasmodel_id === null || userfile.f_gasmodel_id === '') {
+          this.$showMessage(`表具${i+1}气表型号没有选择！！！`)
+          return
+        }
+        if (userfile.f_meternumber === null || userfile.f_meternumber === '') {
+          this.$showMessage(`表具${i+1}表号没有填写！！！`)
+          return
+        }
+      }
+      let data = {
+        // user: {"f_show_department_name":"","parentname":"营业厅","functions":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"客服系统","icon":"/images/lefticon/档案管理.png","hasright":false,"resourcetype":"function","parentid":"27","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"address-manage","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"33664","name":"地址管理","templatename":"functionedit","id":"33663","position":"5","fullname":"资源管理.功能模块.客服系统.档案管理.地址管理","fullid":"3.21.27.212.33663","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"file-user-files","hasright":true,"resourcetype":"function","parentid":"212","children":[],"selfid":"237","name":"用户档案","templatename":"functionedit","id":"236","position":"8","fullname":"资源管理.功能模块.客服系统.档案管理.用户档案","fullid":"3.21.27.212.236","tablename":"t_function"}],"selfid":"213","name":"档案管理","templatename":"functionedit","id":"212","position":"2","fullname":"资源管理.功能模块.客服系统.档案管理","fullid":"3.21.27.212","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"客服系统","icon":"/images/lefticon/综合业务.png","hasright":false,"resourcetype":"function","parentid":"27","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"综合业务","link":"param-manage","hasright":true,"resourcetype":"function","parentid":"284","children":[],"selfid":"303","name":"参数管理","templatename":"functionedit","id":"302","position":"3","fullname":"资源管理.功能模块.客服系统.综合业务.参数管理","fullid":"3.21.27.284.302","tablename":"t_function"}],"selfid":"285","name":"综合业务","templatename":"functionedit","id":"284","position":"5","fullname":"资源管理.功能模块.客服系统.综合业务","fullid":"3.21.27.284","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"客服系统","icon":"/images/lefticon/报建系统.png","hasright":true,"resourcetype":"function","parentid":"27","f_parentname":"客服系统","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"install-function","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34680","name":"功能业务","templatename":"functionedit","id":"34679","position":"1","fullname":"资源管理.功能模块.客服系统.报建业务.功能业务","fullid":"3.21.27.34673.34679","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"exploration-user","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34686","name":"流程业务","templatename":"functionedit","id":"34685","position":"2","fullname":"资源管理.功能模块.客服系统.报建业务.流程业务","fullid":"3.21.27.34673.34685","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"supervisory-control","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34692","name":"流程监控","templatename":"functionedit","id":"34691","position":"3","fullname":"资源管理.功能模块.客服系统.报建业务.流程监控","fullid":"3.21.27.34673.34691","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"apply-charge-search","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34698","name":"收费明细","templatename":"functionedit","id":"34697","position":"4","fullname":"资源管理.功能模块.客服系统.报建业务.收费明细","fullid":"3.21.27.34673.34697","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"order-apply","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34704","name":"预约申请","templatename":"functionedit","id":"34703","position":"5","fullname":"资源管理.功能模块.客服系统.报建业务.预约申请","fullid":"3.21.27.34673.34703","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"15","parentname":"报建业务","link":"stop-apply","hasright":true,"resourcetype":"function","parentid":"34673","f_parentname":"报建业务","children":[],"selfid":"34710","name":"终止报建","templatename":"functionedit","id":"34709","position":"6","fullname":"资源管理.功能模块.客服系统.报建业务.终止报建","fullid":"3.21.27.34673.34709","tablename":"t_function"}],"selfid":"34674","name":"报建业务","templatename":"functionedit","id":"34673","position":"11","fullname":"资源管理.功能模块.客服系统.报建业务","fullid":"3.21.27.34673","tablename":"t_function"}],"qrcode":"/rs/user/getQRcode?QRCODE=406b-1630284429661-03197","rolesnames":"营业厅报装,设计部报装,市场部报装,工程部报装,运营部报装,财务部报装","roles":"34751,34757,34763,34769,34775,35326","f_sex":"男","f_icon":"tree_user","fullnames":"河南亿星集团实业有限公司.周口市天然气有限公司.营业厅.报建测试","dir":"zhoukou","userid":"406b-1630284429661-03197","accesstime":"1630409418399","parentid":"34715","f_show_rolestr":"","fullids":"30463.10101.34715.34781.","number":"10101","f_idnumber":{},"selfid":"34782","templatename":"useredit","logindate":"2021-08-30 16:36:39","id":"34781","state":"在职","tablename":"t_user","deptype":"部门","depids":"34715","loginid":"15","imgid":{},"f_user_telephone":{},"rolestr":"营业厅报装,设计部报装,市场部报装,工程部报装,运营部报装,财务部报装","deps":"营业厅","loginnum":"0","f_age":{},"resourcetype":"user","orgid":"10101","f_department_name":"营业厅","ename":"bjcs","deleted":"false","entitytype":"t_user","f_description":{},"loginip":"192.168.66.138","name":"报建测试","position":"1","orgs":"周口市天然气有限公司","f_role_name":"营业厅报装 设计部报装 市场部报装 工程部报装 运营部报装 财务部报装 ","f_allArea":[],"f_gasman":[],"lics":[]},
+        user: Vue.user,
+        useradders: this.useradders,
+        userinfo: this.userinfo,
+        selectdata: this.selectdata
+      }
+      let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/addInstallationDetails`, {data:data}, {
+      // let res = await this.$resetpost(`rs/logic/addInstallationDetails`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '表具添加失败！！！'
+      })
+
+      this.closeUserFile()
+      this.$dispatch('breakControl')
+    },
+    // 检查表号是否存在
+    async meternumberValidate(i) {
+      if (!this.userinfo.userfiles[i].f_gasbrand_id) {
+        this.userinfo.userfiles[i].f_meternumber = ''
+        this.$showMessage('请先选择气表品牌！！！')
+        return
+      }
+      if (this.userinfo.userfiles[i].f_gasbrand_id && this.userinfo.userfiles[i].f_meternumber) {
+        let data = {
+          f_meternumber: this.userinfo.userfiles[i].f_meternumber,
+          f_gasbrand_id: this.userinfo.userfiles[i].f_gasbrand_id
+        }
+        if (this.userinfo.userfiles[i].f_userfiles_id) {
+          data.f_userfiles_id = this.userinfo.userfiles[i].f_userfiles_id
+        }
+        let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/meterbrandsNumberValidate`, {data:data}, {
+        // let res = await this.$resetpost(`rs/logic/meterbrandsNumberValidate`, {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '表号验证失败！！'
+        })
+        if (res.data) {
+          this.userinfo.userfiles[i].f_meternumber = ''
+          this.$showMessage('表号已存在！！')
+        }
+      }
+    },
+    // 选择气表型号
+    gasmodelChange(i) {
+      if (this.userinfo.userfiles[i].gasmodel) {
+        this.userinfo.userfiles[i].f_gasmodel_id = this.userinfo.userfiles[i].gasmodel.id
+      }
+    },
+    // 选择气表品牌
+    gasbrandChange(i) {
+      // 清空已保存的气表型号
+      this.userinfo.userfiles[i].f_gasmodel_id = null
+      this.userinfo.userfiles[i].gasmodel = null
+
+      if (this.userinfo.userfiles[i].gasbrand) {
+        // 气表品牌id
+        this.userinfo.userfiles[i].f_gasbrand_id = this.userinfo.userfiles[i].gasbrand.id
+        // 气表分类
+        this.userinfo.userfiles[i].f_meter_classify = this.userinfo.userfiles[i].gasbrand.f_meter_type
+      }
+    },
+    // 打开安装明细
+    async showUserFileModal (row) {
+      this.useradders = row
+
+      let http = new HttpResetClass()
+      let data = {
+        condition: `f_userinfo_id='${row.f_userinfo_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getUserinfoAndUserfiles`, {data:data}, {
+      // let res = await http.load('POST', `rs/logic/getUserinfoAndUserfiles`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+
+      this.userinfo = res.data
+
+      // 已有表具的 气表信息补充
+      for (let i = 0; i < this.userinfo.userfiles.length; i++) {
+        for (const item of this.meterbrands) {
+          if (item.value.id === this.userinfo.userfiles[i].f_gasbrand_id) {
+            // this.userinfo.userfiles[i].gasbrand = item.value // 防止双向绑定失败
+            Vue.set(this.userinfo.userfiles[i], 'gasbrand', item.value)
+          }
+        }
+        if (this.userinfo.userfiles[i].gasbrand) {
+          for (const item of this.userinfo.userfiles[i].gasbrand.gasmodel) {
+            if (item.value.id === this.userinfo.userfiles[i].f_gasmodel_id) {
+              // this.userinfo.userfiles[i].gasmodel = item.value
+              Vue.set(this.userinfo.userfiles[i], 'gasmodel', item.value)
+            }
+          }
+        }
+      }
+
+      this.showUserFile = true
+    },
+    // 获取气表品牌
+    async getMeterbrands() {
+      let http = new HttpResetClass()
+      let data = {
+        f_orgid: Vue.user.orgid
+        // f_orgid: '10101'
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getMeterbrands`, {data:data}, {
+      // let res = await http.load('POST', `rs/logic/getMeterbrands`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+      this.meterbrands = res.data
+    },
+    // 查询
+    async search () {
+      var tablestate=''
+      if(this.selectdata.f_sub_state==='完工'){
+        tablestate='正常'
+      }else{
+        tablestate='待开通'
+      }
+      let http = new HttpResetClass()
+      let data = {
+        condition: `ua.f_process_id = '${this.selectdata.f_process_id}'`,
+        condValue : tablestate
+      }
+
+      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}'`
+      }
+      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}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+      this.model.rows = res.data
+      if (this.selectdata.f_apply_type === '团购报建') {
+        let f_installed_households = 0
+        for (const item of res.data) {
+          if (item.f_userfiles_num > 0) {
+            f_installed_households++
+          }
+        }
+        let f_uninstalled_households = this.selectdata.f_apply_count - f_installed_households
+        for (const item of this.selectdata.fields) {
+          if (item.label === '已安装户数') {
+            item.value = f_installed_households
+          }
+          if (item.label === '未安装户数') {
+            item.value = f_uninstalled_households
+          }
+        }
+      }
+    },
+    // 关闭安装明细
+    closeUserFile() {
+      this.showUserFile = false
+      this.useradders = null
+      this.userinfo = {}
+      this.search()
+    },
+  },
+  events: {
+  },
+  computed: {
+    // 安装人
+    installperson() {
+      return function (f_install_person) {
+        if (isEmpty(f_install_person)) {
+          return Vue.user.name
+        }
+        return f_install_person
+      }
+    },
+    installdate() {
+      return function (f_install_date) {
+        if (isEmpty(f_install_date)) {
+          return new Date().Format('yyyy-MM-dd HH:mm:ss')
+        }
+        return f_install_date
+      }
+    },
+    // 表向
+    aroundmeters() {
+      return this.$appdata.getParam('左右表')
+    },
+    // 安装位置
+    positions() {
+      return this.$appdata.getParam('安装位置')
+    }
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.vertical-center {
+  display: flex;
+  align-items: center;
+  text-align: center;
+}
+/*清除model中的浮动*/
+.clearfix:after,.clearfix:before{
+  display: table;
+}
+.clearfix:after{
+  clear: both;
+}
+</style>

package/src/filiale/hongda/android.js

@@ -2,6 +2,7 @@ import Vue from "vue";
 
 let specialComp = {
   'app-add-material-science': (resolve) => { require(['./android/AppAddMaterialScience'], resolve) },
-  'app-exploration-user': (resolve) => { require(['./android/AppExplorationUser'], resolve) }
+  'app-exploration-user': (resolve) => { require(['./android/AppExplorationUser'], resolve) },
+  'app-installation-details': (resolve) => { require(['./android/AppInstallationDetails'], resolve) }
 }
 exports.specialComp = specialComp