manage-client 3.3.179 → 3.3.181

package/src/filiale/meihekou/OtherChargeQuery.vue

@@ -2,7 +2,6 @@
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
-
         <criteria-paged :model="model" v-ref:paged>
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
@@ -41,8 +40,6 @@
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-                  <!--<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='其他收费查询导出'
@@ -54,7 +51,6 @@
                   <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"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
@@ -405,7 +401,7 @@
         tfoot: '',
         initres: {
           org:[this.$login.f.orgid],
-          dep:[],
+          dep:[this.$login.f.depids],
           user:[],
         },
         show:false,
@@ -426,6 +422,9 @@
       }
     },
     ready() {
+      console.log('=-=-=-=-=-=-=-=')
+      console.log(this.$login.f)
+      console.log('=-=-=-=-=-=-=-=')
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {

package/src/filiale/meihekou/UserSellHeadDetail.vue

@@ -0,0 +1,492 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="api/af-revenue/logic/openapi/exportfile"
+                                sql-name="userSellHandDetaill"
+                                template-name='用户余额分析导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="用户余额分析打印"
+                              :sumsmodel="$parent.$parent.sumsmodel">
+
+                  </print-data>
+
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" :show-component="['company']" 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"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            :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" title="参数名称:气表类型">气表类型</label>
+                  <v-select :value.sync="model.f_meter_type"
+                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
+                            condition="f_meter_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">地址</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户状态</label>
+                  <v-select
+                    placeholder='用户状态'
+                    value-single
+                    style="width:60%"
+                    :value.sync="model.f_user_state"
+                    v-model="model.f_user_state"
+                    :options='$parent.$parent.userstate'
+                    close-on-select condition="f_user_state ='{}'">
+                  </v-select>
+                </div>
+             </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid :classname="$parent.classname">
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>用户编号</nobr>
+                </th>
+                <th>
+                  <nobr>用户姓名</nobr>
+                </th>
+                <th>
+                  <nobr>用户类型</nobr>
+                </th>
+                <th>
+                  <nobr>气表类型</nobr>
+                </th>
+                <th>
+                  <nobr>用气量</nobr>
+                </th>
+                <th>
+                  <nobr>单价</nobr>
+                </th>
+                <th>
+                  <nobr>用气金额</nobr>
+                </th>
+                <th>
+                  <nobr>应收</nobr>
+                </th>
+                <th>
+                  <nobr>实收</nobr>
+                </th>
+                <th>
+                  <nobr>收费时间</nobr>
+                </th>
+               <th>
+                  <nobr>上期结余</nobr>
+                </th>
+               <th>
+                  <nobr>本期结余</nobr>
+                </th>
+               <th>
+                  <nobr>电话</nobr>
+                </th>
+               <th>
+                  <nobr>地址</nobr>
+                </th>
+               <th>
+                  <nobr>用户状态</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>{{row.f_userinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_classify}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_preamount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_collection}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_balance}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_curbalance}}</nobr>
+              </td>
+            <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
+            <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+            <td style="text-align: center;">
+                <nobr>{{row.f_user_state}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              结余合计:&emsp;{{sumsmodel.f_curbalance}}
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList, HttpResetClass} from 'vue-client'
+  import defaultPrint from './config/DefaultPrint'
+  import exportConfig from './config/exportConfig'
+
+  let readySomething = async function (self) {
+    //加载抄表册
+    self.$MagGetSaleParam.initinputtor();
+    self.getinputtores();
+    self.initmeterbook();
+    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()
+    await self.$getConfig(self, 'HandplanQuery')
+    console.log('抄表查询获取默认配置', self.config)
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    console.log('开始初始化参数', self.defaultfield)
+    await self.$MagLoadParams.loadParam()
+    // await self.$MagLoadParams.loadParam()
+    // self.initParams()
+    console.log('开始查询')
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    data() {
+      return {
+        data: {},
+        other: [],
+        footer: [],
+        model: new PagedList('rs/sql/userSellHandDetaill', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+          f_curbalance:0
+
+        }),
+        gasproperties:[],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        show:false,
+        rowdata:{},
+        criteriaShow: false,
+        residentialArea: [],
+        orgCondtionStr: '',
+        modelval: [],
+        inputtouPerson: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+
+        // 下拉框
+
+        //合计数据
+        sumsmodel: {},
+        defaultfield: [],
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name']
+        },
+        batchmoneyShow:false,
+        meterbooks:[{label: '全部',value: ''}],  //抄表册
+        tempfalg :false,
+        lastorgstr:'',
+        allorgid:[],
+        inputtores:[{label: '全部',value: ''}],  //抄表员
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      async initmeterbook(orgstr){
+        if(orgstr == null ){
+          orgstr = this.f_filialeid;
+        }
+        //获取新的抄表册,先去清理所有的抄表册
+        this.$GetSaleParam.meterbooks = [];
+        //开始加载新的抄表册
+        await this.$LoadParams.loadMeterBook(orgstr)
+        this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+      },
+      async getinputtores () {
+        // 获取抄表员
+        let rs = []
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
+        }
+        this.inputtores = [{label: '全部', value: ''}, ...rs]
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.inputtores = [];
+        this.inputtores.push({label: "全部", value: ""})
+        if(this.allorgid!=null){
+          this.allorgid.forEach((res)=>{
+            this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
+          })
+        }
+      },
+      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()
+      },
+      selfSearch(args) {
+        args.condition = `${args.condition} ` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        //部门和人员变为全选
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      async getRes(condition,obj) {
+        this.orgCondtionStr = condition
+
+      },
+      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
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      close() {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          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
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+      async 'orgCondtionStr'(val) {
+        this.$refs.paged.$refs.cri.model.f_inputtor = []
+        this.$refs.paged.$refs.cri.model.f_meter_book = []
+        this.meterbooks = [{label: '全部',value: ''}];
+        if(this.lastorgstr != val){
+          this.tempfalg = true;
+          this.lastorgstr = val;
+        }
+        if(this.tempfalg && val != null && val!=''  && val.indexOf("(")>-1){
+          this.tempfalg = false;
+          let a = val.substring(val.indexOf("(")+2)
+          await this.initmeterbook(a.substring(0,a.indexOf(")")-1));
+        }
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.f_filialeid = res[1]
+          if(res.input !=null){
+            let resorgid = res.input.substring(res.input.indexOf("'"));
+            if(resorgid!= null && resorgid!=''){
+              resorgid = resorgid.substring(0,resorgid.lastIndexOf("'")+1);
+              // resorgid = resorgid.replaceAll("'","");
+              resorgid = resorgid.replace(/'/g,"");
+              this.allorgid = resorgid.split(",")
+            }
+          }
+          this.updateParams()
+        }
+      },
+    },
+    computed: {
+      getCondition() {
+        return {
+          condition : `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          startDate : this.$refs.paged.$refs.cri.model.startDate,
+          endDate : this.$refs.paged.$refs.cri.model.endDate
+        }
+      },
+      getfield() {
+        return exportConfig.UserSellHeadDetailConfig
+      },
+      metertypes () {
+        return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
+      userstate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      }
+
+    }
+  }
+</script>

package/src/filiale/meihekou/config/exportConfig.js

@@ -263,8 +263,7 @@ export default{
     'f_preamount': '期间已缴','f_curbalance': '期末余额', 'f_user_balance': '最新余额'
   },
   BalanceTableConfig: {
-    'f_userinfo_code': '客户编号','f_user_name':'客户名称', 'f_balance': '期初余额','f_oughtfee': '期间应收',
-    'f_collection': '期间已收','f_last_balance': '期末余额', 'f_balances': '最新余额'
+    'f_userinfo_code': '用户编号','f_user_name': '用户姓名','f_user_type': '用户类型','f_meter_classify': '气表类型','f_gas': '用气量','f_price': '单价','f_money': '用气金额','f_preamount': '应收','f_collection': '实收','f_operate_date': '收费时间','f_balance': '上期结余','f_curbalance': '本期结余','f_user_phone': '电话','f_address': '地址','f_user_state': '用户状态'
   },
   UserSellHeadDetailConfig: {
     'f_userinfo_code': '用户编号','f_user_name':'用户名称','f_address':'用户地址', 'f_balance': '期初余额',

package/src/filiale/meihekou/sale.js

@@ -31,4 +31,9 @@ export default function () {
   Vue.component('meter-query', (resolve) => { require(['./MeterQuery'], resolve) })
   // 汇总查询
   Vue.component('collect-manage', (resolve) => { require(['./CollectManage'], resolve) })
+  // 用户余额分析
+  Vue.component('user-sell-head-detail', (resolve) => {
+    require(['./UserSellHeadDetail'], resolve)
+  })
+  Vue.component('area-general-query', (resolve) => { require(['./AreaGeneralQuery'], resolve) })
 }