manage-client 3.2.24 → 3.2.26-aode

package/src/components/sale/report/aode/life/LifeYearReport.vue

@@ -28,11 +28,15 @@
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
 
 
-              <export-excel :data="$parent.$parent.getCondition"
+              <export-excel-hand :data="$parent.$parent.getCondition"
+                                 v-ref:exports
+                                 :defaultselect="$parent.$parent.selectfields"
+                                 :other-data="$parent.$parent.other"
+                                 :footer-data="$parent.$parent.footer"
                             :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
-                            sqlurl="rs/logic/exportfile" sql-name="aode_LifeYearByChargeType" template-name='悦生活年报表'  :choose-col="true"></export-excel>
+                            sqlurl="rs/logic/reportExportfile" sql-name="aode_LifeYearByChargeType" template-name='悦生活年报表'  :choose-col="true"></export-excel-hand>
 
-              <life-year-print :countmodel="{sumsmodel:$parent.$parent.model.sums,model:$parent.$parent.model,orgname:$parent.$parent.orgname}"></life-year-print>
+              <life-year-print  :printshow.sync="$parent.$parent.printshoworg"  :countmodel="{sumsmodel:$parent.$parent.model.sums,model:$parent.$parent.model,orgname:$parent.$parent.orgname}"></life-year-print>
 
             </div>
           </div>
@@ -92,14 +96,21 @@
           org:[this.$login.f.orgid]
         },
         orgname: '',
+        printshoworg:'',
         criteriaShow: true,
         orgCondtionStr:'',
         defaultfield:["f_operate_date","f_count","f_pregas","f_collection"],
         sumName:[
-        'f_count','f_pregas','f_collection']
+        'f_count','f_pregas','f_collection'],
+        selectfields:[],
+        other:[],
+        footer:[],
       }
     },
     ready(){
+      for(var item in exportConfig.lifeYearByChargeConfig){
+        this.selectfields.push(item)
+      }
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -107,6 +118,25 @@
       })
     },
     methods: {
+      getotherfooter(){
+        this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other=[];
+        this.footer=[];
+        let exportdata = this.getCondition;
+        let otherInData=[];
+
+        otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
+        otherInData.push(`导出人：${this.$login.f.name}`)
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
       selfSearch (args) {
         let f_orgstr = this.orgCondtionStr
         if(!this.orgCondtionStr){
@@ -122,7 +152,7 @@
         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] = []
+          this.$refs.paged.$refs.cri.model[key] = ''
         })
       },
       show(){
@@ -133,6 +163,9 @@
       },
       getorg (obj) {
         this.orgname = obj.res
+        if(obj.res != null &&obj.res.length>0){
+          this.printshoworg=obj.res[0]
+        }
         this.orgCondtionStr = `and f_orgid in ${this.$login.convertToIn(obj.resids)}`
       },
     },
@@ -148,6 +181,12 @@
       'modelval.length' () {
         this.put()
       },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
     },
     computed:{
       getCondition(){
@@ -169,7 +208,9 @@
           rs.push(temp)
         }
         return [{label: '全部', value: ''}, ...rs]
-      }
+      },
+
+
     }
   }
 </script>

package/src/components/sale/report/aode/othercharge/OtherDayReport.vue

@@ -0,0 +1,50 @@
+<template>
+  <div id="unit" class="flex-row" >
+    <div class="basic-main" :style="{width:width}">
+      <other-day-report-list @getdata="getdata" @close="close" @show="show" :style="style" v-ref:list ></other-day-report-list>
+    </div>
+    <div class="binary-right" v-if="summaryshow">
+      <ul class="nav nav-tabs">
+        <li class="active"><a href="#">数据汇总</a></li>
+      </ul>
+      <other-day-report-summary :sumsmodel="sumsmodel"  v-ref:gas></other-day-report-summary>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    title:'日清单(其他收费)',
+    name: "DayReport",
+    data () {
+      return {
+        width:'100%',
+        summaryshow:false,
+        style:'col-sm-2'
+      }
+    },
+    ready(){
+    },
+    methods:{
+      getdata(val){
+        console.log(val)
+        this.sumsmodel = val
+      },
+      show(){
+        this.width = '58%'
+        this.summaryshow = true
+        this.style='col-sm-3'
+      },
+      close(){
+        this.width = '100%'
+        this.summaryshow = false
+        this.style='col-sm-2'
+      }
+    }
+  }
+</script>
+
+<style>
+</style>
+

package/src/components/sale/report/aode/othercharge/OtherDayReportList.vue

@@ -0,0 +1,414 @@
+<template>
+  <div   v-if="!listpage"  @keyup.enter="search">
+    <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">
+            <res-select-group :style="$parent.$parent.style" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" :style="$parent.$parent.style" v-ref:sel></res-select-group>
+            <div :class="$parent.$parent.style" >
+              <label for="startDate" class="font_normal_body">开始日期</label>
+              <datepicker  placeholder="开始日期" style="width:60%"
+                           v-model="model.f_startDate"
+                           :value.sync="model.f_startDate"
+                           :format="'yyyy-MM-dd HH:mm:ss'"
+                           class="datepicker"
+                           :show-reset-button="true"
+                           class="select"
+              >
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label for="endDate" class="font_normal_body">结束日期</label>
+              <datepicker  placeholder="结束日期" style="width:60%"
+                           v-model="model.f_endDate"
+                           :value.sync="model.f_endDate"
+                           :format="'yyyy-MM-dd HH:mm:ss'"
+                           class="datepicker"
+                           :show-reset-button="true"
+                           class="select"
+              >
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                        :options='$parent.$parent.useroptions' placeholder='请选择'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">收费类型</label>
+              <v-select :value.sync="model.f_type" v-model="model.f_type"
+                        :options='$parent.$parent.operates' placeholder='请选择'
+                        condition="f_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">操作状态</label>
+              <v-select :value.sync="model.f_state" v-model="model.f_state"
+                        :options='$parent.$parent.stateoptions' placeholder='请选择'
+                        condition="f_state = '{}'"
+                        close-on-select></v-select>
+            </div>
+<!--            <div :class="$parent.$parent.style">-->
+<!--              <label class="font_normal_body">包含APP</label>-->
+<!--              <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"-->
+<!--                        :options='$parent.$parent.hasapps' placeholder='请选择'-->
+<!--                        condition="f_operator {} "-->
+<!--                        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 class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition" v-ref:exportexcel
+                            :field="$parent.$parent.getfield"
+                            :defaultselect="$parent.$parent.selectfields"
+                            sqlurl="rs/logic/exportfile" sql-name="otherchargedayReport" template-name='日清单(其他收费)'  :choose-col="true"
+                            class="button_export button_spacing"></export-excel>
+              <other-day-report-list-print  :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></other-day-report-list-print>
+              <div style="float: right"  class="button_spacing" :class="{'button_shrink_left':$parent.$parent.criteriaShow,'button_shrink_right':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.show()"></div>
+            </div>
+
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" :sumsmodel="sumsmodel" partial='list' class="list_area table_sy" v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th><nobr>客户编号</nobr></th>
+            <th><nobr>客户姓名</nobr></th>
+            <th><nobr>客户类型</nobr></th>
+            <th><nobr>用气性质</nobr></th>
+            <th><data-order field="f_operate_date" name="操作时间"></data-order>
+              <!--<nobr>操作时间</nobr>-->
+            </th>
+            <th><nobr>操作状态</nobr></th>
+            <th><nobr>收费类型</nobr></th>
+            <th><nobr>型号</nobr></th>
+            <th><nobr>数量</nobr></th>
+            <th><nobr>单价</nobr></th>
+            <th><nobr>金额</nobr></th>
+            <th><nobr>付款方式</nobr></th>
+            <th><nobr>操作员</nobr></th>
+            <th><nobr>备注</nobr></th>
+
+          </tr>
+        </template>
+        <template partial='body' >
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}" ><nobr>
+            <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></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: 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_gasproperties}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_operate_date}}</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_type}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_typenumber}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_number}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_unitprice}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_collection}}</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_operator}}</nobr></td>
+          <td style="text-align: left;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_comments}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <div v-if="listpage">
+    <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+  </div>
+</template>
+
+<script>
+
+  import { PagedList } from 'vue-client'
+  import exportConfig from '../../../config/exportConfig'
+  import OtherDayReportSummary from "./OtherDayReportSummary";
+  import getLodop from '../../../../../plugins/LodopFuncs'
+
+  export default {
+    components: {OtherDayReportSummary},
+    title: '日报表',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group'
+      },
+    },
+    data() {
+      return {
+        orderDefault: "'f_operate_date'",
+        orderFields: {
+          f_userinfo_code: 'no'
+        },
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[this.$login.f.depids],
+          user:[this.$login.f.id]
+        },
+        model: new PagedList('rs/sql/otherchargedayReport', 30, {orderitem: "'f_operate_date'"},{
+          f_count_othercharge:0,
+          f_collection_othercharge:0,
+          f_count_cz:0,
+          f_collection_cz:0,
+          f_sumgtwx:0,
+          f_sumcwsf:0,
+          f_sumxjjf:0,
+          f_sumzfb:0,
+          f_sumpos:0,
+          f_sumyhm:0,
+          f_sumxsqp:0,
+          f_sumjjbq:0,
+          f_sumbtk:0
+        }),
+        listpage:false,
+        rowdata: {},
+        orgCondtionStr: '',
+        userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
+      count: 0,
+        sumsmodel: {},
+      printshow: false,
+        all: false,
+        orgname: '',
+        depname: '',
+        operaname:'',
+        criteriaShow: false,
+        operates: [{label: '全部', value: ''},...this.$appdata.getParam('品名及规格')],
+        stateoptions:[{label: '全部', value: ''}, {label: '有效', value: "有效"},{label: '撤销', value: "撤销"},{label: '无效', value: "无效"},{label: '冲正', value: "冲正"}],
+        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
+        useroptions:[{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')],
+      selectfields:[],
+        pushncshow2:false,
+        searchCondition:{},
+        pushconfirmflag: false,
+        footershow:true,
+        footershow3:false,
+    }
+    },
+    ready() {
+      this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
+      this.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
+      this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString() +' 00:00:00'
+      this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()+' 23:59:59'
+      for(var item in exportConfig.dataOtherReportConfig){
+        this.selectfields.push(item)
+      }
+      // this.search()
+    },
+    methods: {
+      //推送数据
+      pushncdata(){
+        this.$refs.pushmanage.pushncdata();
+      },
+      //关闭推送确认窗口
+      closeCode(){
+        this.$refs.pushmanage.newmodel = {};
+        this.$refs.pushmanage.showmone = false;
+        this.pushconfirmflag = false;
+      },
+      //显示交账页面
+      showpushconfirm(){
+        this.search();
+        if(this.searchCondition.condition!=null && this.searchCondition.condition!='' && this.searchCondition.condition.includes("f_gasproperties") || this.searchCondition.condition.includes("f_type") ){
+          //this.$showMessage("交账失败,本次交账未保存,只能交账一天的数据,请确认交账时间后重新交账!!");
+          this.$showMessage("交账失败,本次交账未保存,请取消用气性质或操作类型选项,当前时间段内只允许交账一次!!");
+          return;
+        }
+        if(this.searchCondition.condition!=null && this.searchCondition.condition!='' && !this.searchCondition.condition.includes("f_state")){
+          this.$showAlert('请选择操作状态为有效进行交账!!','warning',2000);
+          return;
+        }
+        this.$showMessage("请进行一次查询后进行交账,",['confirm','cancel']).then(res=>{
+          if(res == 'confirm'){
+            this.pushconfirm();
+          }
+        })
+      },
+      pushconfirm(){
+        this.pushconfirmflag = true;
+      },
+      showmsg(obj){
+        this.criteriaShow = false
+        this.$emit('close')
+        this.rowdata=obj
+        this.listpage=true
+      },
+      cancel() {
+        this.listpage = false
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch(args) {
+        let f_orgstr = this.orgCondtionStr
+        if (!this.orgCondtionStr) {
+          f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
+        }
+        args.condition = `${args.condition} ` + f_orgstr
+
+        this.model.params.startDate = this.$refs.paged.$refs.cri.model.f_startDate
+        this.model.params.endDate = this.$refs.paged.$refs.cri.model.f_endDate
+
+        //推送条件: 需要 选择公司,部门
+        if(this.depname != null  && this.depname != '' ){
+          this.pushncshow2 = true;
+        }else{
+          this.pushncshow2= false;
+        }
+        this.searchCondition = this.getCondition;
+        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.$dispatch('getdata', this.sumsmodel)
+      },
+      getRes(condition, obj) {
+        //判断最新组织和存储组织不同时,清空已经选择人员
+        if(obj.depnames[0] != this.depname){
+          this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
+        }
+        this.orgCondtionStr = condition;
+        this.orgname = obj.orgnames[0];
+        this.depname = obj.depnames[0];
+        if(obj.operatornames.length>0){
+          this.operaname =obj.operatornames[0];
+        }else{
+          this.operaname='';
+        }
+        //当未选中组织时不可进行推送
+        if(this.depname == null || this.depname == '' ){
+          this.pushncshow2 = false;
+        }else{
+          this.pushncshow2 = true;
+        }
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = [];
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].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] = '';
+        })
+        this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()+' 00:00:00';
+        this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()+ ' 23:59:59';
+      },
+      close() {
+        this.printshow = false
+      },
+      getfield() {
+
+        return exportConfig.dataOtherReportConfig
+      },
+      show() {
+        this.pushncshow2 = !this.pushncshow2;
+        this.criteriaShow = !this.criteriaShow
+        if (this.criteriaShow) {
+          this.$emit('show')
+        } else {
+          this.$emit('close')
+        }
+      },
+      /*sort(field, rule) {
+        console.log('sort...')
+
+      },*/
+      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.orderDefault}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
+  },
+  events:{
+      'showtogglefooter'(){
+        this.footershow=true;
+      },
+      'hiddentogglefooter'(){
+        this.footershow=false
+      },
+      'confirmcolse'(){
+        this.pushconfirmflag = false;
+      },
+      'openbutton'(){
+        this.footershow3=true;
+      },
+      'closebutton'(){
+        this.footershow3=false;
+      }
+  },
+  computed: {
+    getCondition() {
+
+      return {
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+        startDate: this.$refs.paged.$refs.cri.model.f_startDate,
+        endDate: this.$refs.paged.$refs.cri.model.f_endDate,
+        orderitem: this.model.paramSource.orderitem.split("'")[1].split("'")[0]
+      }
+    },
+    getfield() {
+      //设置默认值
+
+      return exportConfig.dataOtherReportConfig
+    },
+    gasproperties() {
+      console.log("xxx");
+      console.log(this.$appdata.getParam('用气性质'));
+      console.log(this);
+      let options = this.$appdata.getParam('用气性质')
+      let resultoptions = [];
+      if(options.length>0){
+        resultoptions.push({label: ' 全部 ', value: ''})
+        options.forEach((item)=>{
+          console.log(item)
+          resultoptions.push(item)
+        })
+      }
+      console.log(resultoptions);
+      return resultoptions;
+      //return [{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')]
+    }
+  },
+  watch:{
+      'pushncshow2'(val){
+        if(val){
+          this.search();
+        }
+      }
+  }
+  }
+
+</script>
+
+<style scoped>
+
+  .col {
+    width: 300px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+</style>