apply-clients 3.3.222 → 3.4.2-FuGu-4

package/src/components/android/Process/Processes/AppInstallationDetails.vue

@@ -4,24 +4,28 @@
       <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-3 text-left font"><b class="control-label-justify">客户编号</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-3 text-left font"><b class="control-label-justify">客户名称</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-3 text-left font"><b class="control-label-justify">客户电话</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 class="row" v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建' || $parent.$parent.selectdata.f_apply_type === '煤改气报建'">
+            <p class="col-xs-3 text-left font"><b class="control-label-justify">单价</b></p>
+            <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ $parent.$parent.selectdata.f_price }}</p>
+          </div>
+          <div class="row" v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建' || $parent.$parent.selectdata.f_apply_type === '煤改气报建'">
+            <p class="col-xs-3 text-left font"><b class="control-label-justify">累计缴费</b></p>
+            <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_cumulative_payment_money }}</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>
+            <p class="col-xs-3 text-left font"><b class="control-label-justify">地址信息</b></p>
+            <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_address }}</p>
           </div>
           <div class="row text-right">
             <button class="btn btn-info"
@@ -51,14 +55,7 @@
         </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="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">表具{{$index+1}}信息</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">
@@ -151,34 +148,24 @@
           <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"
-                     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>-->
+              <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>-->
+              <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>
@@ -186,7 +173,7 @@
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <!-- 去除一户多表 -->
-        <button type="button" class="btn btn-primary" @click="addUserFile">添加表具</button>
+        <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>
@@ -198,23 +185,6 @@ import Vue from 'vue'
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
 import {isEmpty} from '../../../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: '安装明细',
@@ -243,16 +213,12 @@ export default {
     this.getMeterbrands()
   },
   methods: {
-    // 删除未保存的表具
-    async deleteUserFile (index) {
-      this.userinfo.userfiles.splice(index, 1)
-    },
-    // 追加表具
-    addUserFile() {
-      this.userinfo.userfiles.push({})
-    },
     // 保存档案
     async saveUserFile() {
+      if (this.userinfo.userfiles.length > 1) {
+        this.$showMessage('该地址下已有表具信息，暂不支持一户多表！！！')
+        return
+      }
       // 检查必填项
       for (let i = 0; i < this.userinfo.userfiles.length; i++) {
         let userfile = this.userinfo.userfiles[i]
@@ -270,20 +236,18 @@ export default {
         }
       }
       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: {"parentname":"客服中心","functions":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"客服系统","icon":"/images/lefticon/档案管理.png","hasright":false,"resourcetype":"function","parentid":"21","f_parentname":"客服系统","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"档案管理","link":"city-manage","hasright":true,"resourcetype":"function","parentid":"82","f_parentname":"档案管理","children":[],"selfid":"1552","name":"街道管理","templatename":"functionedit","id":"1551","position":"3","fullname":"资源管理.功能模块.客服系统.档案管理.街道管理","fullid":"3.17.21.82.1551","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"档案管理","link":"area-manage","hasright":true,"resourcetype":"function","parentid":"82","f_parentname":"档案管理","children":[],"selfid":"149","name":"小区管理","templatename":"functionedit","id":"148","position":"4","fullname":"资源管理.功能模块.客服系统.档案管理.小区管理","fullid":"3.17.21.82.148","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"档案管理","link":"address-manage","hasright":true,"resourcetype":"function","parentid":"82","f_parentname":"档案管理","children":[],"selfid":"155","name":"地址管理","templatename":"functionedit","id":"154","position":"5","fullname":"资源管理.功能模块.客服系统.档案管理.地址管理","fullid":"3.17.21.82.154","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"档案管理","link":"file-user-files","hasright":true,"resourcetype":"function","parentid":"82","f_parentname":"档案管理","children":[],"selfid":"83661","name":"档案信息","templatename":"functionedit","id":"83660","position":"10","fullname":"资源管理.功能模块.客服系统.档案管理.档案信息","fullid":"3.17.21.82.83660","tablename":"t_function","showmodel":"[\"右边\"]"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"档案管理","link":"file-user-files-new","hasright":true,"resourcetype":"function","parentid":"82","f_parentname":"档案管理","children":[],"selfid":"397738","name":"预备户建档","templatename":"functionedit","id":"397737","position":"12","fullname":"资源管理.功能模块.客服系统.档案管理.预备户建档","fullid":"3.17.21.82.397737","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"档案管理","link":"user-files","hasright":true,"resourcetype":"function","parentid":"82","children":[],"selfid":"3","name":"用户档案","templatename":"functionedit","id":"2","position":"17","fullname":"资源管理.功能模块.客服系统.档案管理.用户档案","fullid":"3.17.21.82.2","tablename":"t_function"}],"selfid":"83","name":"档案管理","templatename":"functionedit","id":"82","position":"2","fullname":"资源管理.功能模块.客服系统.档案管理","fullid":"3.17.21.82","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"客服系统","icon":"/images/lefticon/售气收费.png","hasright":true,"resourcetype":"function","parentid":"21","f_parentname":"客服系统","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"售气收费","link":"charge-manage","hasright":true,"resourcetype":"function","parentid":"88","f_parentname":"售气收费","children":[],"selfid":"173","name":"收费(综合)","templatename":"functionedit","id":"172","position":"1","fullname":"资源管理.功能模块.客服系统.售气收费.收费(综合)","fullid":"3.17.21.88.172","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"售气收费","link":"charge-manage-new","hasright":true,"resourcetype":"function","parentid":"88","f_parentname":"售气收费","children":[],"selfid":"533134","name":"新版收费","templatename":"functionedit","id":"533133","position":"2","fullname":"资源管理.功能模块.客服系统.售气收费.新版收费","fullid":"3.17.21.88.533133","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"售气收费","link":"insurance-manage","hasright":true,"resourcetype":"function","parentid":"88","f_parentname":"售气收费","children":[],"selfid":"586351","name":"保险收费","templatename":"functionedit","id":"586350","position":"3","fullname":"资源管理.功能模块.客服系统.售气收费.保险收费","fullid":"3.17.21.88.586350","tablename":"t_function"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","parentname":"售气收费","link":"meter-charge","hasright":true,"resourcetype":"function","parentid":"88","children":[],"selfid":"255341","name":"收费","templatename":"functionedit","id":"255340","position":"4","fullname":"资源管理.功能模块.客服系统.售气收费.收费","fullid":"3.17.21.88.255340","tablename":"t_function"}],"selfid":"89","name":"售气收费","templatename":"functionedit","id":"88","position":"3","fullname":"资源管理.功能模块.客服系统.售气收费","fullid":"3.17.21.88","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"客服系统","icon":"/images/lefticon/综合查询.png","hasright":false,"resourcetype":"function","parentid":"21","f_parentname":"客服系统","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"综合业务","link":"gas-brand-manage","hasright":true,"resourcetype":"function","parentid":"94","f_parentname":"综合业务","children":[],"selfid":"185","name":"气表管理","templatename":"functionedit","id":"184","position":"2","fullname":"资源管理.功能模块.客服系统.综合业务.气表管理","fullid":"3.17.21.94.184","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"综合业务","link":"param-manage","hasright":true,"resourcetype":"function","parentid":"94","f_parentname":"综合业务","children":[],"selfid":"191","name":"参数管理","templatename":"functionedit","id":"190","position":"3","fullname":"资源管理.功能模块.客服系统.综合业务.参数管理","fullid":"3.17.21.94.190","tablename":"t_function","showmodel":"右边"}],"selfid":"95","name":"综合业务","templatename":"functionedit","id":"94","position":"4","fullname":"资源管理.功能模块.客服系统.综合业务","fullid":"3.17.21.94","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"客服系统","icon":"/images/lefticon/报建系统.png","hasright":false,"resourcetype":"function","parentid":"21","f_parentname":"客服系统","children":[{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"报建业务","link":"install-function","hasright":true,"resourcetype":"function","parentid":"195729","f_parentname":"报建业务","children":[],"selfid":"319029","name":"报建业务","templatename":"functionedit","id":"319028","position":"2","fullname":"资源管理.功能模块.客服系统.报建业务.报建业务","fullid":"3.17.21.195729.319028","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"报建业务","link":"exploration-user","hasright":true,"resourcetype":"function","parentid":"195729","f_parentname":"报建业务","children":[],"selfid":"319035","name":"报建流程","templatename":"functionedit","id":"319034","position":"3","fullname":"资源管理.功能模块.客服系统.报建业务.报建流程","fullid":"3.17.21.195729.319034","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"报建业务","link":"supervisory-control","hasright":true,"resourcetype":"function","parentid":"195729","f_parentname":"报建业务","children":[],"selfid":"319041","name":"流程监控","templatename":"functionedit","id":"319040","position":"4","fullname":"资源管理.功能模块.客服系统.报建业务.流程监控","fullid":"3.17.21.195729.319040","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"报建业务","link":"apply-charge-search","hasright":true,"resourcetype":"function","parentid":"195729","f_parentname":"报建业务","children":[],"selfid":"319047","name":"收费明细","templatename":"functionedit","id":"319046","position":"5","fullname":"资源管理.功能模块.客服系统.报建业务.收费明细","fullid":"3.17.21.195729.319046","tablename":"t_function","showmodel":"右边"},{"pagenames":"公共通讯录维护模板","processnames":"发邮件流程","loginid":"11","parentname":"报建业务","link":"apply-charge-report","hasright":true,"resourcetype":"function","parentid":"195729","f_parentname":"报建业务","children":[],"selfid":"198758","name":"收费报表","templatename":"functionedit","id":"198757","position":"6","fullname":"资源管理.功能模块.客服系统.报建业务.收费报表","fullid":"3.17.21.195729.198757","tablename":"t_function"}],"selfid":"195730","name":"报建业务","templatename":"functionedit","id":"195729","position":"21","fullname":"资源管理.功能模块.客服系统.报建业务","fullid":"3.17.21.195729","tablename":"t_function","showmodel":"右边"}],"qrcode":"/rs/user/getQRcode?QRCODE=8888","rolesnames":"营业厅报装,市场部报装,工程部报装,财务部报装,客服中心报装","roles":"99232,174614,174620,174626,174632","f_sex":"男","f_icon":"tree_user","fullnames":"武安明星.客服中心.bjcs","dir":"mingxing","accesstime":"1626420492744","userid":"8888","parentid":"174608","fullids":"559465.174608.17713.","number":"55665","selfid":"17714","templatename":"useredit","logindate":"2021-03-09 11:17:36.727","id":"17713","state":"在职","tablename":"t_user","deptype":"部门","depids":"174608","loginid":"11","imgid":null,"initpassword":"1","rolestr":"营业厅报装,市场部报装,工程部报装,财务部报装,客服中心报装","deps":"客服中心","loginnum":"0","resourcetype":"user","orgid":"559465","f_department_name":"客服中心","ename":"bjcs","deleted":"false","entitytype":"t_user","loginip":"192.168.120.141","name":"bjcs","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) {
@@ -301,7 +265,6 @@ export default {
           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: '表号验证失败！！'
         })
@@ -322,7 +285,6 @@ export default {
       // 清空已保存的气表型号
       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
@@ -330,6 +292,10 @@ export default {
         this.userinfo.userfiles[i].f_meter_classify = this.userinfo.userfiles[i].gasbrand.f_meter_type
       }
     },
+    // 追加表具
+    addUserFile() {
+      this.userinfo.userfiles.push({})
+    },
     // 打开安装明细
     async showUserFileModal (row) {
       this.useradders = row
@@ -339,7 +305,6 @@ export default {
         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
       })
@@ -347,18 +312,16 @@ export default {
       this.userinfo = res.data
 
       // 已有表具的 气表信息补充
-      for (let i = 0; i < this.userinfo.userfiles.length; i++) {
+      for (const userfile of this.userinfo.userfiles) {
         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 (item.value.id === userfile.f_gasbrand_id) {
+            userfile.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)
+        if (userfile.gasbrand) {
+          for (const item of userfile.gasbrand.gasmodel) {
+            if (item.value.id === userfile.f_gasmodel_id) {
+              userfile.gasmodel = item.value
             }
           }
         }
@@ -370,11 +333,10 @@ export default {
     async getMeterbrands() {
       let http = new HttpResetClass()
       let data = {
-        f_orgid: Vue.user.orgid
-        // f_orgid: '10101'
+        f_filialeid: Vue.user.orgid
+        // f_filialeid: '559465'
       }
       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
       })
@@ -384,19 +346,15 @@ export default {
     async search () {
       let http = new HttpResetClass()
       let data = {
-        condition: `ua.f_process_id = '${this.selectdata.f_process_id}'`
-      }
-
-      if (this.selectdata.f_apply_type === '团购转散户') {
-        data.condition = `ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+        condition: " 1=1",
+        f_process_id: this.selectdata.f_process_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 === '团购报建') {
+      if (this.selectdata.f_apply_type === '开发商集体报建' || this.selectdata.f_apply_type === '散户集体报建' || this.selectdata.f_apply_type === '煤改气报建') {
         let f_installed_households = 0
         for (const item of res.data) {
           if (item.f_userfiles_num > 0) {
@@ -418,24 +376,21 @@ export default {
     closeUserFile() {
       this.showUserFile = false
       this.useradders = null
-      this.userinfo = {}
+      this.userinfo = null
       this.search()
-    },
+    }
   },
   events: {
   },
   computed: {
     // 安装人
     installperson() {
-      return Vue.user.name
-    },
-    installdate() {
-      return function (f_install_date) {
-        if (isEmpty(f_install_date)) {
-          return new Date().Format('yyyy-MM-dd HH:mm:ss')
+      return this.$login.f.f_installman.map(item => {
+        return {
+          label: item.name,
+          value: item.name
         }
-        return f_install_date
-      }
+      })
     },
     // 表向
     aroundmeters() {
@@ -451,11 +406,46 @@ export default {
 }
 </script>
 <style scoped>
+label {
+  margin: 0px;
+}
 .vertical-center {
   display: flex;
   align-items: center;
   text-align: center;
 }
+
+.control-label-justify {
+  display: inline-block;
+  vertical-align: top;
+  width: 100%;
+  text-align: justify;
+  font-family: PingFang-SC-Bold;
+}
+
+.control-label-justify::after {
+  content: "";
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  height: 0;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
 /*清除model中的浮动*/
 .clearfix:after,.clearfix:before{
   display: table;

package/src/components/android/ProgressReport/ProgressReportDetail.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="panel-body">
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_project_number }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>CEA&emsp;号：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_cea_number }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_entry_name }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>类&emsp;&emsp;型：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_type }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>操&ensp;作&ensp;人：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_pr_operator }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>操作时间：</b></p>
+      <p class="col-xs-9 text-left input-font">{{ selectdata.f_pr_operation_date }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto">
+      <p class="col-xs-3 text-left font"><b>详细说明：</b></p>
+      <p class="col-xs-9 text-left input-font" style="word-wrap: break-word">{{ selectdata.f_explanation }}</p>
+    </div>
+    <div class="form-group col-xs-12 auto" v-if="selectdata.f_blobid && selectdata.f_type">
+      <app-take-pic :blobid="selectdata.f_blobid" :type="selectdata.f_type" :defname="selectdata.defname" :isdelete="false" :istakepic="false"></app-take-pic>
+    </div>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '进度详情',
+  props: ['selectdata'],
+  data () {
+    return {
+    }
+  },
+  ready () {
+  },
+  methods: {
+  },
+  events: {
+  }
+}
+</script>
+<style scoped>
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+</style>