manage-client 1.22.31-ca → 1.22.34-ca

package/build/dev-server.js

@@ -1,96 +1,102 @@
-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()
-
-var bendi = 'http://192.168.2.84:7003/', changan = 'http://192.168.2.84:7003/'
-var proxyTable = {
-  // 查找资源服务数据
-  '/rs/sql/manageSingleTable': {
-    target:changan
-  },
-  '/rs/sql/AbndonQuery': {
-    target:'http://127.0.0.1:8081/'
-  },
-  '/rs/search': {
-    target: changan
-  },
-  '/rs/logic/getLogin': {
-    target: changan
-  },
-  '/rs/logic/getInitData': {
-    target: changan
-  },
-  '/rs/logic/getSaleInitData': {
-    target: changan
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: changan
-  },
-  '/rs/data': {
-    target: changan
-  },
-  '/rs/license': {
-    target: changan
-  },
-  '/xyhf/rs/xyhf': {
-    target: changan
-  },
-  '/rs': {
-    //target: changan
-    target: changan
-  }
-}
-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')())
-
-// 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'))
-
-
-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()
+
+var bendi = 'http://127.0.0.1:8081/', changan = 'http://192.168.2.84:7003/'
+var proxyTable = {
+  // 查找资源服务数据
+  '/rs/sql/manageSingleTable': {
+    target:changan
+  },
+  '/rs/sql/AbndonQuery': {
+    target:'http://127.0.0.1:8081/'
+  },
+  '/rs/search': {
+    target: changan
+  },
+  '/rs/logic/getLogin': {
+    target: changan
+  },
+  '/rs/logic/getInitData': {
+    target: changan
+  },
+  '/rs/logic/getSaleInitData': {
+    target: changan
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: changan
+  },
+  '/rs/data': {
+    target: changan
+  },
+  '/rs/license': {
+    target: changan
+  },
+  '/xyhf/rs/xyhf': {
+    target: changan
+  },
+  '/rs/sql': {
+    target: bendi
+  },
+  '/rs/logic/exportfile': {
+    target: bendi
+  },
+  '/rs': {
+    //target: changan
+    target: changan
+  }
+}
+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')())
+
+// 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'))
+
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/client.iml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
-    <src_description expected_position="0" />
-  </component>
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/bin" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
+    <src_description expected_position="0" />
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
+  </component>
 </module>

package/index.html

@@ -1,28 +1,28 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <META HTTP-EQUIV="pragma" CONTENT="no-cache">
-  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
-  <META HTTP-EQUIV="expires" CONTENT="0">
-  <title>奥枫信息系统</title>
-  <style media="screen">
-    /*url(./static/newmainbg.jpg)*/
-    body {
-      width: 100%;
-      background: #7f8eaf no-repeat center bottom;
-      background-size: cover;
-    }
-
-    body .loginbg {
-      width: 100%;
-      height: 100%;
-      background: url(./static/loginbg.jpg) no-repeat center top;
-    }
-  </style>
-</head>
-<body class="themeOne">
-<app></app>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <META HTTP-EQUIV="pragma" CONTENT="no-cache">
+  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
+  <META HTTP-EQUIV="expires" CONTENT="0">
+  <title>奥枫信息系统</title>
+  <style media="screen">
+    /*url(./static/newmainbg.jpg)*/
+    body {
+      width: 100%;
+      background: #7f8eaf no-repeat center bottom;
+      background-size: cover;
+    }
+
+    body .loginbg {
+      width: 100%;
+      height: 100%;
+      background: url(./static/loginbg.jpg) no-repeat center top;
+    }
+  </style>
+</head>
+<body class="themeOne">
+<app></app>
+</body>
+</html>

package/package.json

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

package/src/App.vue

@@ -1,28 +1,28 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <!--<route :comp="{name: 'manage-home'}"></route>-->
-          <!--<route :comp="{name: 'meter-reading'}"></route>-->
-          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
-          <!--<route :comp="{name: 'vender-management'}"></route>-->
-          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
-          <route :comp="{name: 'login'}"></route>
-          <!-- <route :comp="{name: 'load-data'}"></route> -->
-          <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
-          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-export default {
-
-
-}
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <!--<route :comp="{name: 'manage-home'}"></route>-->
+          <!--<route :comp="{name: 'meter-reading'}"></route>-->
+          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
+          <!--<route :comp="{name: 'vender-management'}"></route>-->
+          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
+          <route :comp="{name: 'login'}"></route>
+          <!-- <route :comp="{name: 'load-data'}"></route> -->
+          <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
+          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+
+
+}
+</script>

package/src/components/MeterManage/ChangeMeterQuery.vue

@@ -1,140 +1,140 @@
-<template >
-  <div id="stand-work-list" class="flex bg-white p-10">
-    <div class="height:auto">
-      <criteria-paged :model="model" v-ref:paged  >
-        <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
-          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-            <div class="row" width="100%">
-              <div class="col-sm-4" >
-                <label class="font_normal_body" >&nbsp;开始时间</label>
-                <datepicker placeholder="起始时间" style="width:60%"
-                            :value.sync="model.f_start_date"
-                            v-model="model.f_start_date"
-                            :format="'yyyy-MM-dd'"
-                            condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')"
-                ></datepicker>
-              </div>
-              <div class="col-sm-4" >
-                <label class="font_normal_body" >结束时间</label>
-                <datepicker placeholder="结束时间" style="width:60%"
-                            :value.sync="model.f_end_date"
-                            v-model="model.f_end_date"
-                            :format="'yyyy-MM-dd'"
-                            condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')"
-                ></datepicker>
-              </div>
-              <div class="col-sm-4" >
-                <label class="font_normal_body" >状态</label>
-                <v-select :value.sync="model.f_state"
-                          v-model="model.f_state"
-                          style="width:60%"
-                          :options='$parent.$parent.charge_state' placeholder='请选择'
-                          condition="f_state = '{}'"
-                          close-on-select></v-select>
-              </div>
-              <div class="span" style="float:right;">
-                <button class="btn btn-success"  @click="search()" v-el:cba>查询</button>
-              </div>
-            </div>
-          </div>
-        </criteria>
-        <data-grid :model="model" partial='list' v-ref:grid>
-          <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>
-            </tr>
-          </template>
-          <template partial='body' partial='list' v-ref:grid>
-            <tr >
-              <td style="text-align: center;"><nobr>{{row.f_type}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_newmeter_base}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_newcard_id}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_changemeter_date}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
-              <td style="text-align: center;"><button type="button link" @click ="$parent.$parent.$parent.showImg(row)">查看</button></td>
-            </tr>
-          </template>
-          <template partial='foot'></template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-    <modal :show.sync="show"   title="照片查看" v-ref:modal large backdrop="false">
-      <div slot="title">
-        {{ "查询换表图片" }}
-      </div>
-      <article slot="modal-body" class="modal-body" style="height:80vh">
-        <div class="col-sm-4" style="height:auto;padding:10px" v-for="row in imgs">
-          <img-self :src="'/RestWork/rs/file/getfile/'+row.url" width="100%" height="100%"></img-self>
-        </div>
-      </article>
-      <footer slot="modal-footer" style="display: none">
-      </footer>
-    </modal>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-
-  export default {
-    title: '收费',
-    data () {
-      return {
-        condition: '1=1',
-        imgs:[],
-        model: new PagedList('rs/sql/changeMeterQuery', 15),
-        charge_state: this.$appdata.getParam('收费状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('收费状态')] : [],
-        row: null,
-        isdeal: true,
-        show: false
-    }
-    },
-    props:
-      {
-        searchdata:{},
-        isdeal: {},
-        args:{}
-      },
-    ready () {
-      this.$refs.paged.$refs.criteria.model.f_state = ['有效']
-      this.$refs.paged.$refs.criteria.search()
-    },
-    methods: {
-      showImg(row){
-        this.show = true
-        this.imgs = JSON.parse(row.f_pay_person)
-      },
-      search(args){
-        if(this.args && this.args.model) {
-          this.condition=this.condition+` and   f_state='有效' `
-          if(this.searchdata.f_user_id) {
-            this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.searchdata.f_user_id}'`
-          } else if(this.searchdata.f_card_id){
-            this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_card_id = '${this.searchdata.f_card_id}'`
-          }else if(this.searchdata.f_userinfo_id) {
-            this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userinfo_id = '${this.searchdata.f_userinfo_id}'`
-          }else {
-            return
-          }
-          this.model.search(this.condition, this.args.model)
-        }
-      }
-    },
-    watch:{
-      args(val){
-        this.search()
-      }
-    }
-  }
-</script>
+<template >
+  <div id="stand-work-list" class="flex bg-white p-10">
+    <div class="height:auto">
+      <criteria-paged :model="model" v-ref:paged  >
+        <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row" width="100%">
+              <div class="col-sm-4" >
+                <label class="font_normal_body" >&nbsp;开始时间</label>
+                <datepicker placeholder="起始时间" style="width:60%"
+                            :value.sync="model.f_start_date"
+                            v-model="model.f_start_date"
+                            :format="'yyyy-MM-dd'"
+                            condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')"
+                ></datepicker>
+              </div>
+              <div class="col-sm-4" >
+                <label class="font_normal_body" >结束时间</label>
+                <datepicker placeholder="结束时间" style="width:60%"
+                            :value.sync="model.f_end_date"
+                            v-model="model.f_end_date"
+                            :format="'yyyy-MM-dd'"
+                            condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')"
+                ></datepicker>
+              </div>
+              <div class="col-sm-4" >
+                <label class="font_normal_body" >状态</label>
+                <v-select :value.sync="model.f_state"
+                          v-model="model.f_state"
+                          style="width:60%"
+                          :options='$parent.$parent.charge_state' placeholder='请选择'
+                          condition="f_state = '{}'"
+                          close-on-select></v-select>
+              </div>
+              <div class="span" style="float:right;">
+                <button class="btn btn-success"  @click="search()" v-el:cba>查询</button>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid>
+          <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>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align: center;"><nobr>{{row.f_type}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changemeter_fee}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_newmeter_base}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_newcard_id}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changemeter_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
+              <td style="text-align: center;"><button type="button" class="btn btn-link" v-if="row.f_pay_person" @click ="$parent.$parent.$parent.showImg(row)">查看</button></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+    <modal :show.sync="show"   title="照片查看" v-ref:modal large backdrop="false">
+      <div slot="title">
+        {{ "查询换表图片" }}
+      </div>
+      <article slot="modal-body" class="modal-body" style="height:80vh">
+        <div class="col-sm-4" style="height:auto;padding:10px" v-for="row in imgs">
+          <img-self :src="'/RestWork/rs/file/getfile/'+row.url" width="100%" height="100%"></img-self>
+        </div>
+      </article>
+      <footer slot="modal-footer" style="display: none">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: '收费',
+    data () {
+      return {
+        condition: '1=1',
+        imgs:[],
+        model: new PagedList('rs/sql/changeMeterQuery', 15),
+        charge_state: this.$appdata.getParam('收费状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('收费状态')] : [],
+        row: null,
+        isdeal: true,
+        show: false
+    }
+    },
+    props:
+      {
+        searchdata:{},
+        isdeal: {},
+        args:{}
+      },
+    ready () {
+      this.$refs.paged.$refs.criteria.model.f_state = ['有效']
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      showImg(row){
+        this.show = true
+        this.imgs = JSON.parse(row.f_pay_person)
+      },
+      search(args){
+        if(this.args && this.args.model) {
+          this.condition=this.condition+` and   f_state='有效' `
+          if(this.searchdata.f_user_id) {
+            this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.searchdata.f_user_id}'`
+          } else if(this.searchdata.f_card_id){
+            this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_card_id = '${this.searchdata.f_card_id}'`
+          }else if(this.searchdata.f_userinfo_id) {
+            this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userinfo_id = '${this.searchdata.f_userinfo_id}'`
+          }else {
+            return
+          }
+          this.model.search(this.condition, this.args.model)
+        }
+      }
+    },
+    watch:{
+      args(val){
+        this.search()
+      }
+    }
+  }
+</script>