manage-client 3.2.123 → 3.2.124

package/build/dev-server.js

@@ -13,9 +13,9 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://203.57.101.233:9001'
+var bendi = 'http://127.0.0.1:8090'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://192.168.50.4:8400'
+var fuwu = 'http://121.36.106.17:8400'
 // var fuwu = 'http://203.57.101.233:9001'
 var system = 'http://192.168.50.4:8400'
 //192.168.

package/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

package/package.json

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

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

@@ -8,7 +8,7 @@
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
                 <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <label for="startDate" class="font_normal_body">欠费日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
                               v-model="model.startDate"
                               :value.sync="model.startDate"
@@ -18,7 +18,7 @@
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                               v-model="model.endDate"
                               :value.sync="model.endDate"
@@ -165,20 +165,50 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select :value.sync="model.f_meter_classify" multiple
-                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"
-                            condition="f_meter_classify in {}"
-                            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_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 class="col-sm-2 form-group">-->
+                  <!--<label class="font_normal_body">气表类型</label>-->
+                  <!--<v-select :value.sync="model.f_meter_classify" multiple-->
+                            <!--:options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"-->
+                            <!--condition="f_meter_classify in {}"-->
+                            <!--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_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="row">
+                  <div class="col-sm-2 form-group">
+                    <label for="startDate1" class="font_normal_body">收费日期</label>
+                    <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
+                                v-model="model.startDate1"
+                                :value.sync="model.startDate1"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_time_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="endDate1" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                    <datepicker id="endDate1" placeholder="结束日期" style="width:60%"
+                                v-model="model.endDate1"
+                                :value.sync="model.endDate1"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_time_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">是否缴费</label>
+                    <v-select :value.sync="model.f_is_pay" multiple
+                              v-model="model.f_is_pay"
+                              :options="$parent.$parent.ispays" placeholder='请选择'
+                              condition="f_is_pay in {}"
+                              close-on-select></v-select>
+                  </div>
                 </div>
               </div>
             </div>
@@ -212,11 +242,14 @@
                 <th>
                   <nobr>客户电话</nobr>
                 </th>
+                <!--<th>-->
+                  <!--<nobr>气表类型</nobr>-->
+                <!--</th>-->
+                <!--<th>-->
+                  <!--<nobr>气表品牌</nobr>-->
+                <!--</th>-->
                 <th>
-                  <nobr>气表类型</nobr>
-                </th>
-                <th>
-                  <nobr>气表品牌</nobr>
+                  <nobr>是否缴费</nobr>
                 </th>
                 <th>
                   <nobr>卡号</nobr>
@@ -249,10 +282,13 @@
                   <nobr>状态</nobr>
                 </th>
                 <th>
-                  <data-order field="f_operate_date" name="收费日期"
+                  <data-order field="f_operate_date" name="欠费日期"
                               :order.sync="$parent.$parent.$parent.orderFields.f_operate_date">
                   </data-order>
                 </th>
+                <th>
+                  <nobr>收费日期</nobr>
+                </th>
                 <th>
                   <nobr>服务人员</nobr>
                 </th>
@@ -294,11 +330,14 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_phone}}</nobr>
               </td>
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_meter_classify}}</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_meter_brand}}</nobr>
+                <nobr>{{row.f_is_pay}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_card_id}}</nobr>
@@ -333,6 +372,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_time_date}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_service_person}}</nobr>
               </td>
@@ -635,6 +677,10 @@
       metertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
       },
+      ispays() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('是否缴费')]
+      },
+
       payments() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
       }

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

@@ -278,11 +278,10 @@ export default{
   },
 
   otherchargenopayConfig: {
-    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
-    'f_meter_brand': '气表品牌',
+    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话',
     'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
     'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量',
-    'f_money': '收款', 'f_payment': '付款方式', 'f_state': '状态', 'f_operate_date': '收费日期',
+    'f_money': '收款', 'f_payment': '付款方式', 'f_state': '状态', 'f_time_date': '收费日期', 'f_operate_date': '欠费日期', 'f_is_pay': '是否缴费',
     'f_service_person': '服务人员', 'f_comments': '备注',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号'
   },
@@ -680,7 +679,7 @@ export default{
     'f_money_pay': '现金', 'f_bank_pay': '银行转账', 'f_pre_pay': '预付账款抵减', 'f_sum_pay': '收款金额合计',
     'f_balance': '期末余额'
   },
-  gasInspectionConfig: {'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_meternumber': '表号', 'f_user_name': '客户名称',
+  gasInspectionConfig: {'f_userinfo_code': '客户编号','f_user_phone': '客户电话', 'f_olduserinfo_code': '档案编号', 'f_meternumber': '表号', 'f_user_name': '客户名称',
     'f_address': '地址', 'f_metertitles': '表箱号', 'f_user_type': '用户类型', 'f_gasproperties': '用气性质', 'f_table_state': '表具状态',
     'f_meter_brand': '气表品牌', 'f_book_slice_area': '表册片区', 'end_time': '最后抄表日期', 'f_meter_base': '表底数',
     'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'qianfei_month_num': '欠费月数', 'qianfei_num': '欠费条数',

package/src/filiale/meihekou/UserQuery.vue

@@ -144,22 +144,22 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼栋&nbsp;&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_building"
-                           condition="f_building = '{}'" placeholder="楼栋"/>
+                           condition="f_building_num = '{}'" placeholder="楼栋"/>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;单元&nbsp;&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_unit"
-                           condition="f_unit = '{}'" placeholder="单元"/>
+                           condition="f_unit_num = '{}'" placeholder="单元"/>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼层&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_floor"
-                           condition="f_floor = '{}'" placeholder="楼层"/>
+                           condition="f_floor_num = '{}'" placeholder="楼层"/>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;门牌号</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_room"
-                           condition="f_room = '{}'" placeholder="门牌号">
+                           condition="f_room_num = '{}'" placeholder="门牌号">
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">余额区间</label>

package/src/filiale/qianneng/HandplanQuery.vue

@@ -285,6 +285,26 @@
                             condition="f_meter_book_num in {}"></v-select>
                 </div>
 
+                <div class="col-sm-2 form-group">
+                  <label for="f_end_date" class="font_normal_body">违约金起始时间</label>
+                  <datepicker id="f_end_date" placeholder="开始日期" style="width:60%"
+                              v-model="model.endStartDate"
+                              :value.sync="model.endStartDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true"
+                              condition="f_end_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endEndDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="endEndDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endEndDate"
+                              :value.sync="model.endEndDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              condition="f_end_date <= '{}'">
+                  </datepicker>
+                </div>
 
 <!--                <div class="col-sm-2 form-group" >-->
 <!--                  <label for="belongmonth" class="font_normal_body" >所属年月</label>-->
@@ -364,6 +384,9 @@
                 <th>
                   <nobr>滞纳金</nobr>
                 </th>
+                <th>
+                  <nobr>违约金起始时间</nobr>
+                </th>
                 <th>
                   <nobr>用气金额</nobr>
                 </th>
@@ -524,6 +547,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.overdue}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_end_date}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtfee}}</nobr>
               </td>

package/src/filiale/qianneng/exportConfig.js

@@ -24,7 +24,7 @@ export default{
     '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_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_audit_date': '审核日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
+    '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': '扣减气量',
     'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',

package/src/filiale/qingtongxia/MonthGasQuery.vue

@@ -0,0 +1,480 @@
+<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">结束日期</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 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" 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="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="rs/logic/exportfile"
+                                                  sql-name="MonthGasQuery"
+                                                  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"
+                                              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">
+                              <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">客户地址</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" 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_gasproperties" v-model="model.f_gasproperties"
+                                          :options='$parent.$parent.f_gasproperties' placeholder='请选择'
+                                          multiple
+                                          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_state" v-model="model.f_state"
+                                          :options='$parent.$parent.f_state' placeholder='请选择'
+                                          multiple
+                                          :search="false"
+                                          condition="f_state in {} "
+                                          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_meter_style"
+                                          multiple
+                                          :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_style"
+                                          condition="f_meter_style in {}"
+                                          ></v-select>
+                              </div>
+                              <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
+                            </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>{{row.code}}</nobr>
+                          </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.username}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_olduserinfo_code}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.jan}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.feb}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.mar}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.apr}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.may}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.jun}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.jul}}</nobr>
+                            </td>
+                          <td style="text-align: center;">
+                            <nobr>{{row.jug}}</nobr>
+                          </td>
+                          <td style="text-align: center;">
+                            <nobr>{{row.sep}}</nobr>
+                          </td>
+                          <td style="text-align: center;">
+                            <nobr>{{row.oct}}</nobr>
+                          </td>
+                          <td style="text-align: center;">
+                            <nobr>{{row.nov}}</nobr>
+                          </td>
+                          <td style="text-align: center;">
+                            <nobr>{{row.dec}}</nobr>
+                          </td>
+                          <td style="text-align: center;">
+                            <nobr>{{row.sum_oughtamount}}</nobr>
+                          </td>
+                          <td style="text-align: center;">
+                            <nobr>{{row.f_oughtfee}}</nobr>
+                          </td>
+                          <td style="text-align: center;">
+                            <nobr>{{row.avg_oughtamount}}</nobr>
+                          </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.avg_qunianoughtamount}}</nobr>
+                            </td>
+                          <td style="text-align: center;">
+                            <nobr>{{row.f_meter_style}}</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">
+                    1月合计:&emsp;{{sumsmodel.jan}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    2月合计:&emsp;{{sumsmodel.feb}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    3月合计:&emsp;{{sumsmodel.mar}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    4月合计:&emsp;{{sumsmodel.apr}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    5月合计:&emsp;{{sumsmodel.may}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    6月合计:&emsp;{{sumsmodel.jun}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    7月合计:&emsp;{{sumsmodel.jul}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    8月合计:&emsp;{{sumsmodel.jug}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    9月合计:&emsp;{{sumsmodel.sep}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    10月合计:&emsp;{{sumsmodel.oct}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    11月合计:&emsp;{{sumsmodel.nov}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    12月合计:&emsp;{{sumsmodel.dec}}
+                  </td>
+                  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                    累计用气量合计:&emsp;{{sumsmodel.sum_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 { PagedList } from 'vue-client'
+    import defaultPrint from '../../components/sale/config/DefaultPrint'
+    import exportConfig from '../../components/sale/config/exportConfig.js'
+    let readySomething = async function(self) {
+      self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+        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.smallareas=[{label: '全部',value: ''},...await self.$MagGetSaleParam.getsmallarea(self.$login.f.orgid)]
+        self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+    }
+    export default {
+        title: '月用气查询',
+        name: 'MonthGasQuery',
+        data () {
+            return {
+                model: new PagedList('rs/sql/MonthGasQuery', 30, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
+                  jan: 0,
+                  feb: 0,
+                  mar: 0,
+                  apr: 0,
+                  may: 0,
+                  jun: 0,
+                  jul: 0,
+                  jug: 0,
+                  sep: 0,
+                  oct: 0,
+                  nov: 0,
+                  dec: 0,
+                  sum_oughtamount: 0,
+                  f_oughtfee: 0
+                }),
+                initres: {
+                    org:[this.$login.f.orgid],
+                    dep:[],
+                    user:[],
+                },
+              other: [],
+              footer: [],
+              f_gasproperties:[],
+                show:false,
+                rowdata:{},
+                criteriaShow: false,
+                orgCondtionStr: '',
+                modelval: [],
+                printshow: false,
+                all: false,
+                fields: {},
+                thead: '',
+                tfoot: '',
+              defaultfield: [],
+              config: {
+                defaultPrint: ['f_oughtfee', 'avg_oughtamount']
+              },
+              smallareas:[{label: '全部',value: ''}],  //区域
+                //合计数据
+                sumsmodel: {},
+                f_filialeid: this.$login.f.f_orgid,
+                f_orgid: this.$login.f.orgid,
+                f_depid: this.$login.f.depids,
+                f_operatorid: this.$login.f.id
+            }
+        },
+        ready () {
+            readySomething(this)
+        },
+        methods: {
+          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);
+          },
+            userTypeChange () {
+                this.f_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.f_gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+                }
+                else{
+                    this.f_gasproperties =[{label: '全部', value: ''}]
+                }
+            },
+            search(){
+                this.$refs.paged.$refs.cri.search()
+            },
+            cancel() {
+                this.show = false
+            },
+            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
+                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
+            },
+            showmsg(obj){
+              this.rowdata=obj
+              this.show=true
+            },
+            getRes(condition,obj) {
+              this.orgCondtionStr = condition
+              this.orgname = obj.orgnames[0]
+              this.depname = obj.depnames[0]
+            },
+            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,
+                  startDate: this.$refs.paged.$refs.cri.model.startDate,
+                  endDate: this.$refs.paged.$refs.cri.model.endDate
+                }
+            },
+            getfield() {
+                return exportConfig.monthGasConfig
+            },
+            usertypes() {
+                return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('用户类型')]
+            },
+          f_state() {
+                return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('收费状态')]
+            },
+          metertypes() {
+            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
+          }
+        }
+    }
+</script>
+<style>
+    .datapanel {
+        color: #333;
+        background-color: white;
+        padding: 10px 20px;
+        border-radius:15px;
+    }
+</style>

package/src/filiale/qingtongxia/sale.js

@@ -5,6 +5,8 @@ let specialComp = {
   'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
   'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve) },
   'sell-people-query': (resolve) => { require(['./SellPeopleQuery'], resolve) },
+  // 月用气状况
+  'month-gas-query': (resolve) => { require(['./MonthGasQuery'], resolve) },
 }
 exports.specialComp = specialComp
 

package/src/main.js

@@ -43,7 +43,7 @@ all()
 // sale()
 ldap()
 system(false)
-saleManage()
+saleManage('qingtongxia')
 
 webmeterManage()
 ManageHome()

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-