manage-client 4.1.77 → 4.1.78

package/package.json

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

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

@@ -1941,7 +1941,7 @@ export default {
   },
   GasStatistics: {
     'f_userinfo_code': '客户编号',
-    'f_user_name': '客户名称',
+    'f_user_name': '客户姓名',
     'f_residential_area': '小区',
     'f_address': '地址',
     'f_user_phone': '电话',
@@ -1952,33 +1952,15 @@ export default {
     'f_meter_classify': '表具类型',
     'f_meter_title': '表描述',
     'f_price_name': '气价名称',
-    'f_detailprice': '气价详情',
     'f_gasproperties': '用气性质',
-    'f_last_gas': '期初余量',
-    'f_last_balance': '期初余额',
+    'f_balance': '期初余额',
     'f_last_tablebase': '起方',
-    'f_last_shengyu_gas': '起方（液晶）',
     'f_tablebase': '止方',
-    'f_shengyu_gas': '止方（液晶）',
-    'f_shengyu_gas_gongshi': '止方（液晶）【公式】',
-    'f_actualtablebase': '期间用气量',
-    'f_real_fee': '期间用气金额',
-    'f_pregas': '期间充值气量',
-    'f_during_price': '期间充值单价',
-    'f_collection': '期间充值金额',
-    'f_bq_f_pregas': '期间补气量',
+    'f_oughtamount': '期间用气量',
+    'f_oughtfee': '期间用气金额',
+    'f_collection': '期末充值金额',
     'f_bq_preamount': '期间补气金额',
-    'f_remain_gas': '期末余量',
-    'f_remain_curbalance': '期末余额',
-    'f_remain_stair1price': '一阶剩余单价',
-    'f_remain_stair1amount': '一阶剩余气量',
-    'f_remain_stair1fee': '一阶剩余金额',
-    'f_remain_stair2price': '二阶剩余单价',
-    'f_remain_stair2amount': '二阶剩余气量',
-    'f_remain_stair2fee': '二阶剩余金额',
-    'f_remain_stair3price': '三阶剩余单价',
-    'f_remain_stair3amount': '三阶剩余气量',
-    'f_remain_stair3fee': '三阶剩余金额',
+    'f_curbalance': '期末余额',
     'f_gas_state': '用气状态',
     'f_changetable_state': '是否换表',
     'f_first_input_date': '首次抄表时间',

package/src/filiale/liaoyuan/HandplanRatioQuery.vue

@@ -40,7 +40,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :show-component="['company','department']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :show-component="['company','department','slicearea']" :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>
                   <v-select :value.sync="model.f_residential_area"
@@ -351,10 +351,10 @@
         this.inputtores.push({label: "微信公众号", value: "微信公众号"})
       },
       async updateParams() {
-        await this.$MagLoadParams.loadParam(this.f_filialeid)
-        this.inputtores = [];
-        this.inputtores.push({label: "全部", value: ""})
-        await this.initSlice(this.f_filialeid)
+        // await this.$MagLoadParams.loadParam(this.f_filialeid)
+        // this.inputtores = [];
+        // this.inputtores.push({label: "全部", value: ""})
+        // await this.initSlice(this.f_filialeid)
         if(this.allorgid!=null){
           this.allorgid.forEach((res)=>{
             this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
@@ -431,8 +431,10 @@
           //查询多个抄表员时条件
           args.condition += ` and f_inputtor in  ( ${str} )`
         }
-        args.condition = `${args.condition} ` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
+        let ratio1 = this.ratio-0
+        let ratio2 = 0-this.ratio
+        let condition = `${args.condition} ` + this.orgCondtionStr + ` and amount_ratio>=${ratio1} and amount_ratio<=${ratio2}`
+        this.model.search(condition, args.model)
       },
       clear() {
         //清空部门和人员

package/src/filiale/liaoyuan/WebHandplanRatioQuery.vue

@@ -40,7 +40,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :show-component="['company','department']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :show-component="['company','department','slicearea']" :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>
                   <v-select :value.sync="model.f_residential_area"
@@ -364,10 +364,8 @@ export default {
       this.inputtores.push({label: "微信公众号", value: "微信公众号"})
     },
     async updateParams () {
-      await this.$MagLoadParams.loadParam(this.f_filialeid)
       this.inputtores = [];
       this.inputtores.push({label: "全部", value: ""})
-      await this.initSlice(this.f_filialeid)
       if (this.allorgid != null) {
         this.allorgid.forEach((res) => {
           this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
@@ -444,8 +442,10 @@ export default {
         //查询多个抄表员时条件
         args.condition += ` and f_inputtor in  ( ${str} )`
       }
-      args.condition = `${args.condition} ` + this.orgCondtionStr
-      this.model.search(args.condition, args.model)
+      let ratio1 = this.ratio-0
+      let ratio2 = 0-this.ratio
+      let condition = `${args.condition} ` + this.orgCondtionStr + ` and amount_ratio>=${ratio1} and amount_ratio<=${ratio2}`
+      this.model.search(condition, args.model)
     },
     clear () {
       //清空部门和人员

package/src/filiale/liaoyuan/sale.js

@@ -14,7 +14,7 @@ export default function () {
   // 机表抄表环比查询
   Vue.component('handplan-ratio-query', (resolve) => { require(['./HandplanRatioQuery.vue'], resolve) })
   // 机表抄表查询
-  Vue.component('webhandplan--ratio-query', (resolve) => { require(['./WebHandplanRatioQuery.vue'], resolve) })
+  Vue.component('webhandplan-ratio-query', (resolve) => { require(['./WebHandplanRatioQuery.vue'], resolve) })
   // 换表查询
   Vue.component('change-meter-query', (resolve) => {
     require(['./ChangeMeterQuery'], resolve)

package/src/filiale/yangchun/OtherChargeQuery.vue

@@ -9,7 +9,8 @@
               <div class="row">
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">模糊查询</label>
-                  <input type="text" class="input_search" style="width:60%"  v-model="model.searchQuery" placeholder='编号 名称 地址 电话 表号 备用电话 租户电话'
+                  <input type="text" class="input_search" style="width:60%" v-model="model.searchQuery"
+                         placeholder='编号 名称 地址 电话 表号 备用电话 租户电话'
                          condition="(f_userinfo_code like '%{}%' OR f_user_name like '%{}%' OR f_user_phone like '%{}%' OR f_address like '%{}%' OR f_meternumber like '%{}%' OR f_rent_phone like '%{}%' OR f_zuhu_phone like '%{}%')">
                 </div>
                 <div class="col-sm-2 form-group">
@@ -54,27 +55,34 @@
                 </div>
 
                 <div class="span" style="float:right;">
-                  <button class="btn button_clear" v-if="$login.r.includes('其他收费确认收款')" @click="$parent.$parent.batchConfirmPay()">批量确认收款</button>
+                  <button class="btn button_clear" v-if="$login.r.includes('其他收费确认收款')"
+                          @click="$parent.$parent.batchConfirmPay()">批量确认收款
+                  </button>
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                   <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
 
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
-                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="otherChargeQuery" template-name='其他收费查询导出'
+                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="otherChargeQuery"
+                                template-name='其他收费查询导出'
                                 :choose-col="true"
                                 v-if="this.$login.r.includes('其他收费查询导出')"
                   ></export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                               :defaultfield="$parent.$parent.defaultfield"
+                  <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 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" :cascade =true  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" :cascade=true @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_user_name"
@@ -93,7 +101,7 @@
                             :value.sync="model.f_brand_spec" multiple
                             :options='$parent.$parent.chargetype'
                             @change="$parent.$parent.setTypename"
-                             clear-button></v-select>
+                            clear-button></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">品名规格</label>
@@ -103,7 +111,7 @@
                             :value.sync="model.f_typename" multiple
                             :options='$parent.$parent.typeNameList'
                             @change="$parent.$parent.setTypenumber"
-                             clear-button>
+                            clear-button>
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -156,7 +164,7 @@
                             multiple="true"
                             :value.sync="model.f_state"
                             :options='$parent.$parent.chargeState'
-                             clear-button>
+                            clear-button>
                   </v-select>
                 </div>
 
@@ -169,7 +177,7 @@
                             multiple="true"
                             :value.sync="model.f_payment"
                             :options='$parent.$parent.payments'
-                             clear-button>
+                            clear-button>
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -188,7 +196,7 @@
                   <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 {}"
-                            ></v-select>
+                  ></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表品牌</label>
@@ -196,7 +204,7 @@
                             v-model="model.f_meter_brand"
                             :options='$parent.$parent.meterbrands' placeholder='请选择'
                             condition="f_meter_brand in {}"
-                            ></v-select>
+                  ></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" title="收据起始编号">收据票号</label>
@@ -216,16 +224,28 @@
                             condition="f_audit_state in {}"
                   ></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">收&emsp;&emsp;款</label>
+                  <v-select :value.sync="model.f_collection"
+                            v-model="model.f_collection"
+                            :options='$parent.$parent.collection'
+                            placeholder='请选择'
+                            condition="f_money {}"
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
 
-          <data-grid :model="model" partial='list' class="list_area table_sy" :optional="true"  v-ref:grid>
+          <data-grid :model="model" partial='list' class="list_area table_sy" :optional="true" v-ref:grid>
             <template partial='head'>
               <tr>
-                <th><nobr>操作</nobr></th>
                 <th>
-<!--                  <nobr>客户编号</nobr>-->
+                  <nobr>操作</nobr>
+                </th>
+                <th>
+                  <!--                  <nobr>客户编号</nobr>-->
                   <data-order field="f_userinfo_code" name="客户编号"
                               :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
@@ -242,7 +262,7 @@
                   <nobr>身份证号</nobr>
                 </th>
                 <th>
-<!--                  <nobr>客户地址</nobr>-->
+                  <!--                  <nobr>客户地址</nobr>-->
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
@@ -305,7 +325,7 @@
                   <nobr>状态</nobr>
                 </th>
                 <th>
-<!--                  <nobr>收费日期</nobr>-->
+                  <!--                  <nobr>收费日期</nobr>-->
                   <data-order field="f_operate_date" name="收费日期"
                               :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
@@ -327,122 +347,131 @@
                 <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>
-                <button  v-if="$login.r.includes('其他收费确认收款')"  class="button_search button_spacing width-60"
-                        :class="{ 'disabled-button': row.f_audit_state === '审核通过' }"
-                        :disabled="row.f_audit_state === '审核通过'"
-                        @click.stop="$parent.$parent.$parent.confirmPay(row)">确认收款</button>
-              </nobr></td>
               <td style="text-align: center;">
                 <nobr>
-                  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr>
+                  <button v-if="$login.r.includes('其他收费确认收款')" class="button_search button_spacing width-60"
+                          :class="{ 'disabled-button': row.f_audit_state === '审核通过' }"
+                          :disabled="row.f_audit_state === '审核通过'"
+                          @click.stop="$parent.$parent.$parent.confirmPay(row)">确认收款
+                  </button>
+                </nobr>
+              </td>
+              <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_olduserinfo_code}}</nobr>
+                <nobr>{{ row.f_olduserinfo_code }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.id}}</nobr>
+                <nobr>{{ row.id }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_user_name}}</nobr>
+                <nobr>{{ row.f_user_name }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_idnumber}}</nobr>
+                <nobr>{{ row.f_idnumber }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_address}}</nobr>
+                <nobr>{{ row.f_address }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_meternumber}}</nobr>
+                <nobr>{{ row.f_meternumber }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_user_phone}}</nobr>
+                <nobr>{{ row.f_user_phone }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_meter_classify}}</nobr>
+                <nobr>{{ row.f_meter_classify }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_meter_brand}}</nobr>
+                <nobr>{{ row.f_meter_brand }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_card_id}}</nobr>
+                <nobr>{{ row.f_card_id }}</nobr>
               </td>
 
               <td style="text-align: center;">
-                <nobr>{{row.f_bill_number}}</nobr>
+                <nobr>{{ row.f_bill_number }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_brand_spec}}</nobr>
+                <nobr>{{ row.f_brand_spec }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_typename}}</nobr>
+                <nobr>{{ row.f_typename }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_typenumber}}</nobr>
+                <nobr>{{ row.f_typenumber }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_unitprice}}</nobr>
+                <nobr>{{ row.f_unitprice }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_number}}</nobr>
+                <nobr>{{ row.f_number }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_overlength_unitprice}}</nobr>
+                <nobr>{{ row.f_overlength_unitprice }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_overlength_number}}</nobr>
+                <nobr>{{ row.f_overlength_number }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_discounts_money_detail}}</nobr>
+                <nobr>{{ row.f_discounts_money_detail }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_actual_materials_detail}}</nobr>
+                <nobr>{{ row.f_actual_materials_detail }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_disc_money}}</nobr>
+                <nobr>{{ row.f_disc_money }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_money}}</nobr>
+                <nobr>{{ row.f_money }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_payment}}</nobr>
+                <nobr>{{ row.f_payment }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_state}}</nobr>
+                <nobr>{{ row.f_state }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operate_date}}</nobr>
+                <nobr>{{ row.f_operate_date }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_service_person}}</nobr>
+                <nobr>{{ row.f_service_person }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_comments}}</nobr>
+                <nobr>{{ row.f_comments }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operator}}</nobr>
+                <nobr>{{ row.f_operator }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_depname}}</nobr>
+                <nobr>{{ row.f_depname }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_orgname}}</nobr>
+                <nobr>{{ row.f_orgname }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_audit_state}}</nobr>
+                <nobr>{{ row.f_audit_state }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>
+                  <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">
+                    查看
+                  </button>
+                </nobr>
               </td>
-              <td style="text-align: center;"><nobr>
-              <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
-            </nobr></td>
 
               <!--<td style="text-align: center;">-->
-                <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showchargedetail(row)">查看</button>-->
+              <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showchargedetail(row)">查看</button>-->
               <!--</td>-->
             </template>
             <template partial='foot'></template>
@@ -456,383 +485,405 @@
               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_money}}
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              收款合计:&emsp;{{ sumsmodel.f_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
+              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>
 
       </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>
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id"
+                                     @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>
-    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;" v-ref:modal middle
+           backdrop="false">
       <article slot="modal-body">
-        <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false"  fusetype="收费" :isremark="false" style="width:auto" ></upload>
+        <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false" fusetype="收费"
+                :isremark="false" style="width:auto"></upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
   </div>
 
-    <modal v-if="showdetail" :show.sync="showdetail" title="详细记录" v-ref:modal large backdrop="false">
-      <article slot="modal-body" class="modal-body">
-        <other-charge-detail-query :otherchargeid="otherchargeid" ></other-charge-detail-query>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-      </footer>
-    </modal>
+  <modal v-if="showdetail" :show.sync="showdetail" title="详细记录" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body">
+      <other-charge-detail-query :otherchargeid="otherchargeid"></other-charge-detail-query>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
 
 </template>
 
 <script>
-  import {PagedList,HttpResetClass} from 'vue-client'
-  import defaultPrint from './config/DefaultPrint'
-  import exportConfig from './config/exportConfig'
-  import OtherChargeDetailQuery from "./OtherChargeDetailQuery";
+import {PagedList, HttpResetClass} from 'vue-client'
+import defaultPrint from './config/DefaultPrint'
+import exportConfig from './config/exportConfig'
+import OtherChargeDetailQuery from "./OtherChargeDetailQuery";
 
-  let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
-    // 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.$refs.paged.$refs.cri.search()
-    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
-    await self.$MagLoadParams.loadParam()
+let readySomething = async function (self) {
+  self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+  self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+  // 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.$refs.paged.$refs.cri.search()
+  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+  await self.$MagLoadParams.loadParam()
 
-    self.initParams()
-    self.initSecuritypersons()
-    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
-  }
-  export default {
-    components: {
-      OtherChargeDetailQuery
-    },
-    props:['data'],
-    title: '其他收费查询',
-    data() {
-      return {
-        data: {},
-        other:[],
-        footer:[],
-        model: new PagedList('api/af-revenue/sql/otherChargeQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " 'f_operate_date desc'"}, {f_money: 0,hushu:0}),
-        criteriaShow: false,
-        orgCondtionStr: '',
-        modelval: [],
-        printshow: false,
-        all: false,
-        fields: {},
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_typename', 'f_typenumber', 'f_unitprice', 'f_number', 'f_money','f_operate_date', 'f_operator']
-        },
-        //排序
-        orderitem:'f_operate_date desc',
-        orderFields: {
-          f_operate_date: 'no'
-        },
-        //默认打印列
-        defaultfield: [],
-        thead: '',
-        tfoot: '',
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[],
-        },
-        show:false,
-        showdetail:false,
-        otherchargeid:'',
-        rowdata:{},
-        meterbrands: [],
-        services:[],
-        //合计数据
-        sumsmodel: {},
-        showupload:false,
-        selected:{},
-        // 用气性质
-        gasproperties: [],
-        // 品名规格
-        typeNameList: [],
-        // 型号
-        typenumberList: [],
-        selectedRows: []
+  self.initParams()
+  self.initSecuritypersons()
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  components: {
+    OtherChargeDetailQuery
+  },
+  props: ['data'],
+  title: '其他收费查询',
+  data() {
+    return {
+      data: {},
+      other: [],
+      footer: [],
+      model: new PagedList('api/af-revenue/sql/otherChargeQuery', 20, {orderitem: this.orderitem ? `${this.orderitem}` : " 'f_operate_date desc'"}, {
+        f_money: 0,
+        hushu: 0
+      }),
+      criteriaShow: false,
+      orgCondtionStr: '',
+      modelval: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      config: {
+        defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_typename', 'f_typenumber', 'f_unitprice', 'f_number', 'f_money', 'f_operate_date', 'f_operator']
+      },
+      //排序
+      orderitem: 'f_operate_date desc',
+      orderFields: {
+        f_operate_date: 'no'
+      },
+      //默认打印列
+      defaultfield: [],
+      thead: '',
+      tfoot: '',
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: [],
+      },
+      show: false,
+      showdetail: false,
+      otherchargeid: '',
+      rowdata: {},
+      meterbrands: [],
+      services: [],
+      //合计数据
+      sumsmodel: {},
+      showupload: false,
+      selected: {},
+      // 用气性质
+      gasproperties: [],
+      // 品名规格
+      typeNameList: [],
+      // 型号
+      typenumberList: [],
+      selectedRows: []
+    }
+  },
+  ready() {
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    batchConfirmPay() {
+      if (this.$refs.paged.$refs.grid.getRowData() === 0) {
+        this.$showMessage('请先选择要确认的收款项！');
+        return;
       }
+      this.$showMessage(`是否确认批量收款，数量 ${this.$refs.paged.$refs.grid.getRowData().length} 个`, ['confirm', 'cancel']).then(
+        (response) => {
+          if (response === 'confirm') {
+            const rowIds = this.$refs.paged.$refs.grid.getRowData().map(row => row.id)
+            const sql = `update t_othercharge
+                         set f_audit_state = '审核通过'
+                         where id in (${rowIds.map(id => `'${id}'`).join(', ')})`
+            console.log(sql)
+            const updateData = this.$resetpost('api/af-revenue/logic/runSQL', {data: {sql}}, {
+              resolveMsg: '已确认',
+              rejectMsg: '审核失败!!!'
+            });
+            updateData.then(() => {
+              this.$refs.paged.$refs.cri.model.f_audit_state = ['未审核']
+              this.search();
+            });
+          } else if (response === 'cancel') {
+            this.$dispatch('cancel');
+          }
+        }
+      );
+    },
+    confirmPay(row) {
+      console.log('---------', row)
+      this.otherchargeid = row.f_othercharge_id
+      this.$showMessage('是否确认收款?', ['confirm', 'cancel']).then(
+        (response) => {
+          if (response === 'confirm') {
+            let sql = `update t_othercharge
+                       set f_audit_state = '审核通过'
+                       where id = '${row.id}'`
+            let updateData = this.$resetpost('api/af-revenue/logic/runSQL', {data: {sql: sql}}, {
+              resolveMsg: '已确认',
+              rejectMsg: '审核失败!!!'
+            })
+            this.search()
+          } else if (response === 'cancel') {
+            this.$dispatch('cancel')
+          }
+        })
     },
-    ready() {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
+    view(row) {
+      this.showupload = true
+      this.selected = row
+    },
+    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]
     },
-    methods: {
-      batchConfirmPay() {
-        if (this.$refs.paged.$refs.grid.getRowData() === 0) {
-          this.$showMessage('请先选择要确认的收款项！');
-          return;
-        }
-        this.$showMessage(`是否确认批量收款，数量 ${this.$refs.paged.$refs.grid.getRowData().length} 个`, ['confirm', 'cancel']).then(
-          (response) => {
-            if (response === 'confirm') {
-              const rowIds = this.$refs.paged.$refs.grid.getRowData().map(row => row.id)
-              const sql = `update t_othercharge set f_audit_state = '审核通过' where id in (${rowIds.map(id => `'${id}'`).join(', ')})`
-              console.log(sql)
-              const updateData = this.$resetpost('api/af-revenue/logic/runSQL', { data: { sql } }, { resolveMsg: '已确认', rejectMsg: '审核失败!!!' });
-              updateData.then(() => {
-                this.$refs.paged.$refs.cri.model.f_audit_state =['未审核']
-                this.search();
-              });
-            } else if (response === 'cancel') {
-              this.$dispatch('cancel');
-            }
-          }
-        );
-      },
-      confirmPay(row){
-        console.log('---------',row)
-        this.otherchargeid = row.f_othercharge_id
-        this.$showMessage('是否确认收款?', ['confirm', 'cancel']).then(
-          (response) => {
-            if (response === 'confirm') {
-              let sql = `update t_othercharge set f_audit_state = '审核通过' where id = '${row.id}'`
-              let updateData = this.$resetpost('api/af-revenue/logic/runSQL', {data: {sql: sql}}, {resolveMsg: '已确认', rejectMsg: '审核失败!!!'})
-              this.search()
-            } else if (response === 'cancel') {
-              this.$dispatch('cancel')
+    // 初始化安检人
+    initSecuritypersons() {
+      let origin = this.$appdata.getSingleValue('服务人员来源')
+      if (origin) {
+        try {
+          this.services = []
+          let http = new HttpResetClass()
+          http.load('post', '/rs/search', {
+            source: `this.getParentByType($organization$).getChildByName($${origin}$).getUsers()`,
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            console.log('获取安检人员', res.data)
+            for (let i = 0; i < res.data.length; i++) {
+              this.services.push({label: res.data[i].name, value: res.data[i].name})
             }
           })
-      },
-      view(row){
-        this.showupload = true
-        this.selected= row
-      },
-      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]
-      },
-      // 初始化安检人
-      initSecuritypersons () {
-        let origin = this.$appdata.getSingleValue('服务人员来源')
-        if (origin) {
-          try {
-            this.services = []
-            let http = new HttpResetClass()
-            http.load('post', '/rs/search', {
-              source: `this.getParentByType($organization$).getChildByName($${origin}$).getUsers()`,
-              userid: this.$login.f.id
-            }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-              console.log('获取安检人员', res.data)
-              for (let i = 0; i < res.data.length; i++) {
-                this.services.push({label: res.data[i].name, value: res.data[i].name})
-              }
-            })
-          } catch (e) {
-            console.log('获取安检人员失败')
-          }
-        }else {
-          this.services = [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
-        }
-      },
-      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);
-      },
-      search(){
-        this.$refs.paged.$refs.cri.search()
-      },
-    async  selfSearch(args) {
-        if (this.data) {
-          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
-          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+        } catch (e) {
+          console.log('获取安检人员失败')
         }
-        args.condition = `${args.condition}` + this.orgCondtionStr
+      } else {
+        this.services = [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
+      }
+    },
+    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);
+    },
+    search() {
+      this.$refs.paged.$refs.cri.search()
+    },
+    async selfSearch(args) {
+      if (this.data) {
+        this.$parent.$parent.$parent.data.startDate = this.$refs.paged.$refs.cri.model.startDate
+        this.$parent.$parent.$parent.data.endDate = this.$refs.paged.$refs.cri.model.endDate
+      }
+      args.condition = `${args.condition}` + this.orgCondtionStr
       await this.model.search(args.condition, args.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-      this.sumsmodel.hushu =[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
-      if(this.sumsmodel.hushu===null){
+      this.sumsmodel.hushu = [...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
+      if (this.sumsmodel.hushu === null) {
         this.sumsmodel.hushu = 0
       }
     },
-      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
-      },
-      getRes(obj) {
-        this.orgCondtionStr = obj
-      },
-      cancel() {
-        this.show = false
-      },
-      dealmsg(val) {
-        console.log('---------------dealmsg')
-        this.rowdata=val
-        this.show=true
-        val.model = this.model.model
-        this.$dispatch('deal-msg', val)
-      },
-      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
-      },
-      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)
-      },
-      showchargedetail(row){
-        this.showdetail=true
-        this.otherchargeid=row.id
-      },
-      userTypeChange (f_user_type) {
-        this.gasproperties = []
-        if (f_user_type) {
-          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: ''}]
-        }
-      },
-      setTypename (val) {
-        this.typenumberList = []
-        this.typeNameList = this.$appdata.getParam(val)
-      },
-      setTypenumber (val) {
-        this.typenumberList = this.$appdata.getParam(val)
-      },
-      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}'`
+    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
+    },
+    getRes(obj) {
+      this.orgCondtionStr = obj
+    },
+    cancel() {
+      this.show = false
+    },
+    dealmsg(val) {
+      console.log('---------------dealmsg')
+      this.rowdata = val
+      this.show = true
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    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
+    },
+    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.search()
+      })
+      this.modelval = sortModel
+      console.log('选择的打印的字段', this.modelval)
+    },
+    showchargedetail(row) {
+      this.showdetail = true
+      this.otherchargeid = row.id
+    },
+    userTypeChange(f_user_type) {
+      this.gasproperties = []
+      if (f_user_type) {
+        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: ''}]
       }
     },
-    watch: {
-      'all'(val) {
-        if (val) {
-          this.modelval = this.bodyData
+    setTypename(val) {
+      this.typenumberList = []
+      this.typeNameList = this.$appdata.getParam(val)
+    },
+    setTypenumber(val) {
+      this.typenumberList = this.$appdata.getParam(val)
+    },
+    sort(field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
         } else {
-          this.modelval = defaultPrint.config
-          this.put()
+          this.orderFields[key] = 'no'
         }
-      },
-      'modelval.length'() {
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderitem}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+
+      this.search()
+    }
+  },
+  watch: {
+    'all'(val) {
+      if (val) {
+        this.modelval = this.bodyData
+      } else {
+        this.modelval = defaultPrint.config
         this.put()
-      },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
       }
     },
-    computed: {
-      getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
-      },
-      service_person() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
-      },
-      getfield() {
-        return exportConfig.otherchargeConfig
-      },
-      chargetype() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('其他收费类型查询')]
-      },
-      userTypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      chargeState() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
-      },
-      metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
-      payments() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
-      },
-      auditState() {
-        return [{label: '全部', value: ''}, {label: '未审核', value: '未审核'}, {label: '审核通过', value: '审核通过'}]
-        }
+    'modelval.length'() {
+      this.put()
+    },
+    sumsmodel: {
+      handler: function (val) {
+        this.getotherfooter();
+      },
+      deep: true
+    }
+  },
+  computed: {
+    getCondition() {
+      return {
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+        orderitem: this.orderitem ? `${this.orderitem}` : " f_operate_date desc"
       }
-  }
+    },
+    service_person() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
+    },
+    getfield() {
+      return exportConfig.otherchargeConfig
+    },
+    chargetype() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('其他收费类型查询')]
+    },
+    userTypes() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    chargeState() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    metertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+    },
+    payments() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+    },
+    auditState() {
+      return [{label: '全部', value: ''}, {label: '未审核', value: '未审核'}, {label: '审核通过', value: '审核通过'}]
+    },
+    collection() {
+      return [{label: '全部', value: ''}, {label: '等于0', value: '= 0'}, {label: '不等于0', value: '!= 0'}]
+    }
+  },
+}
 </script>
 <style>
 .disabled-button {