sale-client 3.6.332 → 3.6.333

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -437,6 +437,7 @@ export default {
         castInt: true,
         aroundmeter: false, // 表向
         changeReason: false, // 换表原因
+        changePrice: false, // 气价任意变更权限
         dispatch: false, // 是否派工
         showupload: true, //
         approve: false  // 是否开启审核
@@ -588,7 +589,11 @@ export default {
           f_price_type: this.newinfo.pricetype[0],
           filter: this.$login.f.orgid
         }
-        rs = this.$GetSaleParam.getPrice(params)
+        if (this.config.changePrice) {
+          rs = this.$GetSaleParam.getPriceAllOther(params)
+        } else {
+          rs = this.$GetSaleParam.getPrice(params)
+        }
       }
       if (rs.length === 0) {
         this.newinfo.f_price_name = ''

package/src/filiale/liuan/UserInfoDetailManageNew.vue

@@ -0,0 +1,222 @@
+<template>
+  <div class="binary flex">
+    <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
+      <div class="auto">
+        <user-base-info-new :row="row" :buttonshow="buttonshow"
+                            @cancel-main="cancel"
+                            @cancel-re="cancelRe"
+                            @search-main="search"></user-base-info-new>
+      </div>
+      <saletabbut v-if="row" v-ref:list style="height:72%;margin-top: 1%;overflow-y: scroll">
+        <saletab header="流水查询" v-if="permission('流水查询')">
+          <record-query-user :row="row"></record-query-user>
+        </saletab>
+        <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
+          <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
+        </saletab>
+        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
+          <charge-query-user :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
+          <charge-query-user :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="累购查询" v-if="permission('累购查询')">
+          <Repurchase :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
+        </saletab>
+        <saletab header="下账查询"
+                 v-if="!newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <automatic-purse :row="row" @deal-msg="dealMsg"></automatic-purse>
+        </saletab>
+        <saletab header="下账查询"
+                 v-if="newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <web-automatic-purse :row="row" @deal-msg="dealMsg"></web-automatic-purse>
+        </saletab>
+        <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
+        </saletab>
+        <saletab header="抄表记录" v-if="!newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <hand-query-user :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
+        </saletab>
+        <saletab header="抄表记录" v-if="newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <web-hand-query-user :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></web-hand-query-user>
+        </saletab>
+        <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
+          <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
+        </saletab>
+        <saletab header="补气查询" v-if="permission('补气查询')">
+          <fill-gas-query-user :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
+        </saletab>
+        <saletab header="换表查询" v-if="permission('换表查询')">
+          <change-meter-query-user :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
+        </saletab>
+        <saletab header="其他收费" v-if="permission('其他收费')">
+          <other-charge-query-user :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
+        </saletab>
+        <saletab header="过户查询" v-if="permission('过户查询')">
+          <transfer-query-user :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
+        </saletab>
+        <saletab header="价格调整" v-if="permission('价格调整')">
+          <price-change-query-user :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
+        </saletab>
+        <saletab header="附件查看" v-if="permission('附件查看')">
+          <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
+        </saletab>
+        <saletab header="变更记录" v-if="permission('变更记录')">
+          <change-record :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
+        </saletab>
+        <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
+          <query-instruct :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
+        </saletab>
+        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
+          <query-history-instruct :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
+        </saletab>
+        <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
+          <watch-warning :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
+        </saletab>
+        <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
+          <watch-collection :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
+        </saletab>
+        <saletab header="调价补差" v-if="permission('调价补差')">
+          <price-adjustment-query-user :row="row" v-if="show == '调价补差'"
+                                       @deal-msg="dealMsg"></price-adjustment-query-user>
+        </saletab>
+        <saletab header="设备查询" v-if="permission('设备查询')">
+          <deveice-record :row="row" v-if="show == '设备查询'" @deal-msg="dealMsg"></deveice-record>
+        </saletab>
+        <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
+          <meter-param :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
+        </saletab>
+        <saletab header="表使用量图表" v-if="permission('流量计参数查看')">
+          <table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
+        </saletab>
+        <saletab header="用户设备查询" v-if="permission('用户设备查看')">
+          <user-device-query :row="row" v-if="show == '用户设备查询'" @deal-msg="dealMsg"></user-device-query>
+        </saletab>
+        <saletab header="合同查看" v-if="permission('合同查看')">
+          <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
+        </saletab>
+      </saletabbut>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+// 导入IC卡相关查询界面
+import ChangeMeterQueryUser from '../../components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser'
+import ChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeQueryUser'
+import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
+import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
+import HandQueryUser from '../../components/common/userinfo_detail/ic_detail/HandQueryUser'
+import OtherChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/OtherChargeQueryUser'
+import RecordQueryUser from '../../components/common/userinfo_detail/ic_detail/RecordQueryUser'
+import TransferQueryUser from '../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
+import CardHandRecord from '../../components/common/userinfo_detail/ic_detail/CardHandRecord'
+import AutomaticPurse from '../../components/common/userinfo_detail/ic_detail/AutomaticPurse'
+import Repurchase from '../../components/common/userinfo_detail/ic_detail/Repurchase'
+import MachineRecordQuery from '../../components/common/userinfo_detail/ic_detail/MachineRecordQuery'
+import WebAutomaticPurse from '../../components/common/userinfo_detail/ic_detail/WebAutomaticPurse'
+import WebChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/WebChargeQueryUser'
+import WebHandQueryUser from '../../components/common/userinfo_detail/ic_detail/WebHandQueryUser'
+import UserDeviceQuery from '../../components/common/userinfo_detail/ic_detail/UserDeviceQuery'
+import contractSigningList from '../../components/common/userinfo_detail/ic_detail/contractSigningList'
+
+// 导入物联网相关查询
+import QueryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryInstruct'
+import QueryHistoryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryHistoryInstruct'
+import WatchCollection from './WatchCollection'
+import WatchWarning from '../../components/common/userinfo_detail/iot_detail/WatchWarning'
+import PriceChangeQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceChangeQueryUser'
+import ChangeRecord from '../../components/common/userinfo_detail/ic_detail/ChangeRecord'
+import PriceAdjustmentQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser'
+import MeterParam from '../../components/common/userinfo_detail/ic_detail/MeterParam'
+import DeveiceRecord from '../../components/common/userinfo_detail/ic_detail/DeveiceRecord'
+
+export default {
+  title: '用户详细信息',
+  props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
+  components: {
+    PriceAdjustmentQueryUser,
+    PriceChangeQueryUser,
+    AutomaticPurse,
+    WebAutomaticPurse,
+    WebChargeQueryUser,
+    WebHandQueryUser,
+    Repurchase,
+    ChangeMeterQueryUser,
+    ChargeQueryUser,
+    ChargeRecordQueryUser,
+    FillCardQueryUser,
+    HandQueryUser,
+    OtherChargeQueryUser,
+    RecordQueryUser,
+    TransferQueryUser,
+    WatchWarning,
+    WatchCollection,
+    QueryInstruct,
+    QueryHistoryInstruct,
+    ChangeRecord,
+    CardHandRecord,
+    MeterParam,
+    DeveiceRecord,
+    MachineRecordQuery,
+    UserDeviceQuery,
+    contractSigningList
+  },
+  data () {
+    return {
+      row: null,
+      name: '自动下账查询',
+      newWebHand: this.$appdata.getSingleValue('新抄表'),
+      show: ''
+    }
+  },
+  ready () {
+    this.search()
+    console.log(this.$login)
+  },
+  methods: {
+    permission (name) {
+      if (this.$login.r.find(value => value == '收费综合查询')) {
+        if (!this.$login.r.find(value => value == name)) {
+          return false
+        }
+      }
+      return true
+    },
+    async search () {
+      let http = new HttpResetClass()
+      let condition = ' 1 = 1'
+      if (this.f_userfiles_id) {
+        condition = `f_userfiles_id = '${this.f_userfiles_id}'`
+      } else if (this.f_userinfo_id) {
+        condition = `f_userinfo_id = '${this.f_userinfo_id}'`
+      } else if (this.f_userinfo_code) {
+        condition = `f_userinfo_code = '${this.f_userinfo_code}'`
+      }
+
+      let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
+        {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+      this.row = getBaseInfo.data[0]
+      this.row.parentname = this.parentname || ''
+    },
+
+    cancel (val) {
+      this.$emit('cancel-main', val)
+    },
+
+    cancelRe (val) {
+      this.$emit('cancel-re', val)
+    },
+
+    butOper (val) {
+      this.name = val
+    }
+  },
+  watch: {
+    'f_userinfo_id' () {
+      this.search()
+    }
+  }
+}
+</script>

package/src/filiale/liuan/WatchCollection.vue

@@ -0,0 +1,192 @@
+<template>
+  <div id="stand-work-list">
+    <div @keyup.enter="search" class="span">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+
+              <div class="col-sm-2 form-group ">
+                <label class="font_normal_body">上报时间</label>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="m.f_hand_date >= '{}'"
+                            placeholder="大于等于"
+                            style="width: 60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group ">
+                <label class="font_normal_body">&nbsp;至</label>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="m.f_hand_date <= '{}'"
+                            placeholder="小于等于"
+                            style="width: 60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div style="float: right">
+                <button @click="search()" class="button_search" v-el:cba>查询</button>
+              </div>
+            </div>
+
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>上报日期</nobr>
+              </th>
+              <th>
+                <nobr>表上余额</nobr>
+              </th>
+              <th>
+                <nobr>本次抄表底数</nobr>
+              </th>
+              <th>
+                <nobr>阀门状态</nobr>
+              </th>
+              <th>
+                <nobr>上报类型</nobr>
+              </th>
+              <th>
+                <nobr>系统接收时间</nobr>
+              </th>
+              <th>
+                <nobr>表内累计充值金额</nobr>
+              </th>
+              <th>
+                <nobr>噪音强度</nobr>
+              </th>
+              <th>
+                <nobr>信噪比</nobr>
+              </th>
+              <th>
+                <nobr>电压</nobr>
+              </th>
+              <th>
+                <nobr>电压状态</nobr>
+              </th>
+              <th>
+                <nobr>阀门强制状态</nobr>
+              </th>
+              <th>
+                <nobr>计量类型</nobr>
+              </th>
+              <th>
+                <nobr>金额状态</nobr>
+              </th>
+
+              <th>
+                <nobr>磁干扰异常</nobr>
+              </th>
+              <th>
+                <nobr>补偿状态</nobr>
+              </th>
+              <th>
+                <nobr>温度</nobr>
+              </th>
+              <th>
+                <nobr>压力</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body' partial='list'>
+            <tr>
+              <td style="text-align:center">
+                <nobr>{{ row.f_hand_date }}</nobr>
+              </td>
+              <th style="text-align:center">
+                <nobr>{{ row.f_jval }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_tablebase }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_valvestate == 0 ? '开阀' : '关阀' }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_upload_type }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_insert_date }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_meterdebitamt }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_signal }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_snr }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_batterylevel }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知' }}
+                </nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_networkshutvalve }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_wmprepaytype }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_moneystate }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_magneticInterference }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.f_compensateState }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.flowmeterTemperature }}</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>{{ row.flowmeterPressure }}</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  title: 'WatchCollection',
+  data () {
+    return {
+      model: new PagedList('rs/sql/iot_getNewLoseUserQuery', 50)
+    }
+  },
+  props: ['row'],
+  ready () {
+    this.$refs.paged.$refs.criteria.search()
+  },
+  methods: {
+    search (args) {
+      args.condition = `${args.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
+      this.model.search(args.condition, args.model)
+    }
+  },
+  watch: {
+    // 监听查询对象
+    'row' (val) {
+      if (this.row != null) {
+        this.$refs.paged.$refs.criteria.search()
+      }
+    }
+  }
+}
+</script>
+

package/src/filiale/liuan/sale.js

@@ -8,4 +8,6 @@ export default function () {
   Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo'], resolve) })
   // 当前选择用户的表具基本信息
   Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
+
+  Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
 }