sale-client 4.2.101 → 4.2.103

package/src/filiale/meihekou/Userinfo.vue

@@ -46,32 +46,32 @@
                 class="glyphicon glyphicon-pencil  clickchange" title="修正备用电话"></span>
           </span>
         </div>
-        <div class="row">
-          <label class = "col-sm-5 " >备注信息</label>
-          <span class = "col-sm-7">{{data?data.f_comments:dafault.f_comments}}
-          <span v-if="data" @click.stop="change_reason"
-                class="glyphicon glyphicon-pencil  clickchange" title="修改备注信息"></span>
-          </span>
-        </div>
         <div class="row">
           <label class = "col-sm-5 " >客户地址</label>
           <span class = "col-sm-7">{{data?data.f_address:dafault.f_address}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >开户时间</label>
-          <span class = "col-sm-7">{{data?data.f_open_date.substr(0,10):dafault.f_open_date}}</span>
+          <label class = "col-sm-5 " >建档时间</label>
+          <span class = "col-sm-7">{{data?data.f_createfile_date.substr(0,10):dafault.f_open_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >用户等级</label>
+          <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_user_level:dafault.f_people_num}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >安装时间</label>
-          <span class = "col-sm-7">{{data?data.f_install_date.substr(0,10):dafault.f_input_date}}</span>
+          <label class = "col-sm-5 " >租户姓名</label>
+          <span class = "col-sm-7">{{data?data.f_rent_name.substr(0,10):dafault.f_user_name}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >人&ensp;口&ensp;数</label>
-          <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_people_num:dafault.f_people_num}}</span>
+          <label class = "col-sm-5 " >租户电话</label>
+          <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_rent_phone:dafault.f_user_phone}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >用户等级</label>
-          <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_user_level:dafault.f_people_num}}</span>
+          <label class = "col-sm-5 " >备注信息</label>
+          <span class = "col-sm-7">{{data?data.f_comments:dafault.f_comments}}
+          <span v-if="data" @click.stop="change_reason"
+                class="glyphicon glyphicon-pencil  clickchange" title="修改备注信息"></span>
+          </span>
         </div>
         <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
                v-ref:modal large backdrop="false">

package/src/filiale/meihekou/deviceMessage.vue

@@ -0,0 +1,86 @@
+<template>
+    <div class="panel panel-info auto">
+        <div class="panel-heading auto" style="height: 30px">
+            <h4 style="display:inline-block;margin-top: auto">设备信息</h4>
+        </div>
+
+        <div class="auto info-content" v-if="data" v-for="row in model" style="margin: 5px;
+    background: #F2FAFE;">
+            <div class="row">
+                <label class="col-sm-4 ">设备类型:</label>
+                <span class="col-sm-8">{{row.f_devices_type}}</span>
+            </div>
+            <div class="row">
+                <label class="col-sm-4 ">购买方式:</label>
+                <span class="col-sm-8">{{row.watchpurchase}}</span>
+            </div>
+            <div class="row">
+                <label class="col-sm-4 ">安装方式:</label>
+                <span class="col-sm-8">{{data.f_install_type}}</span>
+            </div>
+            <div class="row">
+                <label class="col-sm-4 ">安装日期:</label>
+                <span class="col-sm-8">{{data.f_input_date}}</span>
+            </div>
+            <div class="row">
+                <label class="col-sm-4 ">到期日期:</label>
+                <span class="col-sm-8">{{data.f_expire_date}}</span>
+            </div>
+          <div class="row">
+            <label class="col-sm-4 ">设备备注:</label>
+            <span class="col-sm-8">{{data.f_comments}}</span>
+          </div>
+        </div>
+    </div>
+</template>
+<script>
+  /**
+   *用户信息
+   *开票信息
+   */
+
+  import {HttpResetClass} from 'vue-client'
+  let getDevicesGen = async function (self) {
+    // 获取安检信息
+    try {
+      let http = new HttpResetClass()
+      let param = {
+        condition: `f_userinfo_id = '${self.data.f_userinfo_id}'`
+      }
+      let getDevices = await http.load('POST', 'api/af-revenue/sql/sale_deviceQuery', param, {resolveMsg: null, rejectMsg: null})
+      if (!(JSON.stringify(getDevices.data) == '{}')) {
+        self.model = {}
+        self.model = Object.assign({}, self.model, getDevices.data)
+        self.hasDevices = 1
+      } else {
+        self.model = {}
+        self.hasDevices = 0
+      }
+    } catch (error) {
+      self.hasDevices = 0
+    }
+  }
+  export default {
+    title: '设备信息',
+    data () {
+      return {
+        model: {},
+        hasDevices: -1
+      }
+    },
+    watch: {
+      'data': {
+        handler (newVal, oldVal) {
+          if (newVal == null) {
+            this.hasDevices = 0
+            this.model = {}
+          } else {
+            getDevicesGen(this)
+          }
+        },
+        deep: true
+      }
+    },
+    props: ['data']
+  }
+</script>

package/src/filiale/meihekou/handOperate.vue

@@ -158,7 +158,13 @@
         <div class="row">
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">所属部门</label>
-            <input type="text" v-model="model.f_depname" disabled=disabled style="width: 60%" class="input_search">
+            <res-select restype="department"
+                        :is-mul="false"
+                        :disabled="!editdep"
+                        :parentresid="model.f_orgid ? [model.f_orgid] : ($login && $login.f && $login.f.orgid ? [$login.f.orgid] : [])"
+                        :initresid="model.f_depid ? [model.f_depid] : []"
+                        @res-select="onDepSelect">
+            </res-select>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">所属公司</label>
@@ -211,8 +217,9 @@ import {HttpResetClass} from 'vue-client'
 import * as Util from "../../components/../Util";
 var data
 let readyGen = async function (self) {
-  await  self.$LoadParams.loadParam(self.f_filialeid)
-  await    self.$GetSaleParam.initinputtor()
+  await self.$LoadParams.loadParam(self.f_filialeid)
+  await self.$GetSaleParam.initinputtor()
+  await self.initdep()
   await self.initperson()
 }
 export default {
@@ -226,6 +233,8 @@ export default {
       priceSplit: false,
       recordList: [],
       person:[],
+      fdep: [],
+      editdep: false,
       fileNameSet: {
         'f_meter_state': '抄表状态',
         'f_hand_state': '抄表单状态',
@@ -258,12 +267,47 @@ export default {
     if (this.$login.r.includes('维护银行转账信息')) {
       this.editbank = true
     }
+    if (this.$login.r.includes('抄表记录维护部门权限')) {
+      this.editdep = true
+    }
     this.oldmodel = JSON.parse(JSON.stringify(this.model))
     readyGen(this)
   },
   created () {
   },
   methods: {
+    onDepSelect (resIds, labels) {
+      if (resIds && resIds.length > 0) {
+        this.model.f_depid = resIds[0]
+        this.model.f_depname = labels && labels.length > 0 ? labels[0] : ''
+      } else {
+        this.model.f_depid = ''
+        this.model.f_depname = ''
+      }
+      // 选部门后刷新人员列表
+      this.initperson()
+    },
+    initdep () {
+      this.fdep = []
+      if (!this.$GetSaleParam || !this.$GetSaleParam.inputtors) {
+        return
+      }
+      const inputtors = this.$GetSaleParam.inputtors
+      const orgId = this.model.f_orgid || (this.$login && this.$login.f && this.$login.f.orgid)
+      const filterdep = inputtors.filter((res) => {
+        const hasRole = res.rolestr && res.rolestr.indexOf('营业员') > -1
+        const orgMatch = res.f_organization_id === orgId || res.f_orgid === orgId
+        return hasRole && orgMatch
+      })
+      filterdep.forEach((res) => {
+        if (res.parentid && res.f_department_name && !this.fdep.some((d) => d.value === res.parentid)) {
+          this.fdep.push({label: res.f_department_name, value: res.parentid})
+        }
+      })
+      if (this.model.f_depid && !this.fdep.some((d) => d.value === this.model.f_depid)) {
+        this.fdep.push({label: this.model.f_depname || this.model.f_depid, value: this.model.f_depid})
+      }
+    },
     initperson () {
       this.person = []
       let arr = this.$GetSaleParam.inputtors.filter((res) => {
@@ -275,6 +319,20 @@ export default {
         this.person.push({label: res.name, value: res.name})
       })
     },
+    selectdep () {
+      const id = this.model.f_depid
+      if (!id) {
+        this.model.f_depname = ''
+        this.initperson()
+        return
+      }
+      const hit = this.$GetSaleParam.inputtors.find((res) => res.parentid === id || res.f_department_id === id)
+      if (hit && hit.f_department_name) {
+        this.model.f_depname = hit.f_department_name
+      }
+      // 选部门后刷新人员列表
+      this.initperson()
+    },
     fileterprice (row) {
       this.priceSplit = true
       console.log('row==>', row)
@@ -387,6 +445,7 @@ export default {
       }
     },
     'model' () {
+      this.initdep()
       this.initperson()
     }
   }

package/src/filiale/meihekou/meterinfodetail.vue

@@ -22,25 +22,9 @@
           <span class = "col-sm-7">{{data?data.f_meter_style:dafault.f_meter_style}}</span>
         </div>
         <div class="row">
-          <label class="col-sm-5" style="color: brown">表具状态</label>
+          <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_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_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_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_jval:dafault.f_jval}}</span>
-        </div>
-        <div class="row" v-if="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_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>
@@ -49,54 +33,75 @@
           <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 class="row">
+          <label class = "col-sm-5 " >上次抄表日期</label>
+          <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,12):dafault.f_hand_date}}</span>
         </div>
+<!--        <div class="row" v-if="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_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_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_jval:dafault.f_jval}}</span>-->
+<!--        </div>-->
+<!--        <div class="row" v-if="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_jval:dafault.f_jval}}</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" 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" 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>-->
@@ -117,42 +122,42 @@
         <!--<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" 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">
-          <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">
           <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_inputtor:dafault.f_inputtor}}</span>
-        </div>
-        <div class="row">
-          <label class = "col-sm-5 " >上次抄表日期</label>
-          <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,12):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,11):dafault.f_input_date}}</span>
+          <label class = "col-sm-5 " >抄表册名</label>
+          <span class = "col-sm-7">{{data?  (data.f_book_name ? data.f_book_name:''):dafault.f_book_name}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >设备公司安装</label>
-          <span class = "col-sm-7">{{data?data.f_isdc_install:dafault.f_isdc_install}}</span>
+          <label class = "col-sm-5 " >抄表员</label>
+          <span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
         </div>
+<!--        <div class="row">-->
+<!--          <label class = "col-sm-5 " >上次抄表日期</label>-->
+<!--          <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,12):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,11):dafault.f_input_date}}</span>-->
+<!--        </div>-->
+<!--        <div class="row">-->
+<!--          <label class = "col-sm-5 " >设备公司安装</label>-->
+<!--          <span class = "col-sm-7">{{data?data.f_isdc_install:dafault.f_isdc_install}}</span>-->
+<!--        </div>-->
         <div class="row">
           <label class = "col-sm-5 " >备&emsp;&emsp;注</label>
           <span class = "col-sm-7">{{data?data.comments:dafault.comments}}</span>

package/src/filiale/meihekou/otherinfo.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="flex" style="height: 90%;overflow-y: scroll">
+    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
+    <device-message @setstate="setstate" :state="state" :data="data"></device-message>
+    <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
+    <user-fee-info :userinfoid="data.f_userinfo_id" v-ref:valueaddinfo></user-fee-info>
+    <sale-safecheck-info :data="data"></sale-safecheck-info>
+    <!--  未处理隐患  -->
+    <sale-hidden-danger-info :data="data"></sale-hidden-danger-info>
+    <service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>
+    <check-gas :data="data" v-if="checkgas==='气量核对'"></check-gas>
+  </div>
+</template>
+
+<script>
+/**
+*客户相关信息
+*/
+
+import MixPriceInfo from '../../../src/components/revenue/base/leftview/MixPriceInfo.vue'
+import ServiceRepair from '../../../src/components/revenue/base/leftview/ServiceRepair.vue'
+import CheckGas from '../../../src/components/revenue/base/leftview/CheckGas.vue'
+export default {
+  title: '客户相关信息',
+  data () {
+    return {
+      name: '',
+      checkgas: ''
+    }
+  },
+  components: {MixPriceInfo, ServiceRepair, CheckGas},
+  props: {
+    data: {
+      type: Object
+    },
+    cardData: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    state:{
+      type: String,
+      default:null
+    }
+  },
+  ready () {
+    this.getAuthority()
+  },
+  methods: {
+    getAuthority () {
+      if (this.$login.r.find(value => value == '维修情况查询')) {
+        this.name = '维修情况查询'
+        console.log(this.name)
+      }
+      if (this.$login.r.find(value => value == '气量核对')) {
+        this.checkgas = '气量核对'
+        console.log(this.checkgas)
+      }
+      console.log('查看权限', this.$login.r)
+    },
+    dealMsg (obj) {
+      this.$dispatch('deal-msg', obj)
+    },
+    setstate(state){
+      this.$dispatch('setstate',state)
+    }
+  }
+}
+</script>
+<style lang="less">
+  #mulit-info-class {
+    width: 280px;
+    margin-right: 20px;
+    overflow-y: auto;
+    > div {
+      height: auto;
+      margin-bottom: 8px;
+    }
+  }
+  // 内容显示样式
+  .control-label {
+    height: 23px;
+    border-right: 1px solid #F2F6FA;
+    margin-bottom: 0;
+    text-align: left;
+  }
+
+  .info-content {
+    padding:6px;
+    span {
+      padding-left: 5px;
+    }
+  }
+// 信息区域的表格显示紧凑
+  .self-table > tbody > tr > td {
+    padding: 3px;
+    text-align: center;
+  }
+</style>