manage-client 3.2.112 → 3.2.113

package/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

package/package.json

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

package/src/components/sale/config/exportConfig.js

@@ -95,6 +95,9 @@ export default{
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
     'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员','f_residential_area':'小区','f_serial_number':'业务单号'
   },
+  loginQueryConfig:{
+    'f_userinfo_id': '登录人编号','f_user_name': '登录人名称', 'logindate': '登录时间', 'type': '类型'
+  },
   pricetypeGasConfig: {
     'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'
   },
@@ -104,6 +107,9 @@ export default{
   chargeexportConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_pregas': '气量', 'f_collection': '收款', 'f_stairamount1': '一阶气量', 'f_stair2amount': '二阶气量', 'f_stair3amount': '三阶气量'
   },
+  loginQueryexportConfig:{
+    'f_userinfo_id': '登录人编号','f_user_name': '登录人名称', 'logindate': '登录时间', 'type': '类型'
+  },
   reverseexportConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址'
   },

package/src/components/sale/resourcequery/LoginQuery.vue

@@ -0,0 +1,244 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <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 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"
+                              condition="logindate >= '{}'">
+                  </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"
+                              condition="logindate <= '{}'">
+                  </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.userid"
+                         condition="userid = '{}' " 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.username"
+                         condition="username like '%{}%'" 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" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                :defaultselect="$parent.$parent.defaultexport"
+                                sqlurl="rs/logic/exportfile" sql-name="manage_singleTable" template-name='登录信息查询导出'
+                                :choose-col="true">
+                  </export-excel>
+                  <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">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">类&emsp;&emsp;型</label>
+                  <v-select :value.sync="model.type"
+                            :options='$parent.$parent.logintype' placeholder='请选择' v-model="model.type"
+                            condition="type = '{}'"
+                            :value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <data-order field="userid" name="登录人编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.userid">
+                  </data-order>
+                </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.userid}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.username}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.logindate}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.type}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import exportConfig from '../config/exportConfig'
+    export default {
+    title: '登录信息查询',
+     data() {
+      return {
+        other:[],
+        footer:[],
+        config: {
+          defaultPrint: ['userid', 'username', 'logindate']
+        },
+        //排序
+        orderitem:'logindate desc',
+        orderFields: {
+          logindate: ''
+        },
+        data: {},
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        model: new PagedList('rs/sql/manage_singleTable', 50, {items: '"*"', tablename: '"t_loginrecord"', orderitem: this.orderitem?'"' + this.orderitem + ' "':`'logindate desc'`}),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        defaultfield: [],
+        sumsmodel: {},
+        logintype:[
+          {label: '登入', value: '登入'},
+          {label: '登出', value: '登出'}
+        ],
+        showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
+      }
+    },
+    ready() {
+      this.$refs.paged.$refs.cri.model.type = '登入'
+    },
+    methods: {
+      getotherfooter () {
+        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) {
+        let f_orgstr = this.orgCondtionStr
+        args.condition = `${args.condition} ` + f_orgstr
+        this.model.search(args.condition, args.model)
+      },
+      clear() {
+        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
+      },
+      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.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      }
+
+    },
+    events:{
+    },
+    watch: {
+      'model.rows'(val) {
+        //如果有合计 这里为true, 其他为false ,反正相反
+        this.showbottomsum=false;
+        if(val.length === 0){
+          this.sumsmodel = {}
+          this.showbottomsum=false;
+        }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
+    },
+    computed: {
+      chooserow(){
+        let aaa= true
+        if(this.$login.r && this.$login.r.includes('打印项选择')){
+           aaa =  false
+        }
+        return aaa
+      },
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " logindate desc"
+        }
+      },
+      getfield() {
+        return exportConfig.loginQueryConfig
+      },
+      defaultexport() {
+        return exportConfig.loginQueryexportConfig
+      }
+    }
+  }
+</script>

package/src/components/sale/resourcequery/ResourceManage.vue

@@ -0,0 +1,36 @@
+<template>
+  <tab-button class="foot_tabset" :active="-1">
+    <tabs header="登录查询" v-if="permission('登录查询')">
+      <login-query v-if="show.includes('登录查询')"></login-query>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from "../common/TabButton";
+  import Tabs from "../common/Tabs";
+
+  export default {
+    title: '登录查询',
+    data(){
+      return{
+        show: []
+      }
+    },
+    components: {Tabs, TabButton},
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/filiale/qianneng/UserQuery.vue

@@ -524,7 +524,7 @@
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
   import defaultPrint from '../../components/sale/config/DefaultPrint'
-  import exportConfig from '../../components/sale/config/exportConfig'
+  import exportConfig from './exportConfig'
 
   let readySomething = async function (self) {
     self.$MagGetSaleParam.initinputtor();

package/src/filiale/qianneng/exportConfig.js

@@ -1,35 +1,13 @@
 export default{
   arrearsConfig: {
-    'f_userinfo_code': '客户编号',
-    'f_user_name': '客户姓名',
-    'f_address': '地址',
-    'f_user_phone': '客户电话',
-    'f_rent_phone': '备用电话',
-    'f_residential_area': '小区名称',
-    'f_olduserinfo_code': '档案编号',
-    'f_book_no': '用户证号',
-    'f_meter_book_sort': '册内序号',
-    'f_inputtor': '抄表员',
-    'f_book_name': '抄表册',
-    'f_dainputtores': '档案抄表员',
-    'f_user_type': '客户类型',
-    'f_gasproperties': '用气性质',
-    'f_meter_classify': '气表类型',
-    'f_cost_type': '缴费类型',
-    'c': '欠费期数',
-    'f_hand_date': '欠费区间',
-    'f_last_tablebase': '上期抄表底数',
-    'f_tablebase': '本期抄表底数',
-    'f_oughtamount': '用气量',
-    'f_oughtfee': '用气金额',
-    'f_operate_date': '缴费时间',
-    'f_debt_money': '已交金额',
-    'f_oughtfee_new': '应交气费',
-    'overdue': '滞纳金',
-    'f_garbage_fee': '附加费',
-    'f_balance': '上期余额',
-    'f_oughtfee_all': '合计欠费',
-    'f_comments': '备注'
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '地址', 'f_user_phone': '客户电话',
+    'f_rent_phone': '备用电话', 'f_residential_area': '小区名称', 'f_olduserinfo_code': '档案编号', 'f_book_no': '用户证号',
+    'f_meter_book_sort': '册内序号', 'f_inputtor': '抄表员', 'f_book_name': '抄表册', 'f_dainputtores': '档案抄表员',
+    'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_meter_classify': '气表类型',
+    'f_cost_type': '缴费类型', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_last_tablebase': '上期抄表底数',
+    'f_tablebase': '本期抄表底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_operate_date': '缴费时间',
+    'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费', 'overdue': '滞纳金', 'f_garbage_fee': '附加费',
+    'f_balance': '上期余额', 'f_oughtfee_all': '合计欠费', 'f_comments': '备注'
   },
   chargeConfig: {
     'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
@@ -61,9 +39,17 @@ export default{
     'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
     'f_meter_brand': '气表品牌', 'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
     'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量',
-    'f_money': '收款',  'f_newbalance': '支出', 'f_newcurbalance': '收入','f_payment': '付款方式', 'f_state': '状态',
+    'f_money': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_state': '状态',
     'f_operate_date': '收费日期', 'f_service_person': '服务人员', 'f_comments': '备注',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
+  },
+  userConfig: { 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话',
+    'f_idnumber': '身份证号', 'f_balance': '账户余额', 'f_user_level': '客户等级', 'f_user_type': '用户类型',
+    'f_address': '客户地址', 'f_residential_area': '小区',
+    'f_building': '楼栋', 'f_unit': '单元', 'f_floor': '楼层', 'f_room': '门牌号',
+    'f_user_state': '客户状态', 'f_createfile_date': '建档日期', 'f_createfile_person': '建档人', 'f_comments': '备注',
+    'f_cost_type': '缴费类型', 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
+    'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号'
   }
 }