sale-client 3.6.360 → 3.6.361

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.360",
+  "version": "3.6.361",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -161,9 +161,9 @@
         <div v-if="row.f_meter_type.includes('物联网表')" class="col-sm-4">
           <label class="font_normal_body_new">阀控状态</label>
           <input class="input-underline" style="width:50%" :value="row.f_network_valve == '1' ? '手动' : '自动'" readonly>
-          <span v-if="row.f_network_valve" @click.stop="openModal"
-                class=" glyphicon glyphicon-pencil clickchange" title="修改阀控状态">
-          </span>
+<!--          <span v-if="row.f_network_valve" @click.stop="openModal"-->
+<!--                class=" glyphicon glyphicon-pencil clickchange" title="修改阀控状态">-->
+<!--          </span>-->
         </div>
         <div v-if="!row.f_meter_type.includes('物联网表')" class="col-sm-4" >
           <label class="font_normal_body_new">写卡次数</label>
@@ -189,9 +189,10 @@
         <button v-if="row.f_meter_type.includes('物联网表')"
                 class="button_search" type="button" @click="openUser">开户
         </button>
-        <button v-if="row.f_meter_type.includes('物联网表') && valveLimit && (row.f_network_valve === '1' || (row.f_table_state === '停用' && row.f_network_valve === null))"
+        <button v-if="row.f_meter_type.includes('物联网表') && !(row.f_table_state === '停用' && row.f_network_valve === null)"
                 class="button_search" type="button" @click="valvecontrol">
           开关阀
+        </button>
         <button v-if="row.f_meter_type.includes('物联网表') && autoValveLimit"
                 class="button_search" type="button" @click="zdfk">开关自动阀控
         </button>
@@ -283,9 +284,9 @@
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="button_search btn-ln fr" :disabled="!operateReason" @click='valveoperate(true,0)' title="屏蔽特殊条件下(充值开阀等)触发的自动开阀指令">强制开阀</button>
+<!--        <button type="button" class="button_search btn-ln fr" :disabled="!operateReason" @click='valveoperate(true,0)' title="屏蔽特殊条件下(充值开阀等)触发的自动开阀指令">强制开阀</button>-->
         <button type="button" class="button_search btn-ln fr" :disabled="!operateReason" @click='valveoperate(true,1)'>开阀</button>
-        <button type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false, 0)' title="屏蔽特殊条件下(欠费关阀等)触发的自动开阀指令">强制关阀</button>
+<!--        <button type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false, 0)' title="屏蔽特殊条件下(欠费关阀等)触发的自动开阀指令">强制关阀</button>-->
         <button type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false, 1)'>关阀</button>
       </footer>
     </modal>

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -63,7 +63,11 @@
         </div>
         <div class="row" v-if="data.f_meter_type.includes('物联网')">
           <label class = "col-sm-5 ">表累购金额</label>
-          <span class = "col-sm-7" >{{data?data.f_total_fee:dafault.f_total_fee}}</span>
+          <span class = "col-sm-7" >{{data?data.f_total_fee:dafault.f_total_fee}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterFee"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购金额">
+            </span>
+          </span>
         </div>
         <div class="row" v-if="data.f_meter_type.includes('物联网')">
           <label class = "col-sm-5 ">户累购金额</label>
@@ -83,11 +87,19 @@
         </div>
         <div class="row" v-if="data.f_meter_type.includes('卡表') && data.f_meter_type === '气量卡表'">
           <label class = "col-sm-5 " style="color: brown" >累购气量</label>
-          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterGas"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购气量">
+            </span>
+          </span>
         </div>
         <div class="row" v-if="data.f_meter_type.includes('卡表')">
           <label class = "col-sm-5 " style="color: brown">累购金额</label>
-          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_fee:dafault.f_total_fee}}</span>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_fee:dafault.f_total_fee}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterFee"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购金额">
+            </span>
+          </span>
         </div>
         <div class="row" v-if="data.f_meter_type.includes('卡表')">
           <label class = "col-sm-5 " style="color: brown">累购写卡金额</label>
@@ -197,7 +209,57 @@
             </div>
           </article>
           <footer slot="modal-footer" class="modal-footer">
-            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile">确定</button>
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('表封号')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showSelectUserFee" :show.sync="showSelectUserFee" width="40%" title="修正表累购金额"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧表累购金额</label>
+                  <input readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_total_fee" placeholder='旧表累购金额'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧表累购金额</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newMeterFee"
+                         placeholder='旧表累购金额'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购金额')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showSelectUserGas" :show.sync="showSelectUserGas" width="40%" title="修正表累购气量"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧表累购气量</label>
+                  <input readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_total_gas" placeholder='旧表累购气量'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新表累购气量</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newMeterGas"
+                         placeholder='新表累购气量'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购气量')">确定</button>
             <button type="button" class="button_clear" @click='close'>取消</button>
           </footer>
         </modal>
@@ -207,7 +269,7 @@
 </template>
 
 <script>
-  /*用户档案相关信息组件*/
+  /* 用户档案相关信息组件 */
   export default {
     ready () {
       console.log('看看userinfo里面接收的data数据', this.data)
@@ -243,7 +305,11 @@
         },
         model: null,
         showselectncuserfile: false,
-        newmetertitles: ''
+        showSelectUserFee: false,
+        showSelectUserGas: false,
+        newmetertitles: '',
+        newMeterGas: 0,
+        newMeterFee: 0
       }
     },
     props: ['data'],
@@ -256,9 +322,16 @@
         this.showselectncuserfile = true
         this.newmetertitles = 0
       },
-      async modifyUserFile () {
+      changeMeterGas () {
+        // 修改累购气量
+        this.showSelectUserGas = true
+      },
+      changeMeterFee () {
+        // 修改累购金额
+        this.showSelectUserFee = true
+      },
+      async modifyUserFile (type) {
         let param = {
-          new_metertitles: this.newmetertitles,
           f_userinfo_id: this.data.f_userinfo_id,
           f_user_id: this.data.f_user_id,
           f_userfiles_id: this.data.f_userfiles_id,
@@ -269,8 +342,22 @@
           f_depid: this.$login.f.depids,
           f_depname: this.$login.f.deps
         }
+        if (type == '表封号') {
+          param.new_metertitles = this.newmetertitles
+        } else if (type == '累购气量') {
+          param.new_metergas = this.newMeterGas
+        } else if (type == '累购金额') {
+          param.new_meterfee = this.newMeterFee
+        }
         await this.$resetpost('/rs/logic/changeuserfilesmetertitles', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
         this.data.f_metertitles = this.newmetertitles
+        if (type == '表封号') {
+          this.data.f_metertitles = this.newmetertitles
+        } else if (type == '累购气量') {
+          this.data.f_total_gas = this.newMeterGas
+        } else if (type == '累购金额') {
+          this.data.f_total_fee = this.newMeterFee
+        }
         this.$parent.$parent.close()
         this.$parent.$parent.clean()
         this.$parent.$parent.$refs.list.searchNoData()
@@ -278,7 +365,11 @@
       },
       close () {
         this.showselectncuserfile = false
+        this.showSelectUserGas = false
+        this.showSelectUserFee = false
         this.newmetertitles = 0
+        this.newMeterGas = 0
+        this.newMeterFee = 0
       }
     },
     watch: {

package/src/components/webMeter/WebMeterExceptionHandle.vue

@@ -176,6 +176,7 @@ export default {
         f_handlingtype: this.model.f_handlingtype,
         toRepair: '一级派单',
         f_meetunit: this.model.f_meetunit,
+        f_remarks: this.model.f_remarks,
         f_error_msg: this.model.f_error_msg,
         f_error_type: this.model.f_error_type,
         f_reciever: this.model.f_reciever,

package/src/components/webMeter/WebMeterExceptionList.vue

@@ -44,12 +44,15 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
-              <res-select-group :show-component="$parent.$parent.resShow"
-                                :initRes="$parent.$parent.initRes"
-                                :style="$parent.$parent.styles"
-                                :cascade=true @re-res="$parent.$parent.getRes"
-                                v-ref:sel>
-              </res-select-group>
+              <div :class="$parent.$parent.styles" >
+                <label class="font_normal_body">组织机构</label>
+                <res-select :initresid='$parent.$parent.curorgid'
+                            @res-select="$parent.$parent.getorg"
+                            class="select select_list"
+                            restype='organization'
+                            style="width: 60%">
+                </res-select>
+              </div>
               <div :class="$parent.$parent.styles">
                 <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
                 <input style="width:60%" type="text" class="input_search"
@@ -235,9 +238,12 @@
 </template>
 
 <script>
-import {HttpResetClass, PagedList} from 'vue-client'
+import { PagedList } from 'vue-client'
+import * as Util from '../../Util'
 
 let readySomething = async function (self) {
+  self.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
+  self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
   await self.$LoadParams.loadParam()
   await self.initQueryParam()
   this.search()
@@ -253,7 +259,6 @@ export default {
       startDate: '',
       endDate: '',
       f_error_type: '',
-
       meterBrand: [],
       gasProperties: [{label: '全部', value: ''}],
       showDetail: false,
@@ -261,14 +266,10 @@ export default {
       criteriaShow: false,
       GetErrorLevel: [],
       GetErrorType: [],
-      resShow: ['company'],
-      initRes: {
-        org: [this.$login.f.orgid],
-        dep: [],
-        user: []
-      },
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
       condition: '1=1',
-      orgConditionStr: ``
+      f_orgid: ''
     }
   },
   ready () {
@@ -295,11 +296,9 @@ export default {
     cancel () {
       this.showDetail = false
     },
-    getRes (condition, obj) {
-      console.log('组织机构返回', condition, obj)
-      this.orgConditionStr = condition
-      this.orgname = obj.orgnames[0]
-      this.depname = obj.depnames[0]
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.$parent.f_orgid = this.f_orgid
     },
     initQueryParam () {
       let arr = []
@@ -316,20 +315,27 @@ export default {
     hidden () {
       this.criteriaShow = !this.criteriaShow
     },
-    search(){
+    search () {
       this.$refs.paged.$refs.cri.search()
     },
     selfSearch (args) {
       this.startDate = this.$refs.paged.$refs.cri.model.startDate
       this.endDate = this.$refs.paged.$refs.cri.model.endDate
       this.f_error_type = this.$refs.paged.$refs.cri.model.f_error_type
-      this.condition = this.$refs.paged.$refs.cri.condition + this.orgConditionStr
-      args.condition = this.condition
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      if (this.f_orgid) {
+        args.condition = `f_orgid in ${this.f_orgid} and ${args.condition}`
+      }
+      this.condition = args.condition
       this.model.search(args.condition, args.model)
       this.$dispatch('search')
     },
     clearmsg () {
-      this.$refs.paged.$refs.cri.model = {}
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = []
+      })
     }
   },
   watch: {},

package/src/components/webMeter/webInfo/EditWebMeterInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="span">
-    <validator name='v' style="overflow-y: auto">
-      <form novalidate class="form-horizontal select-overspread" @valid="confirmEditcheck = true" @invalid="confirmEditcheck = false">
+    <validator name='v' style="overflow-y: auto" @valid="confirmEditcheck = true" @invalid="confirmEditcheck = false">
+      <form novalidate class="form-horizontal select-overspread" >
         <div class="row auto">
         <div style="margin-top: 2%">
           <img style="margin-top: -2px;margin-left: 2px" src="./../../../../static/images/lefticon/矩形1183.png">

package/src/filiale/qingjian/UserBaseInfoNew.vue

@@ -161,9 +161,9 @@
         <div v-if="row.f_meter_type.includes('物联网表')" class="col-sm-4">
           <label class="font_normal_body_new">阀控状态</label>
           <input class="input-underline" style="width:50%" :value="row.f_network_valve == '1' ? '手动' : '自动'" readonly>
-          <span v-if="row.f_network_valve" @click.stop="openModal"
-                class=" glyphicon glyphicon-pencil clickchange" title="修改阀控状态">
-          </span>
+          <!--          <span v-if="row.f_network_valve" @click.stop="openModal"-->
+          <!--                class=" glyphicon glyphicon-pencil clickchange" title="修改阀控状态">-->
+          <!--          </span>-->
         </div>
         <div v-if="!row.f_meter_type.includes('物联网表')" class="col-sm-4" >
           <label class="font_normal_body_new">写卡次数</label>
@@ -189,17 +189,18 @@
         <button v-if="row.f_meter_type.includes('物联网表')"
                 class="button_search" type="button" @click="openUser">开户
         </button>
-        <button v-if="row.f_meter_type.includes('物联网表') && valveLimit && (row.f_network_valve === '1' || (row.f_table_state === '停用' && row.f_network_valve === null))"
+        <button v-if="row.f_meter_type.includes('物联网表') && !(row.f_table_state === '停用' && row.f_network_valve === null)"
                 class="button_search" type="button" @click="valvecontrol">
           开关阀
-          <button v-if="row.f_meter_type.includes('物联网表') && autoValveLimit"
-                  class="button_search" type="button" @click="zdfk">开关自动阀控
-          </button>
-          <div
-            :class="{'button_shrink_top':criteriaShow,'button_shrink_bottom':!criteriaShow}"
-            @click="criteriaShow=!criteriaShow"
-            class="button_spacing"
-            style="float: right"></div>
+        </button>
+        <button v-if="row.f_meter_type.includes('物联网表') && autoValveLimit"
+                class="button_search" type="button" @click="zdfk">开关自动阀控
+        </button>
+        <div
+          :class="{'button_shrink_top':criteriaShow,'button_shrink_bottom':!criteriaShow}"
+          @click="criteriaShow=!criteriaShow"
+          class="button_spacing"
+          style="float: right"></div>
       </div>
     </div>
 
@@ -283,9 +284,9 @@
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
-<!--        <button type="button" class="button_search btn-ln fr" :disabled="!operateReason" @click='valveoperate(true,0)' title="屏蔽特殊条件下(充值开阀等)触发的自动开阀指令">强制开阀</button>-->
+        <!--        <button type="button" class="button_search btn-ln fr" :disabled="!operateReason" @click='valveoperate(true,0)' title="屏蔽特殊条件下(充值开阀等)触发的自动开阀指令">强制开阀</button>-->
         <button type="button" class="button_search btn-ln fr" :disabled="!operateReason" @click='valveoperate(true,1)'>开阀</button>
-<!--        <button type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false, 0)' title="屏蔽特殊条件下(欠费关阀等)触发的自动开阀指令">强制关阀</button>-->
+        <!--        <button type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false, 0)' title="屏蔽特殊条件下(欠费关阀等)触发的自动开阀指令">强制关阀</button>-->
         <button type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false, 1)'>关阀</button>
       </footer>
     </modal>

package/src/filiale/qingtongxia/meterinfodetail.vue

@@ -0,0 +1,320 @@
+<template>
+  <partial-view v-ref:pv>
+    <div class="panel panel-info auto" style="margin-top: auto">
+      <div class="panel-heading"  style="height: 35px">
+        <h4 style="display:inline-block;margin-top: auto">表具信息</h4>
+      </div>
+      <div class="auto ">
+        <div class="row" v-if="data.f_customer">
+          <label class = "col-sm-5 " style="color: brown">团缴编号</label>
+          <span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表类型</label>
+          <span class = "col-sm-7">{{data?data.f_meter_type:dafault.f_meter_brand}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表品牌</label>
+          <span class = "col-sm-7">{{data?data.f_meter_brand:dafault.f_meter_brand}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表型号</label>
+          <span class = "col-sm-7">{{data?data.f_meter_style:dafault.f_meter_style}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >计费终端</label>
+          <span class = "col-sm-7" >{{data?data.f_calculation:dafault.f_calculation}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >结算方式</label>
+          <span class = "col-sm-7" >{{data?data.f_collection_type:dafault.f_collection_type}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5" style="color: brown">表具状态</label>
+          <span class="col-sm-7" style="color: brown">{{data?data.f_table_state:dafault.f_table_state}}</span>
+        </div>
+        <div class="row" v-if="data.f_calculation.includes('表端结算') && data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
+          <label class = "col-sm-5 " style="color: brown">系统余额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
+        </div>
+        <div class="row" v-if="!data.f_calculation.includes('表端结算') && data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
+          <label class = "col-sm-5 " style="color: brown">系统余量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_gas:dafault.f_balance_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_calculation.includes('表端结算') && data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " style="color: brown">表端上报余额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >初始表底数</label>
+          <span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表当前底数</label>
+          <span class = "col-sm-7" >{{data?data.f_meter_base:dafault.f_meter_base}}</span>
+        </div>
+        <div class="row" v-show="data.f_times">
+          <label class = "col-sm-5 " >写卡次数</label>
+          <span class = "col-sm-7" >{{data?data.f_times:dafault.f_times}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">指令上表次数</label>
+          <span class = "col-sm-7" >{{data?data.f_iot_times:dafault.f_iot_times}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">表累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee:dafault.f_total_fee}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">户累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee_all:dafault.f_total_fee_all}}</span>
+        </div>
+        <div class="row" v-if="(data.f_meter_type === '机表' || data.f_meter_type === '物联网表') && data.f_deduction_gas > 0">
+          <label class = "col-sm-5 " >剩余抵扣量</label>
+          <span class = "col-sm-7" >{{data?data.f_deduction_gas:dafault.f_deduction_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown" >户累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas_all:dafault.f_total_gas_all}}</span>
+        </div>
+        <div class="row" v-if="(data.f_meter_brand.includes('数码表'))">
+          <label class = "col-sm-5 " style="color: brown" >累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表') && data.f_meter_type === '气量卡表'">
+          <label class = "col-sm-5 " style="color: brown" >累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown">累购金额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_fee:dafault.f_total_fee}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown">累购写卡金额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表表号</label>
+          <span class = "col-sm-7">{{data?data.f_meternumber:dafault.f_meternumber}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表') || (data.f_meter_type.includes('物联网表') && data.f_hascard==='是')">
+          <label class = "col-sm-5 " >卡&emsp;&emsp;号</label>
+          <span class = "col-sm-7">{{data?data.f_card_id:dafault.f_card_id}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表封号</label>
+          <span class="col-sm-7">{{data?data.f_metertitles:dafault.f_metertitles}}
+            <span v-if="data" @click.stop="changemetertitles"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修正表封号"></span>
+          </span>
+        </div>
+        <!--        <div class="row" v-if="data.f_meter_type.includes('卡表') || data.f_meter_type.includes('物联网表') && data.f_hascard==='是'">-->
+        <!--          <label class = "col-sm-5 " >写卡次数</label>-->
+        <!--          <span class = "col-sm-7">{{data?data.f_times:dafault.f_times}}</span>-->
+        <!--        </div>-->
+        <div class="row">
+          <label class = "col-sm-5 " >用气性质</label>
+          <span class = "col-sm-7">{{data?data.f_gasproperties:dafault.f_gasproperties}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气价名称</label>
+          <span class = "col-sm-7">{{data?data.f_price_name:dafault.f_price_name}}</span>
+        </div>
+        <!--<div class="row" v-if="data.f_balance < 0">-->
+        <!--<label class = "col-sm-5 "  >账户欠费</label>-->
+        <!--<span class = "col-sm-7" title="不包含违约金">{{data?0 - (data.f_balance - 0):dafault.f_balance}}</span>-->
+        <!--</div>-->
+        <!--<div class="row" v-else>-->
+        <!--<label class = "col-sm-5 " >账户余额</label>-->
+        <!--<span class = "col-sm-7">{{data?data.f_balance:dafault.f_balance}}</span>-->
+        <!--</div>-->
+        <div class="row" v-if="data.f_remanent_money > 0">
+          <label class = "col-sm-5 " >应补金额</label>
+          <span class = "col-sm-7">{{data?data.f_remanent_money:dafault.f_remanent_money}}</span>
+        </div>
+        <div class="row" v-if="data.f_remanent_gas > 0">
+          <label class = "col-sm-5 " >应补气量</label>
+          <span class = "col-sm-7">{{data?data.f_remanent_gas:dafault.f_remanent_gas}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表&emsp;&emsp;向</label>
+          <span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >抄表册名</label>
+          <span class = "col-sm-7">{{data?'['+data.f_book_code + '] '+ (data.f_book_name ? data.f_book_name:''):dafault.f_book_name}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >抄表册册序号</label>
+          <span class = "col-sm-7">{{data?data.f_meter_book_sort:dafault.f_meter_book_sort}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >安装位置</label>
+          <span class = "col-sm-7">{{data?data.f_position:dafault.f_position}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >置换人员</label>
+          <span class = "col-sm-7">{{data?data.f_gas_person:dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >置换时间</label>
+          <span class = "col-sm-7">{{data?data.f_gas_date.substring(0,7):dafault.f_hand_date}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >抄表员</label>
+          <span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >上次抄表日</label>
+          <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,7):dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >建档日期</label>
+          <span class = "col-sm-7">{{data?data.f_input_date.substring(0,7):dafault.f_input_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >备&emsp;&emsp;注</label>
+          <span class = "col-sm-7">{{data?data.comments:dafault.comments}}</span>
+        </div>
+        <modal v-if="showselectncuserfile" :show.sync="showselectncuserfile" width="40%" title="修正表封号"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧表封号</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_metertitles" placeholder='旧表封号'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新表封号</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newmetertitles"
+                         placeholder='新表封号'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+      </div>
+    </div>
+  </partial-view>
+</template>
+
+<script>
+/*用户档案相关信息组件*/
+export default {
+  ready () {
+    console.log('看看userinfo里面接收的data数据', this.data)
+  },
+  title: '客户基本信息',
+  data () {
+    return {
+      dafault: {
+        f_total_gas_all: 0,
+        f_total_fee_all: 0,
+        f_balance_amount: 0,
+        f_balance_gas: 0,
+        f_initial_base: 0,
+        f_meter_base: 0,
+        f_deduction_gas: 0,
+        f_total_gas: 0,
+        f_total_fee: 0,
+        f_card_id: '*****',
+        f_times: 0,
+        f_iot_times: 0,
+        f_meternumber: 0,
+        f_metertitles: '',
+        f_gasproperties: '****',
+        f_price_name: '****',
+        f_meter_brand: '****',
+        f_balance: 0,
+        f_user_type: '**',
+        f_remanent_gas: 0,
+        f_position: '****',
+        f_inputtor: '****',
+        f_jval: 0,
+        f_table_state: 0
+      },
+      model: null,
+      showselectncuserfile: false,
+      newmetertitles: ''
+    }
+  },
+  props: ['data'],
+  methods: {
+    dealmsg (val) {
+      this.$dispatch('deal-msg', val)
+    },
+    changemetertitles () {
+      // 修正表封号
+      this.showselectncuserfile = true
+      this.newmetertitles = 0
+    },
+    async modifyUserFile () {
+      let param = {
+        new_metertitles: this.newmetertitles,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_userfiles_id: this.data.f_userfiles_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserfilesmetertitles', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_metertitles = this.newmetertitles
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    close () {
+      this.showselectncuserfile = false
+      this.newmetertitles = 0
+    }
+  },
+  watch: {
+    'data' (val) {
+      console.log('val========', val)
+    }
+  },
+
+}
+</script>
+<style lang="less">
+.row {
+  /*border-bottom:1px solid #F2F6FA;*/
+  margin-left: 0;
+  margin-right: 0;
+}
+.click-change:hover {
+  color: #3592ef;
+  cursor: pointer;
+}
+// . {
+//   height: 23px;
+//   border-right: 1px solid #F2F6FA;
+//   margin-bottom: 0;
+//   text-align: left;
+// }
+// #address {
+//   border-left: 1px solid #F2F6FA;
+// }
+// #user-info {
+//   padding:6px;
+//   span {
+//     padding-left: 5px;
+//   }
+// }
+// #address1 {
+//   border-right: 0;
+// }
+</style>

package/src/filiale/qingtongxia/sale.js

@@ -11,6 +11,8 @@ export default function () {
   Vue.component('hand-manager', (resolve) => { require(['./HandManager/HandManager'], resolve) })
   // 当前选择用户的用户基本信息
   Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo'], resolve) })
+  // 当前选择用户的表具基本信息
+  Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
   Vue.component('card-meter-center', (resolve) => { require(['./CardMeterCenter'], resolve) })
   // Vue.component('machine-meter-center', (resolve) => { require(['./MachineMeterCenter'], resolve) })
   Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })

package/src/filiale/rongcheng/EditWebMeterInfo.vue

@@ -0,0 +1,335 @@
+<template>
+  <div class="span">
+    <validator name='v' style="overflow-y: auto" @valid="confirmEditcheck = true" @valid="confirmEditcheck = true">
+      <form novalidate class="form-horizontal select-overspread">
+        <div class="row auto">
+          <div style="margin-top: 2%">
+            <img style="margin-top: -2px;margin-left: 2px" src="./../../../static/images/lefticon/矩形1183.png">
+            <a style="font-size: 16px;font-weight: 500;">表计信息</a>&nbsp;<a
+            style="color: #999999;text-decoration: none"></a>
+          </div>
+          <div class="col-sm-6" :class="[$v.f_meternumber.required ? 'has-error' : '']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_meternumber" @blur="onbulrbunmber($event)" class="input_search"
+                   style="width:60%" v-validate:f_meternumber='{required: true }' placeholder="表号">
+          </div>
+
+          <div class="col-sm-6" :class="[$v.f_imei.required ? 'has-error' : '']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;IMEI码&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_imei" class="input_search" style="width:60%"
+                   v-validate:f_imei='{required: true }' placeholder="IMEI码">
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;IMSI码&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_imsi" class="input_search" style="width:60%"
+                   placeholder="IMSI码">
+          </div>
+          <div class="col-sm-6" :class="[$v.brand.required ? 'has-error' : '']">
+            <label class="font_normal_body" title="参数:气表类型2">&nbsp;&nbsp;&nbsp;气表类型</label>
+            <input type="text" v-show="false" v-model="$refs.brand.selectedItems" v-validate:brand='{required: true }'>
+            <v-select style="width:60%" title="气表类型2"
+                      placeholder='气表类型'
+                      :value.sync="newmeterinfo.f_metertype"
+                      v-model="newmeterinfo.f_metertype"
+                      :options='metertype'
+                      close-on-select
+                      :value-single="true" v-ref:brand></v-select>
+          </div>
+          <div class="col-sm-6" :class="[$v.f_meter_brand.required ? 'has-error' : '']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;气表品牌</label>
+            <input type="text" v-show="false" v-model="newmeterinfo.f_meter_brand"
+                   v-validate:f_meter_brand='{required: true }'>
+            <v-select
+              placeholder='气表品牌'
+              :value.sync="newmeterinfo.f_meter_brand"
+              style="width:60%"
+              :value-single="true"
+              v-model="newmeterinfo.f_meter_brand"
+              :options='meterbrand'
+              close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-6" :class="[$v.f_meter_style.required ? 'has-error' : '']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;气表型号</label>
+            <input type="text" v-show="false" v-model="newmeterinfo.f_meter_style"
+                   v-validate:f_meter_style='{required: true }'>
+            <v-select style="width:60%"
+                      placeholder='气表型号'
+                      :value.sync="newmeterinfo.f_meter_style"
+                      v-model="newmeterinfo.f_meter_style"
+                      :options='meterstyle'
+                      close-on-select
+                      :value-single="true"></v-select>
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表计电话</label>
+            <input type="text" v-model="newmeterinfo.f_meter_phone" class="input_search" style="width:60%"
+                   placeholder="表计电话">
+          </div>
+          <div class="col-sm-12">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;设备地址</label>
+            <input type="text" v-model="newmeterinfo.f_device_address" class="input_search" style="width:80%"
+                   placeholder="设备地址">
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;是否领用</label>
+            <v-select style="width:60%"
+                      placeholder='是否领用'
+                      :value.sync="newmeterinfo.f_is_receive"
+                      v-model="newmeterinfo.f_is_receive"
+                      :options='isReceive'
+                      disabled
+                      close-on-select
+                      :value-single="true"></v-select>
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;气表年限</label>
+            <input type="text" v-model="newmeterinfo.f_years" class="input_search" style="width:60%"
+                   placeholder="气表年限">
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;生产日期</label>
+            <datepicker placeholder="生产日期" style="width: 60%"
+                        v-model="newmeterinfo.f_manufacture_date"
+                        :value.sync="newmeterinfo.f_manufacture_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'">
+            </datepicker>
+            <!--          <input type="text" v-model="newmeterinfo.f_manufacture_date" class="input_search" style="width:60%" placeholder="生产日期">-->
+          </div>
+
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;批次号&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_batch_number" class="input_search" style="width:60%"
+                   placeholder="批次号">
+          </div>
+          <div class="col-sm-6" :class="[$v.f_terminal_id.required ? 'has-error' : '']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;终端名称</label>
+            <input type="text" v-show="false" v-model="newmeterinfo.f_terminal_id"
+                   v-validate:f_terminal_id='{required: true }'>
+            <v-select placeholder='终端名称'
+                      :value.sync="newmeterinfo.f_terminal_id"
+                      style="width:60%"
+                      :value-single="true"
+                      v-model="newmeterinfo.f_terminal_id"
+                      :options='terminalId'
+                      close-on-select>
+            </v-select>
+          </div>
+
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;设备号&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_device_id" class="input_search" style="width:60%"
+                   placeholder="设备号">
+          </div>
+          <div class="col-sm-6" :class="[$v.f_valvemark.required ? 'has-error' : '']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;阀控标识</label>
+            <input type="text" v-show="false" v-model="newmeterinfo.f_valvemark"
+                   v-validate:f_valvemark='{required: true }'>
+            <v-select placeholder='阀控标识'
+                      :value.sync="newmeterinfo.f_valvemark"
+                      style="width:60%"
+                      :value-single="true"
+                      v-model="newmeterinfo.f_valvemark"
+                      :options='valvemarks'
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body" style="color: red" title="参数:表通道类型">表通道类型</label>
+            <!--  <input type="text" v-model="newmeterinfo.f_iot_type" class="input_search" style="width:60%"  placeholder="表通道类型">-->
+            <v-select style="width:60%"
+                      placeholder='表通道类型'
+                      :value.sync="newmeterinfo.f_iot_type"
+                      v-model="newmeterinfo.f_iot_type"
+                      :options='iottype'
+                      close-on-select
+                      :value-single="true"></v-select>
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">表通讯序号</label>
+            <input type="text" v-model="newmeterinfo.f_telecomm_no" class="input_search" style="width:60%"
+                   placeholder="表通讯序号">
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;采购人</label>
+            <input type="text" v-model="newmeterinfo.f_purchaser" class="input_search" style="width:60%"
+                   placeholder="采购人">
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;采购时间</label>
+            <datepicker placeholder="采购时间" style="width: 60%"
+                        v-model="newmeterinfo.f_purchase_date"
+                        :value.sync="newmeterinfo.f_purchase_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'">
+            </datepicker>
+          </div>
+        </div>
+        <div class="auto row">
+          <div style="margin-top: 2%">
+            <img style="margin-top: -2px;margin-left: 2px" src="./../../../static/images/lefticon/矩形1183.png">
+            <a style="font-size: 16px;font-weight: 500;">厂商信息</a>&nbsp;<a
+            style="color: #999999;text-decoration: none"></a>
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;气表厂家</label>
+            <input type="text" v-model="newmeterinfo.f_manufacturers" class="input_search" style="width:60%"
+                   placeholder="气表厂家">
+          </div>
+          <div class="col-sm-6" :class="[$v.f_vender.required ? 'has-error' : '']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;厂商代码</label>
+            <input type="text" v-show="false" v-model="newmeterinfo.f_vender" v-validate:f_vender='{required: true }'>
+            <v-select placeholder='厂商代码'
+                      :value.sync="newmeterinfo.f_vender"
+                      style="width:60%"
+                      :value-single="true"
+                      v-model="newmeterinfo.f_vender"
+                      :options='venders'
+                      close-on-select>
+            </v-select>
+          </div>
+        </div>
+        <div class="col-sm-12" style="text-align:right;height:auto;margin-top:6px;">
+          <button class="button_search" type="button" @click="confirmEdit()" :disabled="!confirmEditcheck">确认</button>
+          <button class="button_clear" type="button" @click="close()">取消</button>
+        </div>
+      </form>
+    </validator>
+  </div>
+</template>
+
+
+<script>
+let readyGen = async function (self) {
+  await self.$LoadParams.loadParam()
+  self.initQueryParam()
+  // self.reflash()
+}
+export default {
+  title: '表计信息修改',
+  props: ['oldmeter', 'f_filialeid'],
+  data () {
+    return {
+      row: {},
+      meterbrand: [],
+      newmeterinfo: {},
+      confirmEditcheck: false,
+      meterstyle: []
+    }
+  },
+  ready () {
+    this.newmeterinfo = Object.assign({}, {}, this.oldmeter)
+    this.newmeterinfo.f_is_receive = this.newmeterinfo.f_is_receive !== '是' ? '否' : '是'
+    readyGen(this)
+  },
+  watch: {
+    'oldmeter' () {
+      this.newmeterinfo = Object.assign({}, {}, this.oldmeter)
+    },
+    'newmeterinfo.f_meter_brand' () {
+      if (this.newmeterinfo.f_meter_brand == null || this.newmeterinfo.f_meter_brand == '') return
+      let gasmodels = []
+      let gastype = []
+      this.$GetSaleParam.getGasbrand().forEach((item) => {
+        if (item.label == this.newmeterinfo.f_meter_brand) {
+          gasmodels = item.value.gasmodel
+        }
+      })
+      gasmodels.forEach((items) => {
+        let temp = {}
+        temp.label = items.label
+        temp.value = items.value.f_meter_style + items.value.f_type
+        gastype.push(temp)
+      })
+      this.meterstyle = gastype
+    }
+  },
+  methods: {
+    initQueryParam () {
+      let arr = []
+      this.$GetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        arr.push(temp)
+      })
+      console.log(arr)
+      this.meterbrand = [{label: '全部', value: ''}, ...arr]
+    },
+    async onbulrbunmber ($event) {
+      if ($event.target.value === '') {
+        return
+      }
+      let expiration = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+        data:
+        {
+          orderitem: 'id',
+          items: 'f_meternumber',
+          tablename: 't_meterinfo',
+          condition: 'f_meternumber = \'' + $event.target.value + '\''
+        }
+      }, {resolveMsg: '', rejectMsg: ''})
+
+      console.log(expiration)
+      if (expiration.data.length !== 0) {
+        this.$showMessage('表号已经存在')
+      }
+    },
+    close () {
+      this.$parent.meterinfos = []
+      this.$dispatch('close')
+    },
+    confirmEdit () {
+      this.newmeterinfo.f_diameter = ''
+      this.newmeterinfo.f_orgid = this.$login.f.orgid
+      // this.newmeterinfo.f_metertype='威星民用表'
+      this.newmeterinfo.f_orgname = this.$login.f.orgs
+      this.newmeterinfo.f_depid = this.$login.f.depids
+      this.newmeterinfo.f_depname = this.$login.f.deps
+      this.newmeterinfo.f_operator = this.$login.f.name
+      this.newmeterinfo.f_operatorid = this.$login.f.id
+      if (JSON.stringify(this.oldmeter) != '{}') {
+        if (this.newmeterinfo.f_meternumber && this.newmeterinfo.f_imei && this.newmeterinfo.f_iot_type && this.newmeterinfo.f_meternumber !== '' && this.newmeterinfo.f_imei !== '' && this.newmeterinfo.f_iot_type !== '') {
+          this.$resetpost('rs/entity/t_meterinfo', this.newmeterinfo, {
+            resolveMsg: '修改成功。',
+            rejectMsg: '修改失败!!!请核对表号/IMSI码是否重复!'
+          })
+        } else {
+          this.$showMessage('表号/IMEI码/表通道类型 不能为空!')
+        }
+      } else {
+        // 是新增
+        this.newmeterinfo.f_state = '待安装'
+        this.newmeterinfo.f_filialeid = this.f_filialeid ? this.f_filialeid : this.$login.f.orgid
+        this.$resetpost('rs/entity/t_meterinfo', this.newmeterinfo, {
+          resolveMsg: '添加成功。',
+          rejectMsg: '添加失败!!!请核对表号/IMSI码是否重复'
+        })
+      }
+      this.$dispatch('close')
+    }
+  },
+  computed: {
+    meterbrands () {
+      return this.$GetSaleParam.getGasbrand()
+    },
+    iottype () {
+      return this.$appdata.getParam('表通道类型')
+    },
+    terminalId () {
+      return this.$appdata.getParam('终端名称')
+    },
+    valvemarks () {
+      return this.$appdata.getParam('阀控标识')
+    },
+    venders () {
+      return this.$appdata.getParam('厂商代码')
+    },
+    metertype () {
+      return this.$appdata.getParam('气表类型2')
+    },
+    isReceive () {
+      return [{label: '否', value: '否'}, {label: '是', value: '是'}]
+    }
+  }
+}
+</script>

package/src/filiale/rongcheng/FileUserAddress.vue

@@ -55,6 +55,13 @@
                       close-on-select search="true">
             </v-select>
           </div>
+          <div  class="col-sm-6 form-group " v-if="is_pecial">
+            <label class="font_normal_body">小区名称</label>
+            <v-select :value.sync="model.f_residential_area_id" :value-single="true"
+                      :options='areaslist' placeholder='请选择'
+                      close-on-select search="true">
+            </v-select>
+          </div>
           <div v-if="!is_pecial" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;号</label>
             <input type="text" style="width:40%" v-model="model.f_building" class="input_search"

package/src/filiale/rongcheng/gasmove.vue

@@ -67,7 +67,13 @@
                                v-validate:f_move_gas='{required: true}' placeholder="转气气量">
                     </div>
                 </div>
+                <div class="row">
+                  <div class="col-sm-8">
+                    <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;地址&nbsp;&nbsp;&nbsp;</label>
+                    <input class="input_search" style="width:80%" placeholder='目标用户地址' readonly v-model="model.f_address">
+                  </div>
 
+                </div>
                 <div class="row">
                     <div class="col-sm-8">
                         <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
@@ -106,6 +112,7 @@
             f_comments: '',
             f_meter_type: '',
             f_user_name: '',
+            f_address: '',
             f_userfiles_id: '',
             f_move_fee: 0,
             f_move_gas: 0
@@ -187,6 +194,7 @@
             this.model.f_user_name = res.data[0].f_user_name
             this.model.f_meter_type = res.data[0].f_meter_type
             this.model.f_userfiles_id = res.data[0].f_userfiles_id
+            this.model.f_address = res.data[0].f_address
           } else {
             this.$showAlert('输入的用户编号不正确', 'warning', 1500)
           }
@@ -209,6 +217,10 @@
             return
           }
 
+          let result = await this.$showMessage(`确定要进行转气操作吗？转气后无法撤销`)
+          if (result != 'confirm') {
+            return
+          }
           let param = {
             f_user_id: this.row.f_user_id,
             f_userfiles_id: this.row.f_userfiles_id,

package/src/filiale/rongcheng/sale.js

@@ -118,4 +118,5 @@ export default function () {
   Vue.component('disable-manage', (resolve) => { require(['./business/MeterDisable/DisableManage'], resolve) })
   // 转气(荣成转气按一阶计算)
   Vue.component('gas-move', (resolve) => { require(['./gasmove'], resolve) })
+  Vue.component('edit-meter-info', (resolve) => { require(['./EditWebMeterInfo'], resolve) })
 }

package/yarn-error.log

@@ -1,22 +1,22 @@
-Arguments: 
-  C:\Program Files\nodejs\node.exe C:\Program Files\nodejs\node_modules\yarn\bin\yarn.js install
-
-PATH: 
-  C:\Program Files\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;D:\work\jdk\bin;D:\work\jdk\jre\bin;D:\work\;C:\Users\k\AppData\Roaming\nvm;C:\Program Files\nodejs;D:\Bandizip;D:\soft\Bandizip;C:\Program Files\OpenVPN\bin;C:\Program Files\Git\cmd;C:\Program Files (x86)\PuTTY\;D:\tools\gradle-7.6-all\gradle-7.6\bin;C:\Program Files (x86)\NetSarang\Xshell 7\;C:\Program Files (x86)\NetSarang\Xftp 7\;C:\Users\k\AppData\Local\Microsoft\WindowsApps;C:\Users\k\AppData\Roaming\npm;C:\Users\k\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\k\AppData\Local\Programs\EmEditor;C:\Program Files\JetBrains\IntelliJ IDEA 2024.1.2\bin;D:\WorkSpace\product\v3\SaleClient\node_modules\.bin
-
-Yarn version: 
-  1.22.19
-
-Node version: 
-  18.8.0
-
-Platform: 
-  win32 x64
-
-Trace: 
-  Error: EPERM: operation not permitted, copyfile 'C:\Users\k\AppData\Local\Yarn\Cache\v6\npm-glob-7.1.1-integrity\node_modules\glob\package.json' -> 'D:\WorkSpace\product\v3\SaleClient\node_modules\mocha\node_modules\glob\package.json'
-
-npm manifest: 
+Arguments: 
+  C:\Program Files\nodejs\node.exe C:\Program Files\nodejs\node_modules\yarn\bin\yarn.js install
+
+PATH: 
+  C:\Program Files\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;D:\work\jdk\bin;D:\work\jdk\jre\bin;D:\work\;C:\Users\k\AppData\Roaming\nvm;C:\Program Files\nodejs;D:\Bandizip;D:\soft\Bandizip;C:\Program Files\OpenVPN\bin;C:\Program Files\Git\cmd;C:\Program Files (x86)\PuTTY\;D:\tools\gradle-7.6-all\gradle-7.6\bin;C:\Program Files (x86)\NetSarang\Xshell 7\;C:\Program Files (x86)\NetSarang\Xftp 7\;C:\Users\k\AppData\Local\Microsoft\WindowsApps;C:\Users\k\AppData\Roaming\npm;C:\Users\k\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\k\AppData\Local\Programs\EmEditor;C:\Program Files\JetBrains\IntelliJ IDEA 2024.1.2\bin;D:\WorkSpace\product\v3\SaleClient\node_modules\.bin
+
+Yarn version: 
+  1.22.19
+
+Node version: 
+  18.8.0
+
+Platform: 
+  win32 x64
+
+Trace: 
+  Error: EPERM: operation not permitted, copyfile 'C:\Users\k\AppData\Local\Yarn\Cache\v6\npm-glob-7.1.1-integrity\node_modules\glob\package.json' -> 'D:\WorkSpace\product\v3\SaleClient\node_modules\mocha\node_modules\glob\package.json'
+
+npm manifest: 
   {
     "name": "sale-client",
     "version": "3.6.359",
@@ -136,12 +136,12 @@ npm manifest:
       "example": "examples",
       "test": "test"
     }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
   # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
   # yarn lockfile v1
   
@@ -12035,4 +12035,4 @@ Lockfile:
   zrender@4.3.2:
     version "4.3.2"
     resolved "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz"
-    integrity sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==
+    integrity sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==