manage-client 3.2.112 → 3.2.115

package/build/dev-server.js

@@ -1,176 +1,176 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan='http://119.146.1.106:8300/'
-var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://192.168.50.4:8400'
-// var fuwu = 'http://203.57.101.233:9001'
-var system = 'http://192.168.50.4:8400'
-//192.168.
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
-var proxyTable = {
-  '/rs/logic/exportfile': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: bendi
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: bendi
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
+var shaoguan='http://119.146.1.106:8300/'
+var qtx='http://36.103.222.144:6300/'
+var bendi = 'http://127.0.0.1:8090'
+// var bendi = 'http://172.168.1.11:9001'
+var fuwu = 'http://192.168.50.4:8400'
+// var fuwu = 'http://203.57.101.233:9001'
+var system = 'http://192.168.50.4:8400'
+//192.168.
+//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
+// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
+var proxyTable = {
+  '/rs/logic/exportfile': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

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.115",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/SellReport/SellDepReport.vue

@@ -24,7 +24,8 @@
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
                           :format="'yyyy-MM-dd 23:59:59'"
-                          :show-reset-button="reset">
+                          :show-reset-button="reset"
+                          :disabled="$parent.$parent.noshow">
               </datepicker>
             </div>
             <div class="col-sm-2">

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': '客户地址'
   },
@@ -605,7 +611,7 @@ export default{
   },
   GasStatistics: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_gascode': '燃气证号', 'f_meternumber': '表号',
-    'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
+    'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_user_nature': '用气类型','f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
     'f_oughtamount': '期间用气量', 'f_oughtfee': '期间用气金额', 'f_collection': '期末充值金额', 'f_curbalance': '期末余额', 'f_gas_state': '用气状态', 'f_changetable_state': '是否换表', 'f_input_date': '最后通讯日期'
   },
   ArrearageConfig: {

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>