manage-client 3.3.189 → 3.3.191

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "3.3.189",
+    "version": "3.3.191",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/sale/businessquery/CancellationQuery.vue

@@ -293,6 +293,10 @@
         }
         this.footer.push(footerData);
         this.other.push(otherInData);
+        let date = []
+        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+        this.other.push(date)
       },
       search(){
         this.$refs.paged.$refs.cri.search()

package/src/components/sale/businessquery/ChangeMeterQuery.vue

@@ -394,9 +394,6 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               补气金额合计:&emsp;{{sumsmodel.f_remanent_money}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              户数合计:&emsp;{{sumsmodel.hushu}}
-            </td>
           </tr>
         </table>
         <!--<colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
@@ -463,7 +460,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('api/af-revenue/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
+        model: new PagedList('api/af-revenue/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -536,6 +533,10 @@
         }
         this.footer.push(footerData);
         this.other.push(otherInData);
+        let date = []
+        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+        this.other.push(date)
       },
       async initParams() {
     // 初始化气表品牌

package/src/components/sale/businessquery/DisableQuery.vue

@@ -372,6 +372,10 @@
         }
         this.footer.push(footerData);
         this.other.push(otherInData);
+        let date = []
+        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+        this.other.push(date)
       },
       search(){
         this.$refs.paged.$refs.cri.search()

package/src/components/sale/businessquery/EnableQuery.vue

@@ -326,6 +326,10 @@
         }
         this.footer.push(footerData);
         this.other.push(otherInData);
+        let date = []
+        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+        this.other.push(date)
       },
       search() {
         this.$refs.paged.$refs.cri.search()

package/src/components/sale/businessquery/FillCardQuery.vue

@@ -383,6 +383,10 @@
         }
         this.footer.push(footerData);
         this.other.push(otherInData);
+        let date = []
+        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+        this.other.push(date)
       },
       search(){
         this.$refs.paged.$refs.cri.search()

package/src/components/sale/businessquery/FillGasQuery.vue

@@ -396,6 +396,10 @@
         }
         this.footer.push(footerData);
         this.other.push(otherInData);
+        let date = []
+        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+        this.other.push(date)
       },
       sort (field, rule) {
         // 将所有排序方式设为不排序，实现相互排斥

package/src/components/sale/config/exportConfig.js

@@ -1446,6 +1446,28 @@ export default {
     'f_scgas': '实抄气量',
     'f_scfee': '实抄金额'
   },
+  webhandplanMonthConfig: {
+    'f_userinfo_code': '客户编号',
+    'f_user_name': '客户名称',
+    'f_user_phone': '客户电话',
+    'f_user_state': '客户状态',
+    'f_meter_classify': '气表类型',
+    'f_meternumber': '表号',
+    'f_user_type': '客户类型',
+    'f_gasproperties': '用气性质',
+    'f_table_state': '气表状态',
+    'f_hand_date': '所属月份',
+    'f_start_date': '期初上报时间',
+    'f_end_date': '期末上报时间',
+    'f_balance': '期初余额',
+    'f_last_tablebase': '上期底数',
+    'f_tablebase': '本期底数',
+    'f_oughtamount': '用气量',
+    'f_oughtfee': '用气金额',
+    'f_collection': '期间实收金额',
+    'f_curbalance': '期末余额',
+    'f_orgname': '公司'
+  },
   webmetermonthGasConfig: {
     'f_userinfo_code': '用户编号',
     'f_user_name': '用户姓名',

package/src/components/webmeter/WebmeterQuery.vue

@@ -39,6 +39,9 @@
     <tabs header="物联网表结算分析" v-if="newWebHand &&permission('物联网表结算分析')">
       <new-webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></new-webmeter-settlement-analysis>
     </tabs>
+    <tabs header="物联用户月度结算查询" v-if="permission('物联用户月度结算查询')">
+      <webhand-month-gas v-if="show.includes('物联用户月度结算查询')"></webhand-month-gas>
+    </tabs>
   </tab-button>
 
 </template>

package/src/components/webmeter/newwebmeter/WebhandMonthGas.vue

@@ -0,0 +1,816 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search" v-if="!show">
+      <div class="flex">
+
+        <criteria-paged :model="model" @sort="sort" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2">
+                  <label class="font_normal_body">组织机构</label>
+                  <res-select :initresid="$parent.$parent.org"
+                              style="width:60%"
+                              @res-select="$parent.$parent.getorg"
+                              :is-mul=false
+                              restype='organization'>
+                  </res-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name = '{}'" placeholder="客户名称">
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="rs/easyExcel/exportExcel" sql-name="GetWebhandMonthGas" template-name='物联用户月度结算查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="物联用户月度结算查询打印"
+                              titletable="物联用户月度结算查询"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+
+                  <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">
+<!--                <res-select-group :initres="$parent.$parent.initres"  :show-component="$parent.$parent.showComponent" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
+
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">抄表日期</label>
+                  <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.handStartDate"
+                              :value.sync="model.handStartDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true"
+                            >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.handEndDate"
+                              :value.sync="model.handEndDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                            >
+                  </datepicker>
+                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">抄表状态</label>-->
+<!--                  <v-select :value.sync="model.f_meter_state"-->
+<!--                            v-model="model.f_meter_state"-->
+<!--                            :options='$parent.$parent.meterstate' placeholder='请选择'-->
+<!--                            condition="f_meter_state = '{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">表单状态</label>-->
+<!--                  <v-select :value.sync="model.f_hand_state"-->
+<!--                            v-model="model.f_hand_state"-->
+<!--                            :options='$parent.$parent.handstate' placeholder='请选择'-->
+<!--                            condition="f_hand_state = '{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label for="startDate" class="font_normal_body">录入日期</label>-->
+<!--                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"-->
+<!--                              v-model="model.startDate"-->
+<!--                              :value.sync="model.startDate"-->
+<!--                              :format="'yyyy-MM-dd HH:mm:ss'"-->
+<!--                              :show-reset-button="true"-->
+<!--                              condition="f_input_date >= '{}'">-->
+<!--                  </datepicker>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&ensp;</label>-->
+<!--                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"-->
+<!--                              v-model="model.endDate"-->
+<!--                              :value.sync="model.endDate"-->
+<!--                              :format="'yyyy-MM-dd HH:mm:ss'"-->
+<!--                              :show-reset-button="true"-->
+<!--                              condition="f_input_date <= '{}'">-->
+<!--                  </datepicker>-->
+<!--                </div>-->
+
+
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">小区名称</label>-->
+<!--                  <v-select :value.sync="model.f_residential_area"-->
+<!--                            class="select_list select"-->
+<!--                            enter-push-->
+<!--                            multiple = "true"-->
+<!--                            v-model="model.f_residential_area"-->
+<!--                            style="width: 60%"-->
+<!--                            :options='$parent.$parent.residentialArea' placeholder='选择小区'-->
+<!--                            close-on-select>-->
+
+<!--                  </v-select>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">客户地址</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"-->
+<!--                         condition="f_address like '%{}%'" placeholder='客户地址'>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">录入人员</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_input_person"-->
+<!--                         condition="f_input_person like '%{}%'" placeholder='录入人员'>-->
+<!--                </div>-->
+
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            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 :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties' placeholder='请选择'
+                            condition="f_gasproperties = '{}'"
+                            close-on-select></v-select>
+                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">气价类型</label>-->
+<!--                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"-->
+<!--                            placeholder='气价类型' :options="$parent.$parent.pricetypes"-->
+<!--                            close-on-select v-ref:type>-->
+<!--                  </v-select>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">气价名称</label>-->
+<!--                  <v-select :value.sync="model.f_price_name"-->
+<!--                            v-model="model.f_price_name"-->
+<!--                            :options="$parent.$parent.getPricenames"-->
+<!--                            condition="f_price_name = '{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用&ensp;气&ensp;量</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于"
+                         v-model="model.f_oughtamount_big" condition="f_oughtamount >= {}" placeholder='大于等于'>
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_oughtamount_small" condition="f_oughtamount <= {}" placeholder='小于等于'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&ensp;表&ensp;号&ensp;&ensp;</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}' " placeholder="表号">
+                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">气表品牌</label>-->
+<!--                  <v-select :value.sync="model.f_meter_brand" multiple-->
+<!--                            v-model="model.f_meter_brand"-->
+<!--                            :options='$parent.$parent.meterbrands' placeholder='请选择'-->
+<!--                            condition="f_meter_brand in {}"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
+
+
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid :classname="$parent.classname">
+            <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>
+                <th><nobr>期末余额</nobr></th>
+                <th><nobr>公司</nobr></th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>
+                  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr>
+              </td>
+              <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_classify}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_table_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_hand_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_start_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_end_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_balance}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_last_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_oughtamount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_oughtfee}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_collection}}</nobr>
+              </td>
+              <td>
+                <nobr>{{row.f_curbalance}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+
+        <table class="table-hover">
+          <tr style="position: relative;margin-top: -16px;" 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.f_oughtamount}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              气费合计:&emsp;{{sumsmodel.f_oughtfee}}
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="flex" v-if="show">
+      <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+    </div>
+
+    <work-busy :is-busy="iswork" v-show="iswork"></work-busy>
+  </div>
+</template>
+
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import defaultPrint from '../../sale/config/DefaultPrint'
+import exportConfig from '../../sale/config/exportConfig'
+import axios from 'axios'
+import plugins from '../../../plugins/GetLoginInfoService'
+
+let readySomething = async function (self) {
+  //加载抄表册
+  // self.$MagGetSaleParam.initinputtor();
+  // self.getinputtores();
+  // self.initmeterbook();
+  self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
+  self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
+
+  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+  await self.$MagLoadParams.loadParam()
+  await self.initParams()
+  await self.$getConfig(self, 'WebHandplanMonthQuery')
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  props:['data'],
+  title: '物联用户月度结算查询',
+  data() {
+    return {
+      iswork:false,
+      other:[],
+      footer:[],
+      data: {},
+      orderitem:'f_userinfo_code desc',
+      model: new PagedList('api/af-revenue/sql/GetWebhandMonthGas', 20, {
+        startDate: 'this.model.handStartDate',
+        endDate: 'this.model.handEndDate',
+        orderitem:  'f_userinfo_code desc'
+      }, {
+        f_oughtamount: 0,
+        f_oughtfee: 0
+      }),
+      org:[this.$login.f.orgid],
+      orgcondition: ' and f_orgid = ' + this.$login.f.orgid,
+      // initres: {
+      //   org:[this.$login.f.orgid],
+      //   dep:[],
+      //   user:[]
+      // },
+      orderFields: {
+        f_input_date: 'no'
+      },
+      show:false,
+      showComponent: ['company'],
+      rowdata:{},
+      criteriaShow: false,
+      residentialArea: [],
+      modelval: [],
+      gasproperties:[],
+      inputtouPerson: [],
+      meterbrands: [],
+      printshow: false,
+      f_filialeid: this.$login.f.f_orgid,
+      all: false,
+      fields: {},
+      thead: '',
+      tfoot: '',
+      selected:{},
+
+      // 下拉框
+
+      //合计数据
+      sumsmodel: {},
+      defaultfield: [],
+      config: {
+        defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_meternumber', 'f_hand_date', 'f_oughtamount', 'f_oughtfee']
+      },
+      prices: [],
+      bgl:[{label: '全部', value: ''},{label: '有', value: '1'},{label: '无', value: '0'}],
+      meterbooks:[{label: '全部',value: ''}],  //抄表册
+      tempfalg :false,
+      lastorgstr:'',
+      allorgid:[],
+      inputtores:[{label: '全部',value: ''}],  //抄表员
+      //表册片区
+      bookSlice:[{label: '全部',value: ''}],
+      imgfilename:'',
+      percent:0,
+      uuida:'',
+      timer:'',
+    }
+  },
+  ready() {
+    // this.$refs.paged.$refs.cri.model.f_meter_state=['已抄表']
+    // this.getaddress()
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    sort (field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
+        } else {
+          this.orderFields[key] = 'no'
+        }
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderitem}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+      this.search()
+    },
+    getorg(obj) {
+      if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
+        this.orgcondition = " and f_orgid  in " + plugins.convertToIn(obj)
+      }else{
+        this.orgcondition = " and f_orgid  = " + this.$login.f.orgid
+      }
+    },
+    // //初始化片区
+    // async initSlice (val) {
+    //   if (val) {
+    //     let getAllArea = await this.$resetpost('/rs/search', {
+    //       source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+    //       userid: this.$login.f.id
+    //     }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+    //     let arr = getAllArea.data.filter((res) => {
+    //       return res.parentid == val
+    //     })
+    //     this.bookSlice = []
+    //     arr.forEach((res) => {
+    //       this.bookSlice.push({label: res.name, value: res.name})
+    //     })
+    //   }
+    // },
+    //表册片区和抄表册关联
+    // async inputtorchange(){
+    //   this.$set('$refs.paged.$refs.cri.model.f_meter_book',[]);
+    //   /*let val1=this.$refs.paged.$refs.cri.model.f_meter_book*/
+    //   let val2=this.$refs.paged.$refs.cri.model.f_book_slice_area
+    //   if((val2.length>0)){
+    //     let condition = ` 1=1 and f_orgid ='${this.f_filialeid}' and f_book_state='有效' `
+    //     let aaa = '('
+    //     val2.forEach((item) => {
+    //       aaa = aaa + `'${item}',`
+    //     })
+    //     aaa = aaa + `'')`
+    //     condition = condition + ` and f_book_slice_area in ${aaa} `
+    //     let param={
+    //       items:'*',
+    //       tablename:'t_meter_book',
+    //       condition:condition,
+    //       orderitem:'id'
+    //     }
+    //     let getMeterBooks = await this.$resetpost('rs/sql/singleTable_OrderBy', {data: param}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
+    //     if (getMeterBooks.data) {
+    //       if(getMeterBooks.data.length >0){
+    //         let rs = [];
+    //         getMeterBooks.data.forEach((item)=>{
+    //           let temp = {
+    //             label:item.f_book_name,
+    //             value:item.id
+    //           };
+    //           rs.push(temp);
+    //
+    //         })
+    //         this.meterbooks = [{label: '全部',value: ''}, ...rs];
+    //       }else{
+    //         this.meterbooks = [{label: '全部',value: ''}];
+    //       }
+    //     }
+    //   }else{
+    //     this.meterbooks = [{label: '全部',value: ''}];
+    //     this.initmeterbook();
+    //   }
+    // },
+    // async initmeterbook(orgstr){
+    //   if(orgstr == null ){
+    //     orgstr = this.f_filialeid;
+    //   }
+    //   //获取新的抄表册,先去清理所有的抄表册
+    //   this.$GetSaleParam.meterbooks = [];
+    //   //开始加载新的抄表册
+    //   await this.$LoadParams.loadMeterBook(orgstr)
+    //   this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+    // },
+
+    // async getinputtores () {
+    //   // 获取抄表员
+    //   let rs = []
+    //   if (this.$login.f.f_gasman.length > 0) {
+    //     for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+    //       let temp = {
+    //         label: this.$login.f.f_gasman[i].name,
+    //         value: this.$login.f.f_gasman[i].name
+    //       }
+    //       rs.push(temp)
+    //     }
+    //   }
+    //   this.inputtores = [{label: '全部', value: ''}, ...rs]
+    //   this.inputtores.push({label: "微信公众号", value: "微信公众号"})
+    // },
+    async updateParams() {
+      await this.$MagLoadParams.loadParam(this.f_filialeid)
+      this.inputtores = [];
+      this.inputtores.push({label: "全部", value: ""})
+      this.initSlice(this.f_filialeid)
+      if(this.allorgid!=null){
+        this.allorgid.forEach((res)=>{
+          this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
+        })
+      }
+      this.initParams()
+    },
+
+    async initParams() {
+      // 初始化气表品牌
+      let brandArr = []
+      await 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)
+        }
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      //初始化气价
+      let result = []
+      await this.$MagGetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' && this.$login.f.orgid == item.f_filialeid) {
+          let value = {
+            label: item.f_price_name,
+            value: item.f_price_name
+          }
+          result.push(value)
+        }
+      })
+      let hash = {}
+      result = result.reduce((item, next) => {
+        hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+        return item
+      }, [])
+      this.prices = Array.from(new Set(result))
+    },
+    getotherfooter(){
+      // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+      // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+      this.other=[];
+      this.footer=[];
+      let exportdata = this.getCondition;
+      let otherInData=[];
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+      let footerData=[],exportfield=this.getfield;
+      footerData.push("合计");
+      let self = this;
+      for(var field in self.sumsmodel){
+        footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+      }
+      this.footer.push(footerData);
+      this.other.push(otherInData);
+    },
+    // async  getaddress(){
+    //   let HttpReset = new HttpResetClass()
+    //   var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {
+    //     data: {
+    //       condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+    //     }
+    //   }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+    //   console.log('小区',data)
+    //   let house = [{label: '全部', value: ''}]
+    //   for (let row of data.data){
+    //     house.push({label: row.f_residential_area, value: row.f_residential_area})
+    //   }
+    //   this.residentialArea = house
+    // },
+    search(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    cancel() {
+      this.show = false
+    },
+    selfSearch(args) {
+
+      if (this.$refs.paged.$refs.cri.model.handStartDate == '' || this.$refs.paged.$refs.cri.model.handEndDate == '') {
+        this.$showMessage('请选择【抄表时间】!')
+        return
+      }
+      // this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
+      // if(this.area.length !== 0){
+      //   let str = JSON.stringify(this.area)
+      //   str = str.replace(/"/g,`'`)
+      //   str = str.replace(/\[/g,``)
+      //   str = str.replace(/\]/g,``)
+      //   //查询多个小区时条件
+      //   args.condition += ` and f_residential_area in  ( ${str} )`
+      // }
+      //抄表员查询条件
+      // this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
+      // if(this.inputtouPerson.length !== 0){
+      //   let str = JSON.stringify(this.inputtouPerson)
+      //   str = str.replace(/"/g,`'`)
+      //   str = str.replace(/\[/g,``)
+      //   str = str.replace(/\]/g,``)
+      //   //查询多个抄表员时条件
+      //   args.condition += ` and f_inputtor in  ( ${str} )`
+      // }
+
+      args.condition = `${args.condition} ` + this.orgcondition
+      this.model.search(args.condition, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+    },
+    clear() {
+      //清空部门和人员
+      this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+      //部门和人员变为全选
+      this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+      this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = []
+      })
+    },
+    show() {
+      this.criteriaShow = true
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    async getRes(condition,obj) {
+      this.orgCondtionStr = condition
+
+    },
+    stamp() {
+      this.all = false
+      //默认选择要打印的列
+      this.modelval = defaultPrint.config
+      this.fields = this.getfield
+      this.printshow = true
+      this.put()
+    },
+    put() {
+      // 对Modelval进行排序
+      this.sortModelval()
+      this.thead = `<tr><th colspan=${this.modelval.length}>抄表查询统计报表</th></tr><tr>`
+      for (let key of this.modelval) {
+        this.thead += '<th>' + this.fields[key] + '</th>'
+      }
+      this.thead += '</tr>'
+    },
+    print() {
+      this.$refs.print.PrintAsFile()
+      this.printshow = false
+    },
+    dealmsg(val) {
+      this.rowdata=val
+      this.show=true
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    close() {
+      this.printshow = false
+      this.all = false
+    },
+
+    userTypeChange () {
+      this.gasproperties=[]
+      if(this.$refs.paged.$refs.cri.model !==null) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties=''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+      }
+      else{
+        this.gasproperties =[{label: '全部', value: ''}]
+      }
+    },
+    // 对选择的列进行排序
+    sortModelval() {
+      let sortModel = []
+      Object.keys(this.fields).forEach((key) => {
+        if (this.modelval.includes(key)) {
+          sortModel.push(key)
+        }
+      })
+      this.modelval = sortModel
+    }
+  },
+  watch: {
+    'model.rows'(val) {
+      if(val.length === 0){
+        this.sumsmodel = {}
+      }
+    },
+    // async 'orgCondtionStr'(val) {
+    //   this.$refs.paged.$refs.cri.model.f_inputtor=[]
+    //   this.$refs.paged.$refs.cri.model.f_book_slice_area=[]
+    //   this.$refs.paged.$refs.cri.model.f_meter_book = []
+    //   this.meterbooks = [{label: '全部',value: ''}];
+    //   if(this.lastorgstr != val){
+    //     this.tempfalg = true;
+    //     this.lastorgstr = val;
+    //   }
+    //   if(this.tempfalg && val != null && val!=''  && val.indexOf("(")>-1){
+    //     this.tempfalg = false;
+    //     let a = val.substring(val.indexOf("(")+2)
+    //     await this.initmeterbook(a.substring(0,a.indexOf(")")-1));
+    //   }
+    //   let res = val.match(/'(.*?)'/)
+    //   console.log('正则提取:',res && res[1])
+    //   if (res) {
+    //     this.f_filialeid = res[1]
+    //     if(res.input !=null){
+    //       let resorgid = res.input.substring(res.input.indexOf("'"));
+    //       if(resorgid!= null && resorgid!=''){
+    //         resorgid = resorgid.substring(0,resorgid.lastIndexOf("'")+1);
+    //         // resorgid = resorgid.replaceAll("'","");
+    //         resorgid = resorgid.replace(/'/g,"");
+    //         this.allorgid = resorgid.split(",")
+    //       }
+    //     }
+    //     this.updateParams()
+    //   }
+    // },
+    'all'(val) {
+      if (val) {
+        this.modelval = this.bodyData
+      } else {
+        this.modelval = defaultPrint.config
+        this.put()
+      }
+    },
+    'modelval.length'() {
+      this.put()
+    },
+    sumsmodel:{
+      handler: function(val) {
+        this.getotherfooter();
+      },
+      deep: true
+    }
+  },
+  computed: {
+
+    getCondition() {
+      return {
+        startDate: this.$refs.paged.$refs.cri.model.startDate,
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgcondition,
+        orderitem: this.orderitem ? `${this.orderitem}` : " f_userinfo_code desc"
+      }
+    },
+    getfield() {
+      return exportConfig.webhandplanMonthConfig
+    },
+    // getBankfield(){
+    //   return exportConfig.batchBankConfig2
+    // },
+    usertypes() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    // meterstate() {
+    //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')]
+    // },
+    // handstate() {
+    //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('表单状态')]
+    // },
+    // pricetypes() {
+    //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+    // },
+    getPricenames() {
+      let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
+      let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
+      let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
+      console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
+      if(this.$refs.paged.$refs.cri.model !==null) {
+        let rs = []
+        let priceArr = []
+        if ( pricetype.length >0) {
+          let params = {
+            f_price_type: pricetype[0],
+            filter: this.f_filialeid,
+            prices: this.prices
+          }
+          this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+            let temp = {}
+            temp.label = item.label
+            temp.value = item.value.f_price_name
+            priceArr.push(temp)
+          })
+          rs = [{label: '全部', value: ''}, ...priceArr]
+        }
+        if (rs.length === 0) {
+          console.log('rs读出来是空')
+          this.$refs.paged.$refs.cri.model.f_price_name = ''
+        }
+        return rs
+      }
+    },
+    // inputtor () {
+    //   // 获取抄表员
+    //   console.log('获取抄表员', this.$login.f)
+    //   let rs = []
+    //   if (this.$login.f.f_gasman.length > 0) {
+    //     for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+    //       let temp = {
+    //         label: this.$login.f.f_gasman[i].name,
+    //         value: this.$login.f.f_gasman[i].name
+    //       }
+    //       rs.push(temp)
+    //     }
+    //   }
+    //
+    //   return [{label: '全部', value: ''}, ...rs]
+    // },
+
+  },
+  events:{
+  }
+}
+</script>

package/src/filiale/qianneng/WebmeterQuery.vue

@@ -33,6 +33,9 @@
     <tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">
       <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
     </tabs>
+    <tabs header="物联用户月度结算查询" v-if="permission('物联用户月度结算查询')">
+      <webhand-month-gas v-if="show.includes('物联用户月度结算查询')"></webhand-month-gas>
+    </tabs>
   </tab-button>
 
 </template>

package/src/webmeterManage.js

@@ -123,5 +123,8 @@ export default function () {
 
   // 石泉异常分析单页面
   Vue.component('total-exception-by-meter-sq', (resolve) => { require(['./components/webmeter/newwebmeter/NewException/TotalExceptionByMeterShiQuan'], resolve) })
+
+  // 物联用户月度结算查询
+  Vue.component('webhand-month-gas', (resolve) => { require(['./components/webmeter/newwebmeter/WebhandMonthGas.vue'], resolve) })
 }