manage-client 4.1.88 → 4.1.90-linshi-dexin

package/build/dev-server.js

@@ -1,145 +1,145 @@
-const express = require('express')
-const webpack = require('webpack')
-const config = require('./webpack.dev.conf')
-const proxyMiddleware = require('http-proxy-middleware')
-
-const app = express()
-const compiler = webpack(config)
-
-const server = 'http://192.168.50.67:31567/'
-const local = 'http://127.0.0.1:9026/'
-const proxyTable = {
-  '/rs/logic/exportfile': {
-    target: server
-  },
-  '/dataManage': {
-    target: server
-  },
-  '/api/af-revenue/sql/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
-  },
-  '/api/af-revenue/report/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
-  },
-  '/api/af-revenue/logic': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
-  },
-  '/api': {
-    target: server
-  },
-  '/rs/sql/chargeQuery_by_gasproperties': {
-    target: server
-  },
-  '/rs/logic/chargeQuery_by_gasproperties_line': {
-    target: server
-  },
-  '/files': {
-    target: server
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: server
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: server
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: server
-  },
-  '/rs/logic/getSaleInitData': {
-    target: server
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: server
-  },
-  '/rs/path/getParams': {
-    target: server
-  },
-  '/rs/data': {
-    target: server
-  },
-  '/rs/license': {
-    target: server
-  },
-  '/rs/db': {
-    target: server
-  },
-  '/excel': {
-    target: server
-  },
-  '/rs/config': {
-    target: server
-  },
-  '/rs/sql/getLicenseById': {
-    target: server
-  },
-  '/rs/report': {
-    target: server
-  },
-  '/rs/vue': {
-    target: server
-  },
-  '/rs/file': {
-    target: server
-  },
-  '/rs/sql/singleTable': {
-    target: server
-  },
-  '/rs': {
-    target: server
-  }
-}
-
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-const 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) {
-  let options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-app.use(require('connect-history-api-fallback')())
-
-app.use(devMiddleware)
-
-app.use(hotMiddleware)
-
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8015, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8015')
-})
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
+
+const app = express()
+const compiler = webpack(config)
+
+const server = 'http://222.83.114.229:31785/'
+const local = 'http://222.83.114.229:31785/'
+const proxyTable = {
+  '/rs/logic/exportfile': {
+    target: server
+  },
+  '/dataManage': {
+    target: server
+  },
+  '/api/af-revenue/sql/': {
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: local
+  },
+  '/api/af-revenue/report/': {
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: local
+  },
+  '/api/af-revenue/logic': {
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: local
+  },
+  '/api': {
+    target: server
+  },
+  '/rs/sql/chargeQuery_by_gasproperties': {
+    target: server
+  },
+  '/rs/logic/chargeQuery_by_gasproperties_line': {
+    target: server
+  },
+  '/files': {
+    target: server
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: server
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: server
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: server
+  },
+  '/rs/logic/getSaleInitData': {
+    target: server
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: server
+  },
+  '/rs/path/getParams': {
+    target: server
+  },
+  '/rs/data': {
+    target: server
+  },
+  '/rs/license': {
+    target: server
+  },
+  '/rs/db': {
+    target: server
+  },
+  '/excel': {
+    target: server
+  },
+  '/rs/config': {
+    target: server
+  },
+  '/rs/sql/getLicenseById': {
+    target: server
+  },
+  '/rs/report': {
+    target: server
+  },
+  '/rs/vue': {
+    target: server
+  },
+  '/rs/file': {
+    target: server
+  },
+  '/rs/sql/singleTable': {
+    target: server
+  },
+  '/rs': {
+    target: server
+  }
+}
+
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+const 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) {
+  let options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+app.use(require('connect-history-api-fallback')())
+
+app.use(devMiddleware)
+
+app.use(hotMiddleware)
+
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8015, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8015')
+})

package/package.json

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

package/src/components/SellReport/siyang/RHYJJSummary.vue

@@ -0,0 +1,200 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        v-model="model.f_user_type"
+                        multiple
+                        :options='$parent.$parent.user_type' placeholder='请选择'
+                        condition="f_user_type in {}"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties"
+                        v-model="model.f_gasproperties"
+                        multiple
+                        :options='$parent.$parent.gasproperties' placeholder='请选择'
+                        condition="f_gasproperties in {}"
+                        close-on-select></v-select>
+            </div>
+            <res-select-group :show-component="$parent.$parent.resshow"
+                              :selectin="true" :initres="$parent.$parent.initres"
+                              :cascade =true @re-res="$parent.$parent.getRes"
+                              v-ref:sel>
+            </res-select-group>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-excel>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">易家家报账单</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr >
+            <th v-if="false" :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.spans/3)'>报账人：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>数据审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>接收人：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+export default {
+  title: '易家家报账单',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      // f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      f_user_type: '',
+      f_gasproperties: '',
+      f_state: ['有效'],
+      model: new DataModel('api/af-revenue/report/rh_yjj_charge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow: ['company', 'department', 'operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = args.condition
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+      this.operatorname = obj.operatornames[0]
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
+        }
+      }
+      this.spans = len
+    }
+  },
+  computed: {
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    gasproperties () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>