manage-client 3.3.156 → 3.3.158

package/package.json

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

package/src/filiale/WEINAN/CancellationQuery.vue

@@ -152,6 +152,17 @@
                             close-on-select>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_cancellation_type" class="font_normal_body ">销户类型</label>
+                  <v-select :value.sync="model.f_cancellation_type" :search="false"
+                            v-model="model.f_cancellation_type"
+                            :options='$parent.$parent.cancellationTypes'
+                            condition="f_cancellation_type = '{}'"
+                            placeholder='销户类型'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -181,6 +192,9 @@
                 <th>
                   <nobr>表号</nobr>
                 </th>
+                <th>
+                  <nobr>销户类型</nobr>
+                </th>
                 <th>
                   <nobr>销户原因</nobr>
                 </th>
@@ -243,6 +257,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_cancellation_type}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
               </td>
@@ -285,15 +302,15 @@
             <template partial='foot'></template>
           </data-grid>
         </criteria-paged>
-<!--        <table class="table-hover">-->
-<!--          <tr style="position: relative" 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_pregas}}</td>-->
-<!--          </tr>-->
-<!--        </table>-->
+        <table class="table-hover">
+          <tr style="position: relative" 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;{{$refs.paged.$refs.grid.model.count}}</td>
+          </tr>
+        </table>
       </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>
@@ -679,6 +696,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
       userusetypes () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
       },
+      cancellationTypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('销户类型')]
+      },
       userTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

package/src/filiale/WEINAN/ManageCompanyGasSummary.vue

@@ -93,7 +93,6 @@
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type"
                             :options='$parent.$parent.usertypes'
-                            @change="$parent.$parent.userTypeChange()"
                             :value-single="true"
                             placeholder='请选择' v-model="model.f_user_type"
                             ></v-select>
@@ -292,7 +291,6 @@ export default {
         slice_area: [],
       },
       criteriaShow: true,
-      userusetypes: [],
       useinstitutions: [],
       userusenatures: [],
       corporatename: []
@@ -542,6 +540,9 @@ export default {
     getfield () {
       return exportConfig.manageCompanyGasSummary
     },
+    userusetypes() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+    },
     useTypes () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
     },

package/src/filiale/WEINAN/UserQuery.vue

@@ -313,6 +313,17 @@
                               close-on-select>
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="f_user_usenature" class="font_normal_body ">表前阀状态</label>
+                    <v-select :value.sync="model.f_bqf_state" :search="false"
+                              v-model="model.f_bqf_state"
+                              :options='$parent.$parent.bqfState'
+                              condition="f_bqf_state = '{}'"
+                              placeholder='表前阀状态'
+                              value-single="true"
+                              close-on-select>
+                    </v-select>
+                  </div>
 
                 </div>
               </div>
@@ -993,6 +1004,9 @@
       userstates() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
       },
+      bqfState () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('表前阀状态')]
+      },
       userLevels () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
       },

package/src/filiale/lixianV3/FMYGasQuery.vue

@@ -0,0 +1,841 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-inline auto" partial>
+              <div class="row">
+                <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"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&emsp;&emsp;&emsp;至</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"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startHandDate" class="font_normal_body">下发日期</label>
+                  <datepicker id="startHandDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startHandDate"
+                              :value.sync="model.startHandDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endHandDate" class="font_normal_body">&emsp;&emsp;&emsp;至</label>
+                  <datepicker id="endHandDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endHandDate"
+                              :value.sync="model.endHandDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </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"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="api/af-revenue/logic/openapi/exportfile"
+                                sql-name="FMYgasQuery"
+                                template-name='用气查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="用气查询打印"
+                  ></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" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
+                <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 like '%{}%'" placeholder="客户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                  <v-select :value.sync="model.f_residential_area"
+                            class="select_list select"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            multiple
+                            condition="f_residential_area in {}"
+                            :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_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='客户表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="参数名称:气表类型">气表类型</label>
+                  <v-select :value.sync="model.f_meter_classify"
+                            v-model="model.f_meter_classify"
+                            :options='$parent.$parent.metertype' placeholder='请选择'
+                            condition="f_meter_classify like '%{}%'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="参数名称:用户类型">客户类型</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_user_state"
+                            v-model="model.f_user_state"
+                            :options='$parent.$parent.userstates' placeholder='请选择'
+                            condition="f_user_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_gasproperties"
+                            v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties' placeholder='请选择'
+                            :multiple="true"
+                            condition="f_gasproperties in {}">
+                  </v-select>
+                </div>
+                <!--表册片区-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表册片区</label>
+                  <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"
+                            @change="$parent.$parent.inputtorchange"
+                            :options='$parent.$parent.bookSlice' placeholder='片区/表册'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_book_slice_area = '{}'"></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
+                            :options='$parent.$parent.meterbooks' placeholder='抄表册'
+                            style="width:60%" :multiple="true"
+                            condition="f_meter_book_num in {}"></v-select>
+                </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 class="col-sm-2 form-group">
+                  <label class="font_normal_body">用&nbsp;气&nbsp;量&nbsp;</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_oughtamount_small"
+                         condition="f_oughtamount >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_oughtamount_big"
+                         condition="f_oughtamount <= '{}' " placeholder="小于等于">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startHandDate" class="font_normal_body">通气时间</label>
+                  <datepicker id="startHandDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startGasDate"
+                              :value.sync="model.startGasDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              condition="f_gas_date >= '{}'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endHandDate" class="font_normal_body">&emsp;&emsp;&emsp;至</label>
+                  <datepicker id="endHandDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endGasDate"
+                              :value.sync="model.endGasDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              condition="f_gas_date <= '{}'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;抄&nbsp;表&nbsp;员</label>
+                  <v-select :value.sync="model.f_inputtor"
+                            v-model="model.f_inputtor"
+                            :multiple="true"
+                            :options='$parent.$parent.inputtores' placeholder='请选择'
+                            condition="f_inputtor in {}"
+                            :search="false">
+                  </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 title="抄表区间间隔天数">
+                  <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>{{row.f_userinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_credentials}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_idnumber}}</nobr>
+              </td>
+              <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_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </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_classify}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_inputtor}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_book_slice_area}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_hand_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_date}}</nobr>
+              </td>
+              <td style="text-align: center;" title="抄表区间间隔天数">
+                <nobr>{{row.f_input_day}}</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_last_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_stairamount1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_stair1fee}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_stairamount2}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_stair2fee}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_stairamount3}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_stair3fee}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_value}}</nobr>
+              </td>
+              <!--<td style="text-align: center;">-->
+              <!--<nobr>{{row.f_meter_base}}</nobr>-->
+              <!--</td>-->
+              <!--<td style="text-align: center;">-->
+              <!--<nobr>{{row.f_balance_amount}}</nobr>-->
+              <!--</td>-->
+              <!--<td style="text-align: center;">-->
+              <!--<nobr>{{row.f_balance}}</nobr>-->
+              <!--</td>-->
+              <td style="text-align: center;">
+                <nobr>{{row.f_pregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_preamount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_collection}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" 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_pregas}}
+            </td>
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              预购金额合计:&emsp;{{sumsmodel.f_preamount}}
+            </td>
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              实交金额合计:&emsp;{{sumsmodel.f_collection}}
+            </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 v-if="show">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import defaultPrint from './config/DefaultPrint'
+import exportConfig from './config/exportConfig'
+
+
+  let readySomething = async function (self) {
+    //加载抄表册
+    self.initmeterbook();
+    self.initSlice(self.$login.f.orgid)
+
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    self.getaddress()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '用气查询',
+    name: 'AddMaterial',
+    data () {
+      return {
+        other: [],
+        footer: [],
+        model: new PagedList('api/af-revenue/sql/FMYgasQuery', 30, {
+          startDate: 'this.model.startDate != null && this.model.startDate != "" ? this.model.startDate : this.model.startHandDate',
+          endDate: 'this.model.endDate != null && this.model.endDate != "" ? this.model.endDate : this.model.endHandDate',
+          f_queryweb: 'this.model.f_queryweb'
+        }, {
+          f_pregas: 0,
+          f_preamount: 0,
+          f_collection: 0,
+          f_oughtamount: 0,
+          f_oughtfee: 0
+        }),
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: [],
+        },
+        gasproperties: [],
+        residentialArea: [],
+        f_filialeid: this.$login.f.orgid,
+        show: false,
+        rowdata: {},
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        meterbrands: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        inputtores:[{label: '全部',value: ''}],
+        thead: '',
+        tfoot: '',
+        //表册片区
+        bookSlice:[{label: '全部',value: ''}],
+        // 下拉框
+
+        //合计数据
+        sumsmodel: {},
+        defaultfield: [],
+        // 使用类型,壁挂炉
+        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}],
+        userstates: this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
+        meterbooks: [{label: '全部',value: ''}],  //抄表册
+        tempfalg :false,
+        lastorgstr:'',
+        isQueryWeb: this.$appdata.getSingleValue('用气查询是否查物联网表') ? this.$appdata.getSingleValue('用气查询是否查物联网表') : '否' ,
+        allorgid:[],
+      }
+    },
+    ready () {
+      readySomething(this)
+      this.getinputtores()
+    },
+    methods: {
+      initParams(){
+        //初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      },
+      //初始化片区
+      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 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]
+      },
+      //表册片区和抄表册关联
+      async inputtorchange(){
+        /*let val1=this.$refs.paged.$refs.cri.model.f_meter_book*/
+        this.$set('$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='有效' `
+          if(val2[0]) {
+            condition = condition + ` and f_book_slice_area = '${val2}' `
+          }
+          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  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
+      },
+      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()]
+      },
+      getotherfooter () {
+        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);
+      },
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          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])
+          // this.gasproperties.push({label: '全部', value: ''})
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel () {
+        this.show = false
+      },
+      selfSearch (args) {
+        args.condition = `${args.condition} ` + this.orgCondtionStr
+        let con = '1=1'
+        let mod =this.$refs.paged.$refs.cri.model
+        if(mod.startDate != null && mod.startDate != '') {
+          con +=   ` and f_input_date >= '${mod.startDate}'`
+        }
+        if(mod.endDate != null && mod.endDate != '') {
+          con +=   ` and f_input_date <= '${mod.endDate}'`
+        }
+        if(mod.startHandDate != null && mod.startHandDate != '') {
+          con +=   ` and f_hand_date >= '${mod.startHandDate}'`
+        }
+        if(mod.endHandDate != null && mod.endHandDate != '') {
+          con +=   ` and f_hand_date <= '${mod.endHandDate}'`
+        }
+        this.$refs.paged.$refs.cri.model.f_queryweb = this.isQueryWeb
+        this.model.search(args.condition, args.model,con)
+        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
+      },
+      showmsg (obj) {
+        this.rowdata = obj
+        this.show = true
+      },
+      async getRes(condition,obj) {
+        this.orgCondtionStr = condition
+
+      },
+      stamp () {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        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
+      },
+      // 对选择的列进行排序
+      sortModelval () {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      }
+
+    },
+    computed: {
+      getCondition () {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          condValue: this.$refs.paged.model.condValue,
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          f_queryweb: this.$refs.paged.$refs.cri.model.f_queryweb
+        }
+      },
+      getfield () {
+        return exportConfig.fmygasConfig
+      },
+      usertypes () {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      credentials () {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('证件类型')]
+      },
+      metertype () {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      }
+    },
+    events: {},
+    watch: {
+      '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
+      },
+      async 'orgCondtionStr'(val) {
+        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));
+        }
+        this.updateParams()
+      },
+    }
+  }
+</script>
+<style>
+  .datapanel {
+    color: #333;
+    background-color: white;
+    padding: 10px 20px;
+    border-radius: 15px;
+  }
+</style>

package/src/filiale/lixianV3/config/exportConfig.js

@@ -1021,31 +1021,40 @@ export default {
     'f_version': '版本号', 'f_state': '状态', 'detailvalue': '气价信息'
   },
   fmygasConfig: {
-    'f_userinfo_code': '客户编号',
-    'f_user_name': '客户名称',
-    'f_olduserinfo_code': '档案编号',
-    'f_user_phone': '客户电话',
-    'f_credentials': '证件类型',
-    'f_idnumber': '证件号码',
-    'f_residential_area': '小区',
-    'f_address': '客户地址',
-    'f_user_type': '客户类型',
-    'f_gasproperties': '用气性质',
-    'f_meternumber': '表号',
-    'f_meter_brand': '气表品牌',
-    'f_meter_classify': '气表类型',
-    'f_price_value': '气价详情',
-    'f_balance': '账户余额',
-    'f_pregas': '预购气量',
-    'f_preamount': '预购金额',
-    'f_collection': '实交金额',
-    'f_inputtor': '抄表员',
-    'f_book_slice_area': '表册片区',
-    'f_hand_number': '抄表次数',
-    'f_date': '抄表区间',
-    'f_input_day': '天数',
-    'f_oughtamount': '用气量',
-    'f_oughtfee': '用气金额'
+    "f_userinfo_code": "客户编号",
+    "f_user_name": "客户名称",
+    "f_olduserinfo_code": "档案编号",
+    "f_user_phone": "客户电话",
+    "f_credentials": "证件类型",
+    "f_idnumber": "证件号码",
+    "f_residential_area": "小区",
+    "f_address": "客户地址",
+    "f_user_type": "客户类型",
+    "f_gasproperties": "用气性质",
+    "f_meternumber": "表号",
+    "f_meter_brand": "气表品牌",
+    "f_meter_classify": "气表类型",
+    "f_inputtor": "抄表员",
+    "f_book_slice_area": "表册片区",
+    "f_hand_number": "抄表次数",
+    "f_date": "抄表区间",
+    "f_input_day": "天数",
+    "f_oughtamount": "用气量",
+    "f_oughtfee": "用气金额",
+    "f_last_tablebase": "期初底数",
+    "f_tablebase": "期末底数",
+    "f_stairamount1": "一阶气量",
+    "f_stair1fee": "一阶气费",
+    "f_stairamount2": "二阶气量",
+    "f_stair2fee": "二阶气费",
+    "f_stairamount3": "三阶气量",
+    "f_stair3fee": "三阶气费",
+    "f_createfile_date": "建档日期",
+    "f_price_value": "气价详情",
+    "f_balance": "账户余额",
+    "f_pregas": "预购气量",
+    "f_preamount": "预购金额",
+    "f_collection": "实交金额"
   },
   notgasConfig: {
     'f_userinfo_code': '客户编号',

package/src/filiale/lixianV3/sale.js

@@ -12,6 +12,8 @@ export default function () {
   Vue.component('change-meter-query', (resolve) => {
     require(['./ChangeMeterQuery'], resolve)
   })
+  // 用气查询
+  Vue.component('fmygas-query', (resolve) => { require(['./FMYGasQuery'], resolve) })
   // 用气分析
   Vue.component('gas-analysis-query', (resolve) => { require(['./GasAnalysisQuery'], resolve) })
   // 用户缴费抄表查询