manage-client 4.0.75 → 4.0.76

package/package.json

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

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

@@ -1372,8 +1372,12 @@ export default {
     'f_operator': '操作员名称'
   },
   usergas1: {
+    'f_userinfo_code': '用户编号',
+    'f_meternumber': '表号',
     'f_user_name': '用户名称',
-    'f_price': '气价',
+    'f_address': '用户地址',
+    'f_idnumber': '身份证号',
+    'f_price_name': '气价名称',
     'a': '售气量',
     'b': '金额'
   },

package/src/filiale/jingyang/sale.js

@@ -7,4 +7,8 @@ export default function () {
   Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
   // 物联网表用气量统计表新
   Vue.component('new-use-gas-statistics', (resolve) => { require(['./NewGasStatistics'], resolve) })
+  // 用户用气收费情况
+  Vue.component('usergas', (resolve) => {
+    require(['./usergas'], resolve)
+  })
 }

package/src/filiale/jingyang/usergas.vue

@@ -0,0 +1,355 @@
+<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-inline 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>
+                  <v-select :value.sync="model.f_user_type"
+                            :options='$parent.$parent.usertypes'
+                            @change="$parent.$parent.userTypeChange()"
+                            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>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </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_meternumber"
+                         condition="f_meternumber = '{}' " placeholder="表号">
+                </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_user_name"
+                         condition="f_user_name = '{}'" 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="usergaszong"
+                                template-name='用户用气费用表'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                               :defaultfield="$parent.$parent.defaultfield"
+                              titletable="用户用气费用表"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">身份证号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_idnumber"
+                         condition="u.f_idnumber = '{}'" placeholder="身份证号">
+                </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_address"
+                         condition="f_address = '{}'" placeholder="用户地址">
+                </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>
+              </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_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_idnumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.a}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.b}}</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;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              累计售气量合计:&emsp;{{sumsmodel.a}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              累计金额合计:&emsp;{{sumsmodel.b}}
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div v-if="show">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { PagedList } from 'vue-client'
+import defaultPrint from '../config/DefaultPrint'
+import exportConfig from './config/exportConfig.js'
+let readySomething = async function(self) {
+  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+  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.$MagLoadParams.loadParam()
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  title: '用户用气查询',
+  name: 'userags',
+  data () {
+    return {
+      defaultfield: [],
+      config: {
+        defaultPrint: ['f_price','f_user_type']
+      },
+      model: new PagedList('api/af-revenue/sql/usergaszong', 30, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
+        a: 0,
+        b: 0,
+      }),
+      other: [],
+      footer: [],
+      gasproperties:[],
+      show:false,
+      rowdata:{},
+      criteriaShow: false,
+      orgCondtionStr: '',
+      modelval: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      thead: '',
+      tfoot: '',
+      //合计数据
+      sumsmodel: {},
+      f_filialeid: this.$login.f.f_orgid,
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id
+    }
+  },
+  ready () {
+    console.log('选择的打印的字段')
+    console.log('hhhhhhhhh'+ this.$login.f.orgid)
+    // readySomething(this)
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  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.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);
+      let date = []
+      date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+      date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+      this.other.push(date)
+    },
+    userTypeChange () {
+      this.gasproperties=[]
+      if(this.$refs.paged.$refs.cri.model !==null) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties=''
+
+        console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+      }
+      else{
+        this.gasproperties =[{label: '全部', value: ''}]
+      }
+    },
+    search(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    cancel() {
+      this.show = false
+    },
+    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
+    },
+    showmsg(obj){
+      this.rowdata=obj
+      this.show=true
+    },
+    getRes(condition,obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+    },
+    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) {
+      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)
+    }
+  },
+  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.usergas1
+    },
+    usertypes() {
+      return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+  },
+  events: {
+
+  },
+  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
+    }
+  }
+}
+</script>
+<style>
+.datapanel {
+  color: #333;
+  background-color: white;
+  padding: 10px 20px;
+  border-radius:15px;
+}
+</style>