manage-client 3.2.102 → 3.2.103-03-cs

package/build/dev-server.js

@@ -10,14 +10,13 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://127.0.0.1:8082'
-// fuwu = 'http://36.103.224.217:6300/'
+// 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://localhost:8082'
+var bendi = 'http://192.168.50.4:8400/'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://124.70.12.19:8400'
-// var fuwu = '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'

package/build/webpack.base.conf.js

@@ -1,13 +1,13 @@
 var path = require('path')
 var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
+
 module.exports = {
   entry: {
     app: './src/main.js'
   },
   output: {
-    path: path.resolve(__dirname, '../dist/static'),
-    publicPath: 'static/',
+    path: path.resolve(__dirname, '../dist/mergeUser'),
+    publicPath: 'mergeUser/',
     filename: '[name].js'
   },
   resolve: {
@@ -15,8 +15,7 @@ module.exports = {
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
       'src': path.resolve(__dirname, '../src'),
-      'test': path.resolve(__dirname, '../test'),
-      '@src': path.resolve('src')
+      'test': path.resolve(__dirname, '../test')
     }
   },
   resolveLoader: {
@@ -26,22 +25,23 @@ module.exports = {
     loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue-loader'
+        loader: 'vue'
       },
       {
         test: /\.js$/,
         loader: 'babel',
         include: [
-          `${projectRoot}\\src`,
-          `${projectRoot}\\build`,
-          `${projectRoot}\\examples`,
-          `${projectRoot}\\test`,
-          `${projectRoot}\\node_modules\\vue-client\\src`,
-          `${projectRoot}\\node_modules\\vue-strap\\src`,
-          `${projectRoot}\\node_modules\\system-clients\\src`,
-          `${projectRoot}\\node_modules\\sale-client\\src`,
-          `${projectRoot}\\node_modules\\ldap-clients\\src`,
-        ]
+          /src/,
+          /build/,
+          /examples/,
+          /singlepage/,
+          /test/,
+          /node_modules\/vue-client\/src/,
+          /node_modules\/vue-strap\/src/
+        ],
+        options: {
+          presets: ['es2015']
+        }
       },
       {
         test: /\.json$/,
@@ -60,7 +60,7 @@ module.exports = {
         loader: 'style!css'
       },
       {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf|TTF)(\?.*)?$/,
         loader: 'url',
         query: {
           limit: 10000,

package/build/webpack.prod.conf.js

@@ -1,24 +1,83 @@
-var webpack = require('webpack')
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.base.conf')
-var cssLoaders = require('./css-loaders')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
+const webpack = require('webpack')
+const merge = require('webpack-merge')
+const baseConfig = require('./webpack.base.conf')
+const cssLoaders = require('./css-loaders')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+// const HtmlWebpackPlugin = require('html-webpack-plugin')
+const FileManagerPlugin = require('filemanager-webpack-plugin')
+const ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin')
+const path = require('path')
+
+// 将日期时间进行格式化
+function formatDate (date, format) {
+  // name="date" type="Date" 要格式化的日期时间
+  // name="format" type="String" 格式类型，形如 yyyy-MM-dd hh:mm:ss
+  var o = {
+    'M+': date.getMonth() + 1,
+    // 月份
+    'd+': date.getDate(),
+    // 日
+    'h+': date.getHours(),
+    // 小时
+    'm+': date.getMinutes(),
+    // 分
+    's+': date.getSeconds() // 秒
+  }
+  if (/(y+)/.test(format)) format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) if (new RegExp('(' + k + ')').test(format)) format = format.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  return format
+}
+const timeStamp = formatDate(new Date(), 'yyyy-MM-dd-hh-mm-ss')
+console.log('开始打包:', timeStamp)
+console.log('入口:', process.env.VUE_APP_ENTRY)
+// 单个入口打包压缩配置
+let onEndParam = {
+  copy: [
+    {source: './package.json', destination: './lib/package_' + timeStamp + '.json'}
+  ],
+  archive: [
+    { source: './lib', destination: './' + process.env.VUE_APP_ENTRY + '_lib' + timeStamp + '.zip' }
+  ]
+}
+if (process.env.VUE_APP_SINGLE !== 'true') {
+  onEndParam = {}
+  // 多个一起打包, 最后一个在压缩
+  if (process.env.VUE_APP_BUILDEND === 'true') {
+    onEndParam = {
+      copy: [
+        {source: './package.json', destination: './lib/package_' + timeStamp + '.json'}
+      ],
+      archive: [
+        { source: './lib', destination: './manage_lib' + timeStamp + '.zip' }
+      ]
+    }
+  }
+}
 
 // whether to generate source map for production files.
 // disabling this can speed up the build.
-var SOURCE_MAP = true
+const SOURCE_MAP = false
 
 module.exports = merge(baseConfig, {
+  externals: {
+    'vue-client': 'vue-client',
+    'system-clients': 'system-clients',
+    'vue': 'vue'
+  },
   stats: {
     children: false
   },
   devtool: SOURCE_MAP ? '#source-map' : false,
+  entry: {
+    app: './src/' + process.env.VUE_APP_ENTRY + '.js'
+  },
   output: {
     // naming output files with hashes for better caching.
     // dist/index.html will be auto-generated with correct URLs.
-    filename: '[name][chunkhash].js',
-    chunkFilename: '[id].[chunkhash].js'
+    publicPath: 'library/manage/' + process.env.VUE_APP_ENTRY + '/lib/',
+    path: path.resolve(__dirname, '../lib/' + process.env.VUE_APP_ENTRY + '/lib'),
+    filename: 'lib.js',
+    libraryTarget: 'umd'  // 不管在commonJS环境还是在AMD环境,能让任何形式引入都可以引入
   },
   vue: {
     loaders: cssLoaders({
@@ -33,28 +92,52 @@ module.exports = merge(baseConfig, {
         NODE_ENV: '"production"'
       }
     }),
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
+    new ParallelUglifyPlugin({
+      // 用作缓存的可选绝对路径。如果未提供，则不使用缓存。
+      // cacheDir: '.cache/',
+      uglifyJS: {
+        output: {
+          // 是否保留代码中的注释，默认为保留
+          comments: false
+        },
+        // 是否在UglifyJS删除没有用到的代码时输出警告信息，默认为false
+        warnings: false,
+        compress: {
+          // 是否删除代码中所有的console语句，默认为false
+          drop_console: true,
+          // 是否内嵌虽然已经定义了，但是只用到一次的变量， 默认值false
+          collapse_vars: true,
+          // 是否提取出现了多次但是没有定义成变量去引用的静态值，默认为false
+          reduce_vars: true
+        }
       }
     }),
+    // new webpack.optimize.UglifyJsPlugin({
+    //   compress: {
+    //     warnings: false
+    //   }
+    // }),
     new webpack.optimize.OccurenceOrderPlugin(),
     // extract css into its own file
     new ExtractTextPlugin('[name].css'),
     // generate dist index.html with correct asset hash for caching.
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: '../index.html',
-      template: 'index.html',
-      inject: true,
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeAttributeQuotes: true
-        // more options:
-        // https://github.com/kangax/html-minifier#options-quick-reference
-      }
+    // new HtmlWebpackPlugin({
+    //   filename: '../index.html',
+    //   template: 'index.html',
+    //   inject: true,
+    //   minify: {
+    //     removeComments: true,
+    //     collapseWhitespace: true,
+    //     removeAttributeQuotes: true
+    //     // more options:
+    //     // https://github.com/kangax/html-minifier#options-quick-reference
+    //   }
+    // }),
+    // 打包文件压缩
+    new FileManagerPlugin({
+      onEnd: onEndParam
     })
   ]
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.102",
+  "version": "3.2.103-03-cs",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -32,6 +32,7 @@
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
     "extract-text-webpack-plugin": "^1.0.1",
+    "filemanager-webpack-plugin": "^2.0.5",
     "file-loader": "^0.8.4",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
@@ -63,10 +64,11 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
+    "swiper": "^5.4.5",
     "system-clients": "3.1.89-20",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.33",
+    "vue-client": "1.24.51",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",
@@ -78,14 +80,18 @@
     "webpack": "1.12.2",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
+    "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0"
   },
   "scripts": {
     "unit": "karma start test/unit/karma.conf.js --single-run",
     "example": "node build/example-server.js",
     "dev": "node build/dev-server.js",
     "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
     "e2e": "node test/e2e/runner.js",
     "release": "bash build/release.sh"
   },

package/src/App.vue

@@ -9,6 +9,7 @@
           <!--<route :comp="{name: 'vender-management'}"></route>-->
           <!--<route :comp="{name: 'malfunction-home'}"></route>-->
           <route :comp="{name: 'login'}"></route>
+<!--          <route :comp="{name: 'call-report-main-page'}"></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> -->

package/src/ManageHome.js

@@ -1,10 +1,9 @@
 import Vue from 'vue'
-
 import echarts from 'echarts'
 
 /** **************************收费组件注册******************************/
 
-export default function () {
+export default function (filiale) {
   Vue.prototype.$echarts = echarts
 
   Vue.component('safehidden-analy', (resolve) => {
@@ -12,7 +11,7 @@ export default function () {
   })
 
   /** **************************安全服务******************************/
-  //安全服务首页
+  // 安全服务首页
   // Vue.component('security-servicehome', (resolve) => {
   //   require(['./components/SecurityService/SecurityServiceHome'], resolve)
   // })
@@ -263,7 +262,4 @@ export default function () {
   // Vue.component('supply-gas', (resolve) => {
   //   require(['./components/ManageHome/NetWork/SupplyGas'], resolve)
   // })
-
 }
-
-

package/src/components/SellReport/ApplyFillmoney.vue

@@ -0,0 +1,228 @@
+<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>
+        <p class="bg-info text-center" style="padding: 8px;">材料报建表</p>
+        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-4" >
+              <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 HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4" >
+              <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 HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+
+          </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"  v-if="!$parent.data.f_files_path">
+          <thead>
+          <tr>
+            <th colspan='7' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">材料报建表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='7' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='7' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='7' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td colspan='7'>
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='3'>财务审核：</th>
+            <th colspan='3'>收款审核：</th>
+            <th colspan='1'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+    <modal :show.sync="show" v-ref:modal small backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">输入文件名称</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+        <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+let saveFile = function * (self) {
+  // 线验证文件是否重名
+  let count = yield self.$resetpost('rs/sql/manageSingleTable',
+    {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+    {resolveMsg: null, rejectMsg: null})
+  if (count.data.length > 0) {
+    self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+    return
+  }
+  let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+    f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+    f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+    f_outlets: this.$login.f.depname})
+  if (saveBack.data.status === 'succeed') {
+    self.show = false
+    self.filename = ''
+    // 后台保存完成，通知刷新
+    self.$dispatch('save-success', self.filename)
+  }
+}
+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: '',
+      operatorname: '',
+      f_inputtor:[],
+      f_user_type:'',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/applysgasfillmoney', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      show: false
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    this.$refs.paged.$refs.criteria.search()
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
+
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    },
+    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
+    },
+    // 根据文件路径获取储存的报表内容
+    getFileContent (path) {
+      this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.reportStr = res.data.filecontent
+        this.model.state = '正确'
+      })
+    },
+    confirm () {
+      if (!this.filename || this.filename === '') {
+        this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
+      }
+      let saveGen = saveFile(this)
+      co(saveGen)
+    },
+    close () {
+      this.show = false
+    },
+    // 将报表保存成文件
+    confirmReport () {
+      this.show = true
+      this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+    },
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    }
+  },
+  computed: {
+    usertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    inputtor() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
+    },
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>