sale-client 4.2.102 → 4.2.104

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>

package/src/filiale/meihekou/sale.js

@@ -77,4 +77,10 @@ export default function () {
   Vue.component('user-pricechange-manage', (resolve) => { require(['./UserPriceChangeManage'], resolve) })
   // 交费具体信息金额
   Vue.component('meter-operate-maintain', (resolve) => { require(['./MeterOperatemain'], resolve) })
+  // 其他信息
+  Vue.component('otherinfo', (resolve) => { require(['./otherinfo'], resolve) })
+  // 设备信息
+  Vue.component('device-message', (resolve) => { require(['./deviceMessage.vue'], resolve) })
+  // 保险信息
+  Vue.component('user-fee-info', (resolve) => { require(['./UserFeeInfo.vue'], resolve) })
 }