manage-client 3.2.91-1 → 3.2.91-aodeToV4

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

@@ -0,0 +1,480 @@
+<template>
+    <div style="height: 90%;">
+     <!--<p style="height:30px;" >-->
+      <!--<button style="float:right;" type="button" class="button_search button_spacing" @click='addpushData'>新增交账记录</button>-->
+    <!--</p>-->
+     <criteria-paged :model="model" v-ref:paged >
+       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+<!--           <div class="row">-->
+<!--             <button class="button_search button_spacing" @click="search()">刷新</button>-->
+<!--           </div>-->
+         </div>
+       </criteria>
+         <data-grid  :model="model"  partial='list' :sumsmodel="sumsmodel" 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="NC客户编号"></data-order>
+                     </th>
+                     <th><data-order field="f_user_name" name="NC客户姓名"></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>
+                     <data-order field="f_payment" name="付款方式"></data-order>
+                     <!--<nobr>付款方式</nobr>-->
+                   </th>
+                   <th>
+                     <data-order field="f_type" name="缴费类型"></data-order>
+                     <!--<nobr>付款方式</nobr>-->
+                   </th>
+                     <th><nobr>地址</nobr></th>
+                   <th>
+                     <data-order field="f_user_type" name="客户类型"></data-order>
+                     <!--<nobr>客户类型</nobr>-->
+                   </th>
+                     <th><data-order field="f_operate_date" 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>
+                 </tr>
+             </template>
+             <template partial='body' >
+                 <!--<td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!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.f_state=='无效'?'#ffa8c0!important;':'')}" ><nobr>
+                     <span >{{row.f_userinfo_code}}</span>
+                 </nobr> </td>
+                 <td style="text-align: left;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_user_name}}</nobr></td>
+                 <td style="text-align: left;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_newolduserinfo_code}}</nobr></td>
+                 <td style="text-align: left;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_newolduser_name}}</nobr></td>
+               <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_payment}}</nobr></td>
+               <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_type}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_address}}</nobr></td>
+               <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_user_type}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_state}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_pregas}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_preamount}}</nobr></td>
+                 <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_collection}}</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.allpregas}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            总应收金额:&emsp;{{sumsmodel.allpreamount}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            总实收金额:&emsp;{{sumsmodel.allf_collection}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用总业务气量:&emsp;{{sumsmodel.prgas_civill}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用总实收金额:{{sumsmodel.collection_civill}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用柜台微信:&emsp;{{sumsmodel.f_civill_sumgtwx}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用财务收款:&emsp;{{sumsmodel.f_civill_sumcwsf}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用现金缴费:&emsp;{{sumsmodel.f_civill_sumxjjf}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用柜台支付宝:&emsp;{{sumsmodel.f_civill_sumzfb}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用POS:&emsp;{{sumsmodel.f_civill_sumpos}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用销售气票:&emsp;{{sumsmodel.f_civill_sumqp}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用银行码收款:&emsp;{{sumsmodel.f_civill_sumyysk}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用降价补气:&emsp;{{sumsmodel.f_civill_sumjjbq}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            民用煤改气补贴款&emsp;{{sumsmodel.f_civill_sumbtk}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用总业务气量:&emsp;{{sumsmodel.prgas_nocivill}}
+          </td>
+<!--          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
+<!--            非民用总应收金额:&emsp;{{sumsmodel.preamount_nocivill}}-->
+<!--          </td>-->
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用总实收金额:&emsp;{{sumsmodel.collection_nocivill}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用柜台微信:&emsp;{{sumsmodel.f_no_civill_sumgtwx}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用财务收款:&emsp;{{sumsmodel.f_no_civill_sumcwsf}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用现金缴费:&emsp;{{sumsmodel.f_no_civill_sumxjjf}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用柜台支付宝:&emsp;{{sumsmodel.f_no_civill_sumzfb}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用POS:&emsp;{{sumsmodel.f_no_civill_sumpos}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用销售气票:&emsp;{{sumsmodel.f_no_civill_sumqp}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用银行码收款:&emsp;{{sumsmodel.f_no_civill_sumyysk}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用降价补气:&emsp;{{sumsmodel.f_no_civill_sumjjbq}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            非民用煤改气补贴款:&emsp;{{sumsmodel.f_no_civill_sumbtk}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            其他应收金额:&emsp;{{sumsmodel.f_other_preamount}}
+          </td>
+          <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+            其他实收金额:&emsp;{{sumsmodel.f_other_collection}}
+          </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 {
+                orderDefault: "'f_operate_date'",
+                orderFields: {
+                    f_userinfo_code: 'no'
+                },
+                model: new PagedList('api/af-revenue/sql/ncPushBillQueryCivill', 300,{},{
+                  allpregas: 0,
+                  allf_collection: 0,
+                  allpreamount:0,
+                  prgas_civill:0,
+                  collection_civill:0,
+                  prgas_nocivill:0,
+                  collection_nocivill:0,
+                  preamount_nocivill:0,
+                  preamount_civill:0,
+                  f_other_preamount:0,
+                  f_other_collection:0,
+                  f_civill_sumgtwx:0,  //民用各种金额合计
+                  f_civill_sumcwsf:0,
+                  f_civill_sumxjjf:0,
+                  f_civill_sumzfb:0,
+                  f_civill_sumpos:0,
+                  f_civill_sumqp:0,
+                  f_civill_sumyysk:0,
+                  f_civill_sumjjbq:0,
+                  f_civill_sumbtk:0,
+                  f_no_civill_sumgtwx:0, //非民用各种金额合计
+                  f_no_civill_sumcwsf:0,
+                  f_no_civill_sumxjjf:0,
+                  f_no_civill_sumzfb:0,
+                  f_no_civill_sumpos:0,
+                  f_no_civill_sumqp:0,
+                  f_no_civill_sumyysk:0,
+                  f_no_civill_sumjjbq:0,
+                  f_no_civill_sumbtk:0
+                }),
+                confirmmodel:[],
+                sumsmodel: {},
+                allmodel:{},
+              sumchangeflag:0,
+            }
+        },
+        props:['othermodel','searchcondition'],
+        ready() {
+          readySomething(this);
+          this.search();
+        },
+        methods: {
+            search() {
+              this.$refs.paged.$refs.cri.search();
+              this.checkotherbill();
+            },
+            checkuserdata(){
+              let flag = true;
+              if(this.model.rows && this.model.rows.length>0){
+                this.model.rows.forEach(item=>{
+                  if(item.f_user_type && item.f_user_type=='非民用' && ( item.f_user_name==null || item.f_user_name =='')){
+                    this.$showMessage("当前推送记录有非民用用户未关联NC档案，请关联后进行交账");
+                    flag = false;
+                    return;
+                  }
+                })
+              }
+              if(flag){
+                this.$dispatch('openconfimbutton');
+              }else{
+                this.$dispatch('closeconfimbutton');
+              }
+            },
+            checknopushuserdata(){
+              let flag = true;
+              if(this.nopushmodel && this.nopushmodel.length>0){
+                this.nopushmodel.forEach(item=>{
+                  if(item.f_user_type && item.f_user_type=='非民用' && ( item.f_customer==null || item.f_customer =='')){
+                    this.$showMessage("本次推送记录之前未推送记录有非民用用户未关联NC档案，请关联后进行交账");
+                    flag = false;
+                    return;
+                  }
+                })
+              }
+              if(flag){
+                this.$dispatch('openconfimbutton');
+              }else{
+                this.$dispatch('closeconfimbutton');
+              }
+            },
+            async selfSearch(args) {
+              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;
+              console.log('计算合计。', this.sumsmodel)
+              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(){
+              this.checkuserdata();
+              //检查特殊数据
+              if(this.othermodel && this.othermodel.length>0 && this.model.rows && this.sumchangeflag==0 ){
+                this.sumchangeflag = 1;
+                let otherpramount = 0;
+                let othercollection =0;
+                //如果存在将数据放入开头
+                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.othermodel.forEach(item=>{
+                  otherpramount = ((item.f_preamount-0)+(otherpramount-0)).toFixed(2);
+                  othercollection = ((item.f_collection-0)+(othercollection-0)).toFixed(2);
+                })
+                this.sumsmodel.f_other_preamount = otherpramount;
+                this.sumsmodel.f_other_collection = othercollection;
+                this.sumsmodel.allpreamount = ((this.sumsmodel.allpreamount-0)+(otherpramount-0)).toFixed(2);
+                this.sumsmodel.allf_collection =((this.sumsmodel.allf_collection-0)+(othercollection-0)).toFixed(2);
+                this.model.rows = [...this.model.rows,...this.othermodel];
+              }
+              //合并未交账数据： 要将民用进行合并，非民用不进行合并
+              if(this.nopushmodel && this.nopushmodel.length>0 ){
+                let civilldata ={}
+                if(this.model.rows.length>0) {
+                  if (this.model.rows[0].sumchangeflag == null) {
+                    this.model.rows[0].sumchangeflag = 0;
+                  } else {
+                    return;
+                  }
+                  this.model.rows.forEach(item => {
+                    if (item.f_user_name == '民用') {
+                      civilldata = item;
+                      return;
+                    }
+                  })
+                }
+                if(civilldata.f_user_name == null){
+                  civilldata = {
+                      f_user_name:'民用',
+                      f_payment:'',
+                      f_type:'',
+                      f_address:'',
+                      f_user_type:'民用',
+                      f_meter_brand:'',
+                      f_state:'有效',
+                      f_pregas:0,
+                      f_preamount:0,
+                      f_collection:0,
+                      sumchangeflag:0
+                  }
+                }
+                this.nopushmodel.forEach(items=>{
+                  let newsums = this.sumsmodel;
+                  if(items.f_user_type == '民用'){
+                    civilldata.f_pregas = ((civilldata.f_pregas-0) + (items.f_pregas-0)).toFixed(2);
+                    civilldata.f_preamount =((civilldata.f_preamount-0) + (items.f_preamount-0)).toFixed(2);
+                    civilldata.f_collection = ((civilldata.f_collection-0) + (items.f_collection-0)).toFixed(2);
+                    newsums.pregas_civill = ((newsums.pregas_civill-0)+ (items.f_pregas-0)).toFixed(2);
+                    if(items.f_payment=='柜台微信'){
+                      newsums.f_civill_sumgtwx = newsums.f_civill_sumgtwx+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='财务收款'){
+                      newsums.f_civill_sumcwsf = newsums.f_civill_sumcwsf+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='现金缴费'){
+                      newsums.f_civill_sumxjjf = newsums.f_civill_sumxjjf+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='柜台支付宝'){
+                      newsums.f_civill_sumzfb = newsums.f_civill_sumzfb+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='POS'){
+                      newsums.f_civill_sumpos = newsums.f_civill_sumpos+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='气票'){
+                      newsums.f_civill_sumqp = newsums.f_civill_sumqp+ parseFloat(items.f_collection-0);
+                    }
+                  }
+                  if(items.f_user_type == '非民用'){
+                    newsums.pregas_nocivill = newsums.pregas_nocivill+ parseFloat(items.f_pregas-0);
+                    newsums.collection_nocivill = newsums.collection_nocivill+ parseFloat(items.f_collection-0);
+                    if(items.f_payment=='柜台微信'){
+                      newsums.f_no_civill_sumgtwx = newsums.f_no_civill_sumgtwx+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='财务收款'){
+                      newsums.f_no_civill_sumcwsf = newsums.f_no_civill_sumcwsf+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='现金缴费'){
+                      newsums.f_no_civill_sumxjjf = newsums.f_no_civill_sumxjjf+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='柜台支付宝'){
+                      newsums.f_no_civill_sumzfb = newsums.f_no_civill_sumzfb+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='POS'){
+                      newsums.f_no_civill_sumpos = newsums.f_no_civill_sumpos+ parseFloat(items.f_collection-0);
+                    }
+                    if(items.f_payment=='气票'){
+                      newsums.f_no_civill_sumqp = newsums.f_no_civill_sumqp+ parseFloat(items.f_collection-0);
+                    }
+                    this.model.rows.unshift(items);
+                  }
+                  newsums.allpregas = ((newsums.allpregas-0)+(items.f_pregas-0)).toFixed(2);
+                  newsums.allpreamount = ((newsums.allpreamount-0)+(items.f_preamount-0)).toFixed(2);
+                  newsums.allf_collection = ((newsums.allf_collection-0)+(items.f_collection-0)).toFixed(2);
+                  this.$set('this.sumsmodel',newsums);
+                  this.$refs.paged.$refs.grid.model.sums = newsums;
+                })
+                let hastrue=1;
+                if(this.model.rows.length>0)(
+                  this.model.rows.forEach(item=>{
+                    if(item.f_user_name=='民用'){
+                      hastrue=0
+                      item=civilldata;
+                      return;
+                    }
+                  })
+                )
+                if(hastrue==1){
+                  this.model.rows.push(civilldata);
+                }
+              }
+            },
+            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;
+              }
+            },
+            deleterow(row){
+              this.$dispatch('deleterow',row)
+              // this.allmodel.rows.pop(row);
+              // this.sumalldata();
+              this.$showAlert('删除成功!','success',1000);
+            },
+            updaterow(row){
+              this.$dispatch('updaterow',row)
+            },
+            addpushData(){
+                this.$dispatch('add');
+            },
+            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}'`
+                }
+            },
+        },
+        watch:{
+          'model.pageIndex'(){
+            this.checkotherbill();
+          }
+        }
+    }
+</script>
+
+<style scoped>
+
+    .col {
+        width: 300px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+</style>

package/src/components/sale/report/aode/DayReport.vue

@@ -3,8 +3,8 @@
     <div class="basic-main" :style="{width:width}">
       <day-report-list @getdata="getdata" @close="close" @show="show" :style="style" v-ref:list ></day-report-list>
     </div>
-    <div class="binary-right" v-if="summaryshow">
-      <ul class="nav nav-tabs">
+    <div class="binary-right" style="height:97%" v-if="summaryshow">
+      <ul class="nav nav-tabs" style="height: 5%">
         <li class="active"><a href="#">数据汇总</a></li>
       </ul>
       <day-report-summary :sumsmodel="sumsmodel"  v-ref:gas></day-report-summary>