manage-client 3.2.70-aode → 3.2.71-aode

package/src/components/sale/ncpush/pushconfirmlist.vue

@@ -1,414 +1,414 @@
-<template>
-    <div style="height: 95%;">
-     <criteria-paged :model="model" v-ref:paged @sort="sort" >
-       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-           <div class="row">
-             <div class="col-sm-2 form-group">
-               <label class="font_normal_body">客户类型</label>
-               <v-select :value.sync="model.f_user_type"
-                         @change="$parent.$parent.userTypeChange()"
-                         :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                         condition="f_user_type = '{}'"
-                         close-on-select></v-select>
-             </div>
-             <div class="col-sm-2 form-group">
-               <label class="font_normal_body">用气性质</label>
-               <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
-                         :options='$parent.$parent.gasproperties' placeholder='请选择'
-                         condition="f_gasproperties = '{}'"
-                         close-on-select></v-select>
-             </div>
-             <div class="button-range" style="float:right;margin-top:10px">
-               <button class="button_search button_spacing" @click="search()">查询</button>
-               <button v-if="false" style="float:right;" type="button" class="button_search button_spacing" @click='$parent.$parent.addpushData'>新增交账记录</button>
-             </div>
-           </div>
-         </div>
-       </criteria>
-         <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid >
-             <template partial='head'>
-                 <tr>
-                   <th>
-                     <data-order name="操作"></data-order>
-                   </th>
-                     <th>
-                         <data-order field="f_userinfo_code" name="客户编号"></data-order>
-                     </th>
-                     <th><data-order field="f_user_name" name="客户姓名"></data-order>
-                     </th>
-                     <th><nobr>地址</nobr></th>
-                     <th>
-                         <data-order field="f_meter_brand" name="气表厂家"></data-order>
-                     </th>
-                     <th><data-order field="f_operate_date" name="操作时间"></data-order>
-                         <!--<nobr>操作时间</nobr>-->
-                     </th>
-                     <th><data-order field="f_operate_date" name="操作状态"></data-order>
-                         <!--<nobr>操作时间</nobr>-->
-                     </th>
-                   <th>
-                     <data-order field="f_type" name="收费类型"></data-order>
-                     <!--<nobr>收费类型</nobr>-->
-                   </th>
-                   <th>
-                     <data-order field="f_pregas" name="气量"></data-order>
-                   </th>
-                   <th>
-                     <data-order field="f_preamount" name="应收金额"></data-order>
-                   </th>
-                   <th>
-                     <data-order field="f_collection" name="实收金额"></data-order>
-                   </th>
-                     <th>
-                         <data-order field="f_stair1price" name="1单价"></data-order>
-                     </th>
-                     <th>
-                         <data-order field="f_stair1amount" name="1气量"></data-order>
-                     </th>
-                     <th>
-                         <data-order field="f_stair2price" name="2单价"></data-order>
-                     </th>
-                     <th>
-                         <data-order field="f_stair2amount" name="2气量"></data-order>
-                     </th>
-                     <th>
-                         <data-order field="f_stair3price" name="3单价"></data-order>
-                     </th>
-                     <th>
-                         <data-order field="f_stair3amount" name="3气量"></data-order>
-                     </th>
-                     <th><nobr>上期余额</nobr></th>
-                     <th><nobr>本期余额</nobr></th>
-                     <th>
-                         <data-order field="f_payment" name="付款方式"></data-order>
-                         <!--<nobr>付款方式</nobr>-->
-                     </th>
-
-                     <th>
-                         <data-order field="f_operator" name="操作员"></data-order>
-                     </th>
-                     <th>
-                         <data-order field="f_user_type" name="客户类型"></data-order>
-                         <!--<nobr>客户类型</nobr>-->
-                     </th>
-                     <th><nobr>备注</nobr></th>
-
-                 </tr>
-             </template>
-             <template partial='body' >
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}" ><nobr>
-                   <div v-if="row.flag!=null && row.flag=='1'">
-                     <button type="button" class="btn btn-link button_spacing" @click='$parent.$parent.$parent.deleterow(row)'>删除</button>
-                     <button type="button" class="btn btn-link button_spacing" @click='$parent.$parent.$parent.updaterow(row)'>修改</button>
-                   </div>
-                 </nobr> </td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}" ><nobr>
-                     <span >{{row.f_userinfo_code}}</span>
-                 </nobr> </td>
-                 <td style="text-align: left;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_user_name}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_address}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_meter_brand}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_operate_date}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_state}}</nobr></td>
-               <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_type}}</nobr></td>
-               <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_pregas}}</nobr></td>
-               <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_preamount}}</nobr></td>
-               <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_collection}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair1price}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair1amount}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair2price}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair2amount}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair3price}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair3amount}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_balance}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_curbalance}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_payment}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_operator}}</nobr></td>
-                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_user_type}}</nobr></td>
-                 <td style="text-align: left;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_comments}}</nobr></td>
-             </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">
-            业务气量:&emsp;{{sumsmodel.f_shouru_gas}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            实收金额:&emsp;{{sumsmodel.f_shouru_fee}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            应收金额:&emsp;{{sumsmodel.f_yingshou_fee}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            柜台微信:&emsp;{{sumsmodel.f_sumgtwx}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            财务收款:&emsp;{{sumsmodel.f_sumcwsf}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            现金缴费:&emsp;{{sumsmodel.f_sumxjjf}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            柜台支付宝:&emsp;{{sumsmodel.f_sumzfb}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            pos:&emsp;{{sumsmodel.f_sumpos}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            销售气票:&emsp;{{sumsmodel.f_sumqp}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            银行码收款:&emsp;{{sumsmodel.f_sumyysk}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            降价补气:&emsp;{{sumsmodel.f_sumjjbq}}
-          </td>
-          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-            煤改气补贴款:&emsp;{{sumsmodel.f_sumbtk}}
-          </td>
-        </tr>
-      </table>
-
-    </div>
-</template>
-
-<script>
-    import { PagedList } from 'vue-client'
-    let readySomething = async function (self) {
-      self.model.params.startDate = self.searchcondition.startDate;
-      self.model.params.endDate = self.searchcondition.endDate;
-      self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
-      self.sumchangeflag = 0;
-    }
-    export default {
-        title: '交账记录确认',
-        data() {
-            return {
-              gasproperties:[],
-                orderDefault: "'f_operate_date'",
-                orderFields: {
-                    f_userinfo_code: 'no'
-                },
-                confirmmodel:[],
-                sumsmodel: {},
-                allmodel:{},
-                model: new PagedList('rs/sql/nopushdayReport', 30, {},{
-                  f_pregas: 0,
-                  f_collection: 0,
-                  f_count_open: 0,
-                  f_pregas_open: 0,
-                  f_collection_open: 0,
-                  f_count_zg: 0,
-                  f_pregas_zg: 0,
-                  f_collection_zg: 0,
-                  f_count_bk: 0,
-                  f_pregas_bk: 0,
-                  f_collection_bk: 0,
-                  f_count_bq: 0,
-                  f_pregas_bq: 0,
-                  f_collection_bq: 0,
-                  f_count_hb: 0,
-                  f_pregas_hb: 0,
-                  f_collection_hb: 0,
-                  f_count_cz: 0,
-                  f_pregas_cz: 0,
-                  f_collection_cz: 0,
-                  f_sum_count:0,
-                  f_shouru_gas:0,
-                  f_shouru_fee:0,
-                  f_yingshou_fee:0,
-                  f_usebenqi_fee:0,
-                  f_benqi_fee:0,
-                  f_sumgtwx:0,
-                  f_sumcwsf:0,
-                  f_sumxjjf:0,
-                  f_sumzfb:0,
-                  f_sumpos:0,
-                  f_sumwxjf:0,
-                  f_sumqp:0,
-                  f_sumyysk:0,
-                  f_sumjjbq:0,
-                  f_sumbtk:0
-                }),
-                sumchangeflag:0,
-            }
-        },
-        props:['nopushmodel','othermodel','searchcondition'],
-        ready() {
-
-          readySomething(this);
-          this.search();
-          //let json = JSON.stringify(this.model);
-          //this.allmodel = JSON.parse(json);
-          //this.sumsmodel = this.allmodel.sums;
-          //this.sumalldata();
-        },
-        methods: {
-          userTypeChange () {
-            this.gasproperties=[]
-            if(this.$refs.paged.$refs.cri.model !==null) {
-              this.$refs.paged.$refs.cri.model.f_gasproperties=''
-              if(this.$refs.paged.$refs.cri.model.f_user_type[0] == null) return;
-              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();
-              this.sumchangeflag=0;
-              this.checkotherbill();
-            },
-            async selfSearch(args) {
-              this.model.params.startDate = this.searchcondition.startDate;
-              this.model.params.endDate = this.searchcondition.endDate;
-              args.condition = `${args.condition} and ` + this.searchcondition.condition;
-              await this.model.search(args.condition, args.model);
-              this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
-              if (this.$refs.paged.$refs.grid.model.rows.length === 0) {
-                for (let key in this.sumsmodel) {
-                  this.sumsmodel[key] = 0;
-                }
-              }
-              this.sumchangeflag=0;
-              this.checkotherbill();
-            },
-            checkotherbill(){
-              //检查特殊数据
-              if(this.othermodel && this.othermodel.length>0 && this.model.rows){
-                //如果存在将数据放入开头
-                let newrow  =[];
-                if(this.model.rows.length>0){
-                  this.model.rows.forEach((item,index)=>{
-                    let flag = 1;
-                    this.othermodel.forEach(item2=>{
-                      if(this.compareObject(item,item2)){
-                        flag = 0;
-                      }
-                    })
-                    if(flag == 1){
-                      newrow.push(item);
-                    }
-                  })
-                }
-                this.model.rows = newrow;
-                this.model.rows = [...this.othermodel,...this.model.rows];
-              }
-              //检查为交账数据
-              if(this.nopushmodel && this.nopushmodel.length>0 && this.sumchangeflag==0 ){
-                  this.sumchangeflag = 1;
-                  this.nopushmodel.forEach(items=>{
-                    let newsums = this.sumsmodel;
-                    items.showflag = 1;
-                    newsums.f_shouru_gas = newsums.f_shouru_gas+ parseFloat(items.f_pregas-0);
-                    newsums.f_shouru_fee = newsums.f_shouru_fee+ parseFloat(items.f_preamount-0);
-                    newsums.f_yingshou_fee = newsums.f_yingshou_fee+ parseFloat(items.f_collection-0);
-                    if(items.f_payment=='柜台微信'){
-                      newsums.f_sumgtwx = newsums.f_sumgtwx+ parseFloat(items.f_collection-0);
-                    }
-                    if(items.f_payment=='财务收款'){
-                      newsums.f_sumcwsf = newsums.f_sumcwsf+ parseFloat(items.f_collection-0);
-                    }
-                    if(items.f_payment=='现金缴费'){
-                      newsums.f_sumxjjf = newsums.f_sumxjjf+ parseFloat(items.f_collection-0);
-                    }
-                    if(items.f_payment=='柜台支付宝'){
-                      newsums.f_sumzfb = newsums.f_sumzfb+ parseFloat(items.f_collection-0);
-                    }
-                    if(items.f_payment=='POS'){
-                      newsums.f_sumpos = newsums.f_sumpos+ parseFloat(items.f_collection-0);
-                    }
-                    this.$set('this.sumsmodel',newsums);
-                    this.$refs.paged.$refs.grid.model.sums = newsums;
-                    this.model.rows.unshift(items);
-                  })
-                }
-            },
-            deleterow(row){
-              this.othermodel.pop(row);
-              this.$showAlert('删除成功!','success',1000);
-              this.search();
-            },
-            updaterow(row){
-              this.$dispatch('updaterow',row)
-            },
-            addpushData(){
-                this.$dispatch('add');
-            },
-            compareObject(o1,o2){
-              if(typeof o1 != typeof o2)return false;
-              if(typeof o1 == 'object'){
-                for(var o in o1){
-                  if(typeof o2[o] == 'undefined')return false;
-                  if(!this.compareObject(o1[o],o2[o]))return false;
-                }
-                return true;
-              }else{
-                return o1 === o2;
-              }
-            },
-            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.allmodel.paramSource.orderitem = `'${this.orderDefault}'`
-                } else {
-                    this.allmodel.paramSource.orderitem = `'${field} ${rule}'`
-                }
-            },
-
-            sumalldata(){
-              if(this.allmodel.rows && this.allmodel.rows.length>0){
-                for (let keys in this.sumsmodel) {
-                  this.sumsmodel[keys] = 0;
-                }
-                this.allmodel.rows.forEach((item)=>{
-                  for (let key in this.sumsmodel) {
-                    let sumr = 0;
-                    if(item[key]!= null && item[key]!=''){
-                      if(!isNaN(item[key]))
-                        sumr = parseFloat(item[key]);
-                    }
-                    this.sumsmodel[key] +=sumr
-                  }
-                })
-              }
-            }
-        },
-        computed:{
-          usertypes() {
-            return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
-          },
-        },
-        watch:{
-          'model.pageIndex'(){
-            this.checkotherbill();
-          }
-        }
-    }
-</script>
-
-<style scoped>
-
-    .col {
-        width: 300px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-
-</style>
+<template>
+    <div style="height: 95%;">
+     <criteria-paged :model="model" v-ref:paged @sort="sort" >
+       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+           <div class="row">
+             <div class="col-sm-2 form-group">
+               <label class="font_normal_body">客户类型</label>
+               <v-select :value.sync="model.f_user_type"
+                         @change="$parent.$parent.userTypeChange()"
+                         :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                         condition="f_user_type = '{}'"
+                         close-on-select></v-select>
+             </div>
+             <div class="col-sm-2 form-group">
+               <label class="font_normal_body">用气性质</label>
+               <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                         :options='$parent.$parent.gasproperties' placeholder='请选择'
+                         condition="f_gasproperties = '{}'"
+                         close-on-select></v-select>
+             </div>
+             <div class="button-range" style="float:right;margin-top:10px">
+               <button class="button_search button_spacing" @click="search()">查询</button>
+               <button v-if="false" style="float:right;" type="button" class="button_search button_spacing" @click='$parent.$parent.addpushData'>新增交账记录</button>
+             </div>
+           </div>
+         </div>
+       </criteria>
+         <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+             <template partial='head'>
+                 <tr>
+                   <th>
+                     <data-order name="操作"></data-order>
+                   </th>
+                     <th>
+                         <data-order field="f_userinfo_code" name="客户编号"></data-order>
+                     </th>
+                     <th><data-order field="f_user_name" name="客户姓名"></data-order>
+                     </th>
+                     <th><nobr>地址</nobr></th>
+                     <th>
+                         <data-order field="f_meter_brand" name="气表厂家"></data-order>
+                     </th>
+                     <th><data-order field="f_operate_date" name="操作时间"></data-order>
+                         <!--<nobr>操作时间</nobr>-->
+                     </th>
+                     <th><data-order field="f_operate_date" name="操作状态"></data-order>
+                         <!--<nobr>操作时间</nobr>-->
+                     </th>
+                   <th>
+                     <data-order field="f_type" name="收费类型"></data-order>
+                     <!--<nobr>收费类型</nobr>-->
+                   </th>
+                   <th>
+                     <data-order field="f_pregas" name="气量"></data-order>
+                   </th>
+                   <th>
+                     <data-order field="f_preamount" name="应收金额"></data-order>
+                   </th>
+                   <th>
+                     <data-order field="f_collection" name="实收金额"></data-order>
+                   </th>
+                     <th>
+                         <data-order field="f_stair1price" name="1单价"></data-order>
+                     </th>
+                     <th>
+                         <data-order field="f_stair1amount" name="1气量"></data-order>
+                     </th>
+                     <th>
+                         <data-order field="f_stair2price" name="2单价"></data-order>
+                     </th>
+                     <th>
+                         <data-order field="f_stair2amount" name="2气量"></data-order>
+                     </th>
+                     <th>
+                         <data-order field="f_stair3price" name="3单价"></data-order>
+                     </th>
+                     <th>
+                         <data-order field="f_stair3amount" name="3气量"></data-order>
+                     </th>
+                     <th><nobr>上期余额</nobr></th>
+                     <th><nobr>本期余额</nobr></th>
+                     <th>
+                         <data-order field="f_payment" name="付款方式"></data-order>
+                         <!--<nobr>付款方式</nobr>-->
+                     </th>
+
+                     <th>
+                         <data-order field="f_operator" name="操作员"></data-order>
+                     </th>
+                     <th>
+                         <data-order field="f_user_type" name="客户类型"></data-order>
+                         <!--<nobr>客户类型</nobr>-->
+                     </th>
+                     <th><nobr>备注</nobr></th>
+
+                 </tr>
+             </template>
+             <template partial='body' >
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}" ><nobr>
+                   <div v-if="row.flag!=null && row.flag=='1'">
+                     <button type="button" class="btn btn-link button_spacing" @click='$parent.$parent.$parent.deleterow(row)'>删除</button>
+                     <button type="button" class="btn btn-link button_spacing" @click='$parent.$parent.$parent.updaterow(row)'>修改</button>
+                   </div>
+                 </nobr> </td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}" ><nobr>
+                     <span >{{row.f_userinfo_code}}</span>
+                 </nobr> </td>
+                 <td style="text-align: left;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_user_name}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_address}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_meter_brand}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_operate_date}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_state}}</nobr></td>
+               <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_type}}</nobr></td>
+               <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_pregas}}</nobr></td>
+               <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_preamount}}</nobr></td>
+               <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_collection}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair1price}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair1amount}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair2price}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair2amount}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair3price}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_stair3amount}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_balance}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_curbalance}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_payment}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_operator}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_user_type}}</nobr></td>
+                 <td style="text-align: left;" :style="{background:(row.showflag!=null && row.showflag=='1'?'#ff8c006b!important;':'')}"><nobr>{{row.f_comments}}</nobr></td>
+             </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">
+            业务气量:&emsp;{{sumsmodel.f_shouru_gas}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            实收金额:&emsp;{{sumsmodel.f_shouru_fee}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            应收金额:&emsp;{{sumsmodel.f_yingshou_fee}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            柜台微信:&emsp;{{sumsmodel.f_sumgtwx}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            财务收款:&emsp;{{sumsmodel.f_sumcwsf}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            现金缴费:&emsp;{{sumsmodel.f_sumxjjf}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            柜台支付宝:&emsp;{{sumsmodel.f_sumzfb}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            pos:&emsp;{{sumsmodel.f_sumpos}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            销售气票:&emsp;{{sumsmodel.f_sumqp}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            银行码收款:&emsp;{{sumsmodel.f_sumyysk}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            降价补气:&emsp;{{sumsmodel.f_sumjjbq}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            煤改气补贴款:&emsp;{{sumsmodel.f_sumbtk}}
+          </td>
+        </tr>
+      </table>
+
+    </div>
+</template>
+
+<script>
+    import { PagedList } from 'vue-client'
+    let readySomething = async function (self) {
+      self.model.params.startDate = self.searchcondition.startDate;
+      self.model.params.endDate = self.searchcondition.endDate;
+      self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+      self.sumchangeflag = 0;
+    }
+    export default {
+        title: '交账记录确认',
+        data() {
+            return {
+              gasproperties:[],
+                orderDefault: "'f_operate_date'",
+                orderFields: {
+                    f_userinfo_code: 'no'
+                },
+                confirmmodel:[],
+                sumsmodel: {},
+                allmodel:{},
+                model: new PagedList('rs/sql/nopushdayReport', 30, {},{
+                  f_pregas: 0,
+                  f_collection: 0,
+                  f_count_open: 0,
+                  f_pregas_open: 0,
+                  f_collection_open: 0,
+                  f_count_zg: 0,
+                  f_pregas_zg: 0,
+                  f_collection_zg: 0,
+                  f_count_bk: 0,
+                  f_pregas_bk: 0,
+                  f_collection_bk: 0,
+                  f_count_bq: 0,
+                  f_pregas_bq: 0,
+                  f_collection_bq: 0,
+                  f_count_hb: 0,
+                  f_pregas_hb: 0,
+                  f_collection_hb: 0,
+                  f_count_cz: 0,
+                  f_pregas_cz: 0,
+                  f_collection_cz: 0,
+                  f_sum_count:0,
+                  f_shouru_gas:0,
+                  f_shouru_fee:0,
+                  f_yingshou_fee:0,
+                  f_usebenqi_fee:0,
+                  f_benqi_fee:0,
+                  f_sumgtwx:0,
+                  f_sumcwsf:0,
+                  f_sumxjjf:0,
+                  f_sumzfb:0,
+                  f_sumpos:0,
+                  f_sumwxjf:0,
+                  f_sumqp:0,
+                  f_sumyysk:0,
+                  f_sumjjbq:0,
+                  f_sumbtk:0
+                }),
+                sumchangeflag:0,
+            }
+        },
+        props:['nopushmodel','othermodel','searchcondition'],
+        ready() {
+
+          readySomething(this);
+          this.search();
+          //let json = JSON.stringify(this.model);
+          //this.allmodel = JSON.parse(json);
+          //this.sumsmodel = this.allmodel.sums;
+          //this.sumalldata();
+        },
+        methods: {
+          userTypeChange () {
+            this.gasproperties=[]
+            if(this.$refs.paged.$refs.cri.model !==null) {
+              this.$refs.paged.$refs.cri.model.f_gasproperties=''
+              if(this.$refs.paged.$refs.cri.model.f_user_type[0] == null) return;
+              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();
+              this.sumchangeflag=0;
+              this.checkotherbill();
+            },
+            async selfSearch(args) {
+              this.model.params.startDate = this.searchcondition.startDate;
+              this.model.params.endDate = this.searchcondition.endDate;
+              args.condition = `${args.condition} and ` + this.searchcondition.condition;
+              await this.model.search(args.condition, args.model);
+              this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
+              if (this.$refs.paged.$refs.grid.model.rows.length === 0) {
+                for (let key in this.sumsmodel) {
+                  this.sumsmodel[key] = 0;
+                }
+              }
+              this.sumchangeflag=0;
+              this.checkotherbill();
+            },
+            checkotherbill(){
+              //检查特殊数据
+              if(this.othermodel && this.othermodel.length>0 && this.model.rows){
+                //如果存在将数据放入开头
+                let newrow  =[];
+                if(this.model.rows.length>0){
+                  this.model.rows.forEach((item,index)=>{
+                    let flag = 1;
+                    this.othermodel.forEach(item2=>{
+                      if(this.compareObject(item,item2)){
+                        flag = 0;
+                      }
+                    })
+                    if(flag == 1){
+                      newrow.push(item);
+                    }
+                  })
+                }
+                this.model.rows = newrow;
+                this.model.rows = [...this.othermodel,...this.model.rows];
+              }
+              //检查为交账数据
+              if(this.nopushmodel && this.nopushmodel.length>0 && this.sumchangeflag==0 ){
+                  this.sumchangeflag = 1;
+                  this.nopushmodel.forEach(items=>{
+                    let newsums = this.sumsmodel;
+                    items.showflag = 1;
+                    newsums.f_shouru_gas = newsums.f_shouru_gas+ parseFloat(items.f_pregas-0);
+                    newsums.f_shouru_fee = newsums.f_shouru_fee+ parseFloat(items.f_preamount-0);
+                    newsums.f_yingshou_fee = newsums.f_yingshou_fee+ parseFloat(items.f_collection-0);
+                    if(items.f_payment=='柜台微信'){
+                      newsums.f_sumgtwx = newsums.f_sumgtwx+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='财务收款'){
+                      newsums.f_sumcwsf = newsums.f_sumcwsf+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='现金缴费'){
+                      newsums.f_sumxjjf = newsums.f_sumxjjf+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='柜台支付宝'){
+                      newsums.f_sumzfb = newsums.f_sumzfb+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='POS'){
+                      newsums.f_sumpos = newsums.f_sumpos+ parseFloat(items.f_collection-0);
+                    }
+                    this.$set('this.sumsmodel',newsums);
+                    this.$refs.paged.$refs.grid.model.sums = newsums;
+                    this.model.rows.unshift(items);
+                  })
+                }
+            },
+            deleterow(row){
+              this.othermodel.pop(row);
+              this.$showAlert('删除成功!','success',1000);
+              this.search();
+            },
+            updaterow(row){
+              this.$dispatch('updaterow',row)
+            },
+            addpushData(){
+                this.$dispatch('add');
+            },
+            compareObject(o1,o2){
+              if(typeof o1 != typeof o2)return false;
+              if(typeof o1 == 'object'){
+                for(var o in o1){
+                  if(typeof o2[o] == 'undefined')return false;
+                  if(!this.compareObject(o1[o],o2[o]))return false;
+                }
+                return true;
+              }else{
+                return o1 === o2;
+              }
+            },
+            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.allmodel.paramSource.orderitem = `'${this.orderDefault}'`
+                } else {
+                    this.allmodel.paramSource.orderitem = `'${field} ${rule}'`
+                }
+            },
+
+            sumalldata(){
+              if(this.allmodel.rows && this.allmodel.rows.length>0){
+                for (let keys in this.sumsmodel) {
+                  this.sumsmodel[keys] = 0;
+                }
+                this.allmodel.rows.forEach((item)=>{
+                  for (let key in this.sumsmodel) {
+                    let sumr = 0;
+                    if(item[key]!= null && item[key]!=''){
+                      if(!isNaN(item[key]))
+                        sumr = parseFloat(item[key]);
+                    }
+                    this.sumsmodel[key] +=sumr
+                  }
+                })
+              }
+            }
+        },
+        computed:{
+          usertypes() {
+            return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+          },
+        },
+        watch:{
+          'model.pageIndex'(){
+            this.checkotherbill();
+          }
+        }
+    }
+</script>
+
+<style scoped>
+
+    .col {
+        width: 300px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+</style>