manage-client 1.8.23-33 → 1.8.23-34

package/build/dev-server.js

@@ -1,155 +1,155 @@
-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 str = 'http://112.35.127.105:8300/', str2 = 'http://112.35.127.105:8300/'
-var proxyTable = {
-  /*'/rs/logic/exportfile': {
-    target: str2
-  },*/
-  '/file': {
-    target: str
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: str
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: str
-  },
-  '/rs/path/getParams': {
-    target: str
-  },
-  '/rs/logic/getInitData': {
-    target: str
-  },
-  '/rs/data': {
-    target: str
-  },
-  '/rs/license': {
-    target: str
-  },
-  '/rs/db': {
-    target: str
-  },
-  '/excel': {
-    target: str
-  },
-
-  '/rs/logic/getSaleInitData': {
-    target: str
-  },
-  '/rs/logic/getLogin': {
-    target: str
-  },
-  '/rs/config': {
-    target: 'http://127.0.0.1:8080/manage'
-  },
-  '/rs/sql/getLicenseById': {
-    target: str
-  },
-  /*'/rs/Invoice': {
-    target: 'http://127.0.0.1:8090/Invoice/rs/aisino/invoice'
-  },*/
-  '/rs/report': {
-    //target: 'http://127.0.0.1:8080/manage'
-    target:  'http://127.0.0.1:8081'
-  },
-  '/rs/vue': {
-    // target: 'http://127.0.0.1:8089/manage'
-    target: str
-  },
-  '/rs': {
-    //target: 'http://127.0.0.1:8080'
-    // target: 'http://192.168.50.203:8082/manage'
-     target: str
-  }
-}
-
-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'))
-
-// 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()
+
+var str = 'http://112.35.127.105:8300/', str2 = 'http://127.0.0.1:8086/'
+var proxyTable = {
+  /*'/rs/logic/exportfile': {
+    target: str2
+  },*/
+  '/file': {
+    target: str
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: str
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: str
+  },
+  '/rs/path/getParams': {
+    target: str
+  },
+  '/rs/logic/getInitData': {
+    target: str
+  },
+  '/rs/data': {
+    target: str
+  },
+  '/rs/license': {
+    target: str
+  },
+  '/rs/db': {
+    target: str
+  },
+  '/excel': {
+    target: str
+  },
+
+  '/rs/logic/getSaleInitData': {
+    target: str
+  },
+  '/rs/logic/getLogin': {
+    target: str
+  },
+  '/rs/config': {
+    target: 'http://127.0.0.1:8080/manage'
+  },
+  '/rs/sql/getLicenseById': {
+    target: str
+  },
+  /*'/rs/Invoice': {
+    target: 'http://127.0.0.1:8090/Invoice/rs/aisino/invoice'
+  },*/
+  '/rs/report': {
+    //target: 'http://127.0.0.1:8080/manage'
+    target:  'http://127.0.0.1:8081'
+  },
+  '/rs/vue': {
+    // target: 'http://127.0.0.1:8089/manage'
+    target: str
+  },
+  '/rs': {
+    //target: 'http://127.0.0.1:8080'
+    // target: 'http://192.168.50.203:8082/manage'
+     target: str2
+  }
+}
+
+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'))
+
+// 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/package.json

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

package/src/components/sale/businessquery/UserCountMake.vue

@@ -0,0 +1,273 @@
+<template >
+  <div id="stand-work-list" class="datapanel flex bg-white p-10">
+    <criteria-paged :model="model" v-ref:paged >
+      <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
+        <div novalidate class="auto form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">卡&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+              <input  type="text" class="input_search _zoom6"
+                      v-model="model.f_card_id" placeholder='卡号'
+                      condition="f_card_id like '%{}%'">
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名</label>
+              <input  type="text" class="input_search _zoom6"
+                      v-model="model.f_user_name" placeholder='姓名'
+                      condition="f_user_name like '%{}%'">
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">小区名称</label>
+              <input  type="text" class="input_search _zoom6"
+                      v-model="model.f_residential_area" placeholder='小区名称'
+                      condition="f_residential_area like '%{}%'">
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">所属区域</label>
+              <v-select :value.sync="model.f_slice_area"
+                        v-model="model.f_slice_area"
+                        :options='$parent.$parent.sliceArea' placeholder='所属区域'
+                        condition="f_slice_area = '{}'"
+                        close-on-select></v-select>
+            </div>
+
+            <div class="span" style="float:right;">
+              <button type="button" name="button" class="button_search" @click="search(),$dispatch('search')">查询</button>
+              <button type="button" name="button" class="button_clear" @click="$parent.$parent.clearmsg">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            :sumsmodel="$parent.$parent.sumsmodel"
+                            sqlurl="rs/logic/exportfile" sql-name="userCount" template-name='居民小区统计'  :choose-col="true"></export-excel>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">用户类型</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 form-fix-width" >
+              <label class="font_normal_body _zoom4">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties"
+                        v-model="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties' placeholder='用气性质'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">用气设备</label>
+              <v-select :value.sync="model.f_devices_type"
+                        v-model="model.f_devices_type"
+                        :options='$parent.$parent.deviceTypes' placeholder='用气设备'
+                        condition="f_devices_type like '%{}%'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址</label>
+              <input  type="text" class="input_search _zoom6"
+                      v-model="model.f_address" placeholder='地址'
+                      condition="f_address like '%{}%'"
+              >
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">用&nbsp;&nbsp;气&nbsp;点</label>
+              <input  type="text" class="input_search _zoom6"
+                      v-model="model.f_usegas_point" placeholder='用气点'
+                      condition="f_usegas_point like '%{}%'"
+              >
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">购气量大于</label>
+              <input type="number" class="input_search _zoom6"
+                     v-model="model.buggasmax"
+                     condition="gas > {}" placeholder="购气量大于">
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">购气量小于</label>
+              <input type="number" class="input_search _zoom6"
+                     v-model="model.buggasmin"
+                     condition="gas < {}" placeholder="购气量小于">
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">气价名称</label>
+              <v-select :value.sync="model.f_price_name"
+                        v-model="model.f_price_name"
+                        :options='$parent.$parent.pricenames' placeholder='气价名称'
+                        condition="f_price_name = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">开始时间</label>
+              <datepicker placeholder="售气开始时间" class="_zoom6"
+                          :value.sync="model.selldate_start"
+                          v-model="model.selldate_start"
+                          :format="'yyyy-MM-dd'"
+              ></datepicker>
+            </div>
+            <div class="col-sm-2 form-group form-fix-width" >
+              <label class="font_normal_body _zoom4">结束时间</label>
+              <datepicker placeholder="售气结束时间" class="_zoom6"
+                          :value.sync="model.selldate_end"
+                          v-model="model.selldate_end"
+                          :format="'yyyy-MM-dd'"
+              ></datepicker>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  partial='list' class="list_area table_sy" v-ref:grid :model="model">
+        <template partial='head'>
+          <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>
+        </template>
+        <template partial='body'>
+          <th ><nobr>{{row.index+1}}</nobr></th>
+          <th ><nobr>{{row.f_residential_area}}</nobr></th>
+          <th ><nobr>{{row.f_distinct}}</nobr></th>
+          <th ><nobr>{{row.f_opera_area}}</nobr></th>
+          <th ><nobr>{{row.f_street}}</nobr></th>
+          <th><nobr>{{row.builunm}}</nobr></th>
+          <th><nobr></nobr></th>
+          <th><nobr>{{row.usernum}}</nobr></th>
+          <th ><nobr>{{row.bglnum}}</nobr></th>
+          <th><nobr>{{row.fbglnum}}</nobr></th>
+          <th><nobr>{{row.zcnum}}</nobr></th>
+          <th><nobr>{{row.tynum}}</nobr></th>
+          <th><nobr>{{row.ccnum}}</nobr></th>
+        </template>
+      </data-grid>
+    </criteria-paged>
+    <table class="table-hover" >
+      <tr 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">户数合计:&emsp;{{}}</td>
+      </tr>
+    </table>
+  </div>
+</template>
+<style scoped>
+.table {
+  width: 100%;
+  max-width: 100%;
+  margin-bottom: 0px;
+}
+/* >>> .pager{*/
+/*  position: relative;*/
+/*  bottom: 9px;*/
+/*}*/
+
+</style>
+<script>
+import { PagedList , HttpResetClass} from 'vue-client'
+export default {
+  title: '小区统计',
+  data () {
+    return {
+      model: new PagedList('rs/sql/userCount', 20,
+        {
+          startDate: 'this.model.selldate_start',
+          endDate: 'this.model.selldate_end'
+        }),
+      usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+      deviceTypes: this.$appdata.getParam('设备类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')] : [],
+      row: null,
+      show: false,
+      sumsmodel: {},
+      pricenames:[],
+      criteriaShow:false
+    }
+  },
+  props: {
+
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.selldate_start =  this.$login.toStandardDateString()
+    this.$refs.paged.$refs.criteria.model.selldate_end = this.$login.toStandardDateString()
+    let http = new HttpResetClass()
+    http.load('POST','rs/sql/querySingleTable',{
+      data:{
+        items: ' f_price_name ',
+        tablename: 't_stairprice',
+        condition: ' 1 = 1'
+      }},{resolveMsg:null,rejectMsg:'获取气价失败'}).then((res) => {
+      console.log('初始化气价。。')
+      let priceArr = []
+      res.data.forEach((item) => {
+        let temp = {}
+        temp.label = item.f_price_name
+        temp.value = item.f_price_name
+        priceArr.push(temp)
+      })
+      this.pricenames = [{label: '全部',value: ''},...priceArr]
+      console.log(JSON.stringify(this.pricenames))
+    })
+  },
+  watch: {
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search(args) {
+      this.model.search(args.condition, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+    },
+    clearmsg(){
+      this.$refs.paged.$refs.criteria.model={}
+    },
+  },
+  computed: {
+    getCondition(){
+      return {
+        condition: `${this.$refs.paged.$refs.criteria.condition} `,
+        startDate: this.$refs.paged.$refs.criteria.model.selldate_start,
+        endDate:  this.$refs.paged.$refs.criteria.model.selldate_end
+      }
+    },
+    getfield(){
+      let Config={
+        'f_card_id': '卡号',
+        'f_user_name': '姓名',
+        'f_use_company': '单位名称',
+        'f_residential_area': '小区名称',
+        'f_user_type': '用户类型',
+        'f_gasproperties': '用气性质',
+        'f_address': '地址',
+        'f_usegas_point':'用气点',
+        'gas': '气量',
+        'money': '金额',
+        'c': '笔数',
+      }
+      return Config
+    },
+    sliceArea () {
+      return this.$appdata.getParam('所属区域')
+    },
+    gasproperties () {
+      let rs = []
+      if (this.$refs.paged.$refs.criteria.model.f_user_type.length === 1) {
+        rs = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+      }
+      return [{label: '全部', value: ''}, ...rs]
+    },
+  }
+}
+</script>