manage-client 3.2.127 → 3.2.130

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -47,7 +47,7 @@
                                 <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
                                 <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                                               :field="$parent.$parent.getfield"
-                                              sqlurl="rs/logic/exportfile" sql-name="DrillErrorByUserinfo" template-name='异常分析'
+                                              sqlurl="rs/logic/exportfile" sql-name="getExceptionList" template-name='异常查询'
                                               :choose-col="true"></export-excel>
                                 <!--<button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()">显示汇总</button>-->
                                 <!--                <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>-->
@@ -355,9 +355,9 @@
                     {label: '日', value: 'day'}
                 ],
                 getfield:{
-                    "f_userinfo_code":"客户编号", "f_user_name":"客户名称", "f_address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质",
-                    "f_meternumber":"表号","f_meter_brand":"气表品牌","f_insert_date":"上报时间","f_error_level":"异常级别","f_error_type":"异常类型",
-                    "f_error_msg":"异常描述","f_orgname":"组织机构"
+                    "f_userinfo_code":"客户编号", "f_user_name":"客户名称","f_residential_area":"小区", "address":"客户地址","f_balance_amount":"账户余额","f_user_phone":"联系电话",
+                    "f_meternumber":"表号","f_meter_brand":"气表品牌","f_hand_date":"抄表日期","f_insert_date":"最后一次通讯时间","f_electricity":"电池电量","f_batterylevel":"电池电压",
+                    "f_signal":"信号强度","f_magneticInterference":"磁干扰异常","f_valvestate":"阀门状态","f_error_type":"异常类型","f_error_level":"异常级别","f_orgname":"分公司"
                 },
                 outlets: [],
                 operator: [],
@@ -520,17 +520,11 @@
             }
         },
         computed: {
-            // usertypes () {
-            //   return this.$appdate.getParams("客户类型")
-            // },
             getCondition() {
                 let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
                 return {
-                    condition: condition  ,
-                    startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
-                    endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
+                    condition: condition
                 }
-
             },
             usertypes() {
                 return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]

package/src/filiale/liaoyuan/exportConfig.js

@@ -405,7 +405,8 @@ monthGasConfig: {
   expectgasConfig:{
     "f_month":"月份","f_orgname":"公司","f_gy_num":"工业户数","f_my_num":"民用户数","f_jt_num":"集体户数","f_sy_num":"商业户数","f_sum_num":"户数合计",
     "f_gy_gas":"工业抄表量","f_my_gas":"民用抄表量","f_jt_gas":"集体抄表量","f_sy_gas":"商业抄表量","f_sum_gas":"抄表量合计",
-    "f_gy_account":"工业抄表金额","f_my_account":"民用抄表金额","f_jt_account":"集体抄表金额","f_sy_account":"商业抄表金额","f_sum_account":"抄表金额合计"
+    "f_gy_account":"工业抄表金额","f_my_account":"民用抄表金额","f_jt_account":"集体抄表金额","f_sy_account":"商业抄表金额","f_sum_account":"抄表金额合计",
+    "f_old_gas": "冲正气量","f_old_fee": "冲正金额","f_old_num":"冲正户数"
   },
   pregaslistConfig:{
     "f_month":"月份","f_last_balance":"期初余额","f_wechat_pay":"微信","f_money_pay":"现金","f_bank_pay":"银行转账",

package/src/filiale/macheng/MonthGasQuery.vue

@@ -350,8 +350,8 @@
             },
             selfSearch(args) {
                 args.condition = `${args.condition} ` + this.orgCondtionStr
-                let f_orgstr = this.orgCondtionStr + 'and f_orgid = ' + this.f_orgid
-                args.condition = `${args.condition} ` + f_orgstr
+                // let f_orgstr = this.orgCondtionStr + 'and f_orgid = ' + this.f_orgid
+                // args.condition = `${args.condition} ` + f_orgstr
                 this.model.search(args.condition, args.model)
                 this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
             },

package/src/filiale/macheng/RecordInfoQuery.vue

@@ -344,7 +344,7 @@
                   <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>
@@ -453,7 +453,7 @@
                 <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_gas_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_zones}}</nobr></td>
                 <!-- 气价类型,单价暂时未处理 -->
                 <td style="text-align: center;"><nobr>{{row.f_price_type}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></td>

package/src/filiale/macheng/WebmeterSettlementAnalysis.vue

@@ -0,0 +1,367 @@
+<template>
+  <div class="flex-row" v-show="!showdetail">
+    <div id='app1' class="basic-main">
+      <criteria-paged :model="model" :pager='true' v-ref:paged>
+        <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+          <div novalidate 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>
+                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                       v-model="model.f_userinfo_code" placeholder='客户编号'
+                       condition="f_userinfo_code like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
+                >
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">客户名称</label>
+                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                       v-model="model.f_user_name" placeholder='客户名称'
+                       condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
+                >
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">客户地址</label>
+                <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_area"
+                       placeholder='地址'
+                       condition="f_address like '%{}%'" v-el:xq v-next-el='address' v-el:area
+                >
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                       v-model="model.f_meternumber" placeholder='表号'
+                       condition="f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                >
+              </div>
+              <div style="float:right">
+                <button class="button_search button_spacing" @click="search()">查询</button>
+                <button class="button_clear button_spacing" @click="clear">清空</button>
+                <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                              :field="$parent.$parent.getfield" :sumname="$parent.$parent.sumName"
+                              sqlurl="rs/logic/exportfile" sql-name="webmeterSettlementAnalysis"
+                              template-name='物联网表结算分析'
+                              :choose-col="true"></export-excel>
+
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                     @click="$parent.$parent.hidden()"></div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+                <right-tree @re-res="$parent.$parent.getorg" width="60%"
+                            :initresid='$parent.$parent.org'></right-tree>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">客户类型</label>
+                <v-select style="width:60%" id="f_user_type"
+                          v-model="model.f_user_type"
+                          placeholder='客户类型'
+                          :value.sync="model.f_user_type"
+                          @change="$parent.$parent.userTypeChange()"
+                          :options='$parent.$parent.usertypes'
+                          condition="f_user_type = '{}'"
+                          close-on-select>
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">用气性质</label>
+                <v-select style="width:60%" id="f_gasproperties"
+                          v-model="model.f_gasproperties"
+                          placeholder='用气性质'
+                          :value.sync="model.f_gasproperties"
+                          :options='$parent.$parent.gasproperties'
+                          condition="f_gasproperties = '{}'"
+                          close-on-select>
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">气表品牌</label>
+                <v-select
+                  placeholder='气表品牌'
+                  :value.sync="model.f_meter_brand"
+                  v-model="model.f_meter_brand"
+                  :options='$parent.$parent.meterbrands'
+                  close-on-select
+                  condition="f_meter_brand='{}'">
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">气表型号</label>
+                <v-select
+                  placeholder='气表型号'
+                  :value.sync="model.f_meter_style"
+                  v-model="model.f_meter_style"
+                  :options='$parent.$parent.meterstyle[model.f_meter_brand]'
+                  close-on-select
+                  condition="f_meter_style='{}'">
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">分析状态</label>
+                <v-select
+                  placeholder='状态'
+                  :value.sync="model.f_state"
+                  v-model="model.f_state"
+                  :options='$parent.$parent.states'
+                  close-on-select
+                  condition="f_state='{}'">
+                </v-select>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid id="lostuserlist" :model="model" partial='list' v-ref:grid class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th style="text-align:center">
+                <nobr>客户编号</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>客户名称</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>客户地址</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>客户类型</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>用气性质</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>表号</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>气表品牌</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>气表型号</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>组织机构</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>账户余额</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>最后上报金额</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>分析状态</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>结算异常金额</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center;">
+              <nobr>{{ row.f_userinfo_code }}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{ row.f_user_name }}</nobr>
+            </td>
+            <td>
+              <nobr>{{ row.f_address }}</nobr>
+            </td>
+            <td style="text-align:center">{{ row.f_user_type }}</td>
+            <td style="text-align:center">{{ row.f_gasproperties }}</td>
+            <td style="text-align:center">
+              <nobr>{{ row.f_meternumber }}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{ row.f_meter_brand }}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{ row.f_meter_style }}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{ row.f_orgname }}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{ row.f_balance_amount }}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{ row.f_jval }}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{ row.f_state }}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{ row.exception_val }}</nobr>
+            </td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+      <table class="table-hover">
+        <tr style="position: relative;bottom:4rem" class="table-bordered">
+          <td
+            style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+            汇总信息
+          </td>
+          <td
+            style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            异常金额:&emsp;{{ sumsmodel.exception_val }}
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+
+let readySomething = async function (self) {
+  await self.$MagLoadParams.loadParam()
+  self.initParams()
+}
+export default {
+  title: '物联网表结算分析',
+  props: ['data'],
+  data() {
+    return {
+      model: new PagedList('rs/sql/webmeterSettlementAnalysis', 20, {}, {exception_val: 0}),
+      getfield: {
+        'f_userinfo_code': '客户编号', 'f_user_name': '客户名称',
+        'f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质',
+        'f_meternumber': '表号',
+        'f_meter_brand': '气表品牌', 'f_meter_style': '气表型号', 'f_orgname': '组织机构',
+        'f_balance_amount': '表上余额', 'f_jval': '表上余额',
+        'f_state': '状态', 'exception_val': '结算异常金额'
+      },
+      showdetail: false,
+      rowdata: {},
+      startDate: '',
+      endDate: '',
+      criteriaShow: false,
+      outlets: [],
+      gasproperties: [{label: '全部', value: ''}],
+      operator: [],
+      sumsmodel: {},
+      meterbrands: [],
+      states: [],
+      meterstyle: {},
+      orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+      orgid: [this.$login.f.orgid],
+      condition: '1=1',
+      org: [this.$login.f.orgid]
+
+    }
+  },
+  ready() {
+    readySomething(this)
+  },
+  methods: {
+
+    userTypeChange() {
+      this.gasproperties = [{label: '全部', value: ''}]
+      if (this.$refs.paged.$refs.cri.model && this.$refs.paged.$refs.cri.model.f_user_type) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+        console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+      } else {
+        this.gasproperties = [{label: '全部', value: ''}]
+      }
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    showmsg(obj) {
+      this.rowdata = obj
+      this.showdetail = true
+    },
+    cancel() {
+      this.showdetail = false
+    },
+    initParams() {
+      // 初始化气表品牌
+      let brandArr = []
+      this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+        if (item.value.f_meter_type === '物联网表') {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+
+          let styleArr = [{label: '全部', value: ''}]
+          for (let row of item.value.gasmodel) {
+            styleArr.push({label: row.label, value: row.value.f_meter_style})
+          }
+          this.meterstyle[temp.value] = styleArr
+        }
+
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      this.states = [{label: '全部', value: ''}, {label: '上报大于余额', value: '上报大于余额'}, {
+        label: '余额大于上报',
+        value: '余额大于上报'
+      }, {label: '上报与余额相等', value: '上报与余额相等'}]
+    },
+    search(args) {
+      this.condition = args.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`
+      this.model.search(args.condition, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+    },
+    getorg(obj) {
+      if (obj.resids.length > 0) {
+        this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
+      } else {
+        this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid
+      }
+    },
+    clearmsg() {
+      this.$refs.paged.$refs.cri.model = {}
+    }
+  },
+  watch: {},
+  computed: {
+    getCondition() {
+      let condition = this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
+      return {
+        condition: condition,
+        startDate: `${this.$refs.paged.$refs.cri.model.startDate}`,
+        endDate: `${this.$refs.paged.$refs.cri.model.endDate}`
+      }
+    },
+    usertypes() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style>
+.form-input-group label {
+  text-align: right;
+  width: auto;
+}
+
+.mystyle {
+  float: right;
+  padding-right: 10%;
+}
+
+.mystyle1 {
+  padding-top: 10px;
+
+}
+
+.mystyle2 {
+  width: 100%;
+  height: 35px;
+  /*background: #00A3F0;*/
+  padding-left: 15px;
+  float: left;
+}
+
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+  padding: 10px 30px 10px 30px;
+  border-radius: 15px;
+}
+</style>

package/src/filiale/macheng/sale.js

@@ -7,6 +7,7 @@ let specialComp = {
   'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) },
   'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
   'fmygas-query': (resolve) => { require(['./FMYGasQuery'], resolve) },
-  'month-gas-query': (resolve) => { require(['./MonthGasQuery'], resolve) }
+  'month-gas-query': (resolve) => { require(['./MonthGasQuery'], resolve) },
+  'webmeter-settlement-analysis': (resolve) => { require(['./WebmeterSettlementAnalysis'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/qianneng/exportConfig.js

@@ -23,7 +23,7 @@ export default{
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_meternumber': '表号', 'ym_data': '数据年月',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '滞纳金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
     'f_actual_arrears': '欠费金额', 'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_newbalance': '账户支出', 'f_newcurbalance': '账户存入',
-    'f_accounts_state': '下账状态', 'f_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
+    'f_accounts_state': '下账状态', 'f_sellinggas_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
     'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_audit_date': '审核日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态', 'f_end_date': '违约金起始时间',
     'f_user_type': '客户类型', 'f_gasproperties': '用气性质',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',