sale-client 3.4.196 → 3.4.197

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/build/dev-server.js

@@ -10,7 +10,7 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://192.168.50.4:8400',bendi1 = 'http://121.36.106.17:8400/'
+var bendi = 'http://127.0.0.1:8080',bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
 var fuwu = 'http://192.168.50.4:8400'
 // var fuwu = 'http://121.36.106.17:8400/'
@@ -100,7 +100,7 @@ var proxyTable = {
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
     // target: 'http://121.36.106.17:8400/'
-    target: bendi
+    target: fuwu
   }
 }
 

package/build/webpack.base.conf.js

@@ -1,6 +1,5 @@
 var path = require('path')
 var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
 
 module.exports = {
   entry: {

package/build/webpack.prod.conf.js

@@ -1,42 +1,59 @@
-var fs = require('fs')
-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)
 
 // whether to generate source map for production files.
 // disabling this can speed up the build.
-var SOURCE_MAP = false
-
-// 把examples下所有的index.html转换成测试例子.html
-fs.readdirSync('./examples').forEach((file) => {
-  baseConfig.plugins.push(
-    new HtmlWebpackPlugin({
-      filename: file + '.html',
-      template: `examples/${file}/index.html`,
-      inject: false
-    })
-  )
-})
-// 把examples下子目录的main.js打包成对应组件名的App.js
-baseConfig.entry = {}
-fs.readdirSync('./examples').forEach((file) => {
-  baseConfig.entry[file + 'App'] = `./examples/${file}/main.js`
-})
+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/sale.js'
+  },
   output: {
     // naming output files with hashes for better caching.
     // dist/index.html will be auto-generated with correct URLs.
-    publicPath: './',
-    filename: '[name].js',
-    chunkFilename: '[id].js'
+    publicPath: 'library/sale/lib/',
+    path: path.resolve(__dirname, '../lib/lib'),
+    filename: 'lib.js',
+    libraryTarget: 'umd'  // 不管在commonJS环境还是在AMD环境,能让任何形式引入都可以引入
   },
   vue: {
     loaders: cssLoaders({
@@ -51,27 +68,58 @@ 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: {
+        copy: [
+          {source: './package.json', destination: './lib/package_' + timeStamp + '.json'}
+        ],
+        archive: [
+          { source: './lib', destination: './sale_lib' + timeStamp + '.zip' }
+        ]
       }
     })
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.196",
+  "version": "3.4.197",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "dev": "node build/dev-server.js",
     "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
     "unit": "karma start test/unit/karma.conf.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/mergeUser && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
     "e2e": "node test/e2e/runner.js",
     "release": "bash build/release.sh"
   },
@@ -34,8 +34,8 @@
     "babel-preset-stage-2": "^6.0.0",
     "chai": "^3.5.0",
     "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
     "compression-webpack-plugin": "1.1.2",
+    "connect-history-api-fallback": "^1.1.0",
     "cross-env": "^1.0.7",
     "cross-spawn": "^2.1.5",
     "css-loader": "^0.23.0",
@@ -53,6 +53,7 @@
     "express": "^4.13.3",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.4",
+    "filemanager-webpack-plugin": "^2.0.5",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
     "http-proxy-middleware": "^0.11.0",
@@ -101,6 +102,7 @@
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0",
     "weixin-js-sdk": "^1.2.0"
   },
   "keywords": [

package/src/components/FilesManage/MeterinfoTest.vue

@@ -106,6 +106,13 @@
             <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-else
                       search v-model='row.f_open_way' :disabled="false"></v-select>
           </div>
+          <div class="col-sm-4 form-group" v-show="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_brand.indexOf('集中器') !== -1">
+            <label class="font_normal_body" title="集中器">集&ensp;中&ensp;器</label>
+            <v-select :value.sync="row.f_concentrator_id" :options='concentrators' value-single placeholder='集中器' close-on-select v-if="row.f_userfiles_id"
+                      search v-model='row.f_concentrator_id' :disabled="true"></v-select>
+            <v-select :value.sync="row.f_concentrator_id" :options='concentrators' value-single placeholder='集中器' close-on-select v-else
+                      search v-model='row.f_concentrator_id' :disabled="false"></v-select>
+          </div>
         </div>
         <div>
           <a style="font-size: 16px;font-weight: 500;">气价信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
@@ -548,6 +555,7 @@
         pricetypes: this.$appdata.getParam('气价类型'),
         industrycomments: this.$appdata.getParam('工业备注'),
         openWay: [{label: '指令开户', value: '指令开户'}, {label: '发卡开户', value: '发卡开户'}],
+        concentrators: [],
         meterbookoptions: [],  // 抄表册选项
         opteratormetrbook: false, // 抄表册操作
         oldrow: [],
@@ -558,7 +566,7 @@
       }
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id','overdueset'],
-    ready () {
+    async ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
       this.row = Object.assign(this.row, this.meter, {})
       if(this.row.f_meter_classify){
@@ -574,9 +582,24 @@
       if (this.row.pricetype === '混合气价') {
         this.ratioshow = true
       }
+      await this.getConcentrators()
       co(meterBookGen(this))
     },
     methods: {
+      // 获取集中器下拉框
+      async getConcentrators () {
+        let condition = {
+          items: 'id,f_mpc_alias',
+          tablename: 't_concentrator',
+          condition: `f_mpc_state !='删除'`,
+          orderitem: 'id'
+        }
+        let data = await this.$resetpost('rs/sql/saleSingleTable', {data: condition}, {resolveMsg: null, rejectMsg: '获取集中器失败!'})
+        this.concentrators = []
+        for (let row of data.data) {
+          this.concentrators.push({label: row.f_mpc_alias, value: row.id})
+        }
+      },
       async confirmUserfiles () {
         if (this.$refs.addparamlist.confirm()) {
           var paramlist = this.$refs.addparamlist.addGasParameter

package/src/components/FilesManage/TemplateManage.vue

@@ -1,167 +1,167 @@
-<template>
-  <div style="flex: 1.5" class="datapanel">
-  <div class="flex" >
-    <criteria-paged :model="model"  v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div novalidate class="form-inline auto" partial>
-          <div class="row">
-          <div class="form-group">
-            <div class="col-sm-2 form-group">
-            <label for="startDate">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd'"
-                          condition=""
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-2 form-group">
-            <label for="endDate">结束日期:</label>
-            <datepicker id="endDate" placeholder="结束日期"
-                        v-model="model.endDate"
-                        :value.sync="model.endDate"
-                        :disabled-days-of-Week="[]"
-                        :format="'yyyy-MM-dd'"
-                        :show-reset-button="reset">
-            </datepicker>
-            </div>
-            <div class="span" style="float:right;">
-              <button class="button_search" @click="$parent.$parent.selfSearch()">查询</button>
-              <button class="button_search" style="transform: translate(0px, 2px);" @click=" $parent.$parent.splitInfo= true">模板上传</button>
-            </div>
-          </div>
-        </div>
-        </div>
-      </criteria>
-      <accordion :one-at-atime="true" type="info" partial="list">
-        <div class="col-sm-12">
-          <div class="col-sm-2" v-for="row in model.rows">
-            <div class="row"  style="padding-bottom: 8px">
-              <img src="../../assets/template.png" style="height: 200px;width: 150px">
-              <div class="title">
-                <label>模板名称：{{row.f_filename.split("_")[0]}}</label>
-              </div>
-              <div class="buttion" style="display: flex-row">
-                <button class=" button_search" style="transform: translate(0px, 2px);" @click=" $parent.$parent.getFiles(row)">下载模板</button>
-                <button class="button_delete" title="权限名称:删除模板" style="transform: translate(0px, 2px);" @click=" $parent.$parent.deleteFiles(row)">删除模板</button>
-              </div>
-            </div>
-          </div>
-
-        </div>
-      </accordion>
-    </criteria-paged>
-    <modal :show.sync="splitInfo" width="480px"
-           title="请输入模板类型并选择上传的文件" v-ref:modal large backdrop="false">
-      <article slot="modal-body" class="modal-body">
-        <div class="col-sm-12" style="display: flex;margin-bottom: 1em">
-          <label style="width: 20%">模板名称</label>
-          <input type="text" class="form-control _zoom6" v-model="headers.fusetype"
-                 placeholder='模板名称'>
-        </div>
-        <file-upload class="my-file-uploader" name="my-file"
-                     accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
-                     action="rs/file/uploadFile" :headers="headers" tagname="确定" v-ref:file>
-        </file-upload>
-      </article>
-      <footer slot="modal-footer" style="display: none">
-      </footer>
-    </modal>
-    <work-busy :is-busy="iswork"></work-busy>
-  </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import axios from 'axios'
-  import fileDownload from 'js-file-download'
-  export default {
-    title: '模板管理',
-    data () {
-      return {
-        model: new PagedList('rs/sql/singleTable_OrderBy', 8, {
-          items: '"*"',
-          tablename: '"t_files"',
-          orderitem: '"id"'
-        }),
-        iswork: false,
-        headers: {'username': this.$login.f.name, 'blodid': '模板管理', 'fusetype': ''},
-        splitInfo: false
-      }
-    },
-    ready () {
-    },
-    events: {
-      'onFileError' (file, error) {
-        this.iswork = false
-        this.$showAlert('文件上传失败请检查格式' + JSON.stringify(error), 'warning', 3000)
-      },
-      'beforeFileUpload' () {
-        this.iswork = true
-      },
-      'closeFileUpload' () {
-        this.iswork = false
-      },
-      onFileChange: function (file) {
-        console.log('onFileChange', file)
-      },
-      onFileUpload: function (file, res) {
-        console.log('上传完毕' + JSON.stringify(res))
-        this.headers.f_usetype = ''
-        this.iswork = false
-        this.splitInfo = false
-        console.log(res)
-        this.$showMessage('成功上传')
-        setTimeout(() => {
-          this.selfSearch()
-        }, 1000)
-      }
-  },
-    methods: {
-      // 下载文件
-      getFiles (row) {
-        let data = {filepath: row.f_downloadpath}
-        let name = `${row.f_filename.split('_')[0]}.xlsx`
-        axios.post('rs/file/getUploadFile', data, {responseType: 'arraybuffer'}).then(res => {
-          fileDownload(res.data, name)
-          this.iswork = false
-        })
-      },
-      // 删除部分需要调整，这块是删除文件，还需要在t_files中删除记录。目前未完成
-      deleteFiles (row) {
-        if(this.$login.r.includes('删除模板')){
-          row.path = row.f_downloadpath
-          row.blobid = row.f_blobid
-          this.$resetpost('rs/logic/deletefiles', row).then((res) => {
-            setTimeout(() => {
-            this.selfSearch()
-            }, 1000)
-          })
-        }else{
-          this.$showMessage('当前登录用户没有删除模板权限, 请联系管理员!')
-        }
-      },
-      // 查询条件这块后面根据需求调整
-      selfSearch () {
-        this.model.search("f_blobid= '模板管理'")
-      }
-    }
-  }
-</script>
-<style scoped>
-  .title-td{
-    font-weight: bold;
-  }
-  .content-td{
-    padding-left: 2em;
-  }
-  .datapanel {
-    color: #333;
-    background-color: white;
-    padding: 10px 20px;
-    border-radius: 15px;
-  }
-</style>
+<template>
+  <div style="flex: 1.5" class="datapanel">
+  <div class="flex" >
+    <criteria-paged :model="model"  v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div novalidate class="form-inline auto" partial>
+          <div class="row">
+          <div class="form-group">
+            <div class="col-sm-2 form-group">
+            <label for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          condition=""
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+            <label for="endDate">结束日期:</label>
+            <datepicker id="endDate" placeholder="结束日期"
+                        v-model="model.endDate"
+                        :value.sync="model.endDate"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd'"
+                        :show-reset-button="reset">
+            </datepicker>
+            </div>
+            <div class="span" style="float:right;">
+              <button class="button_search" @click="$parent.$parent.selfSearch()">查询</button>
+              <button class="button_search" style="transform: translate(0px, 2px);" @click=" $parent.$parent.splitInfo= true">模板上传</button>
+            </div>
+          </div>
+        </div>
+        </div>
+      </criteria>
+      <accordion :one-at-atime="true" type="info" partial="list">
+        <div class="col-sm-12">
+          <div class="col-sm-2" v-for="row in model.rows">
+            <div class="row"  style="padding-bottom: 8px">
+              <img src="../../assets/template.png" style="height: 200px;width: 150px">
+              <div class="title">
+                <label>模板名称：{{row.f_filename.split("_")[0]}}</label>
+              </div>
+              <div class="buttion" style="display: flex-row">
+                <button class=" button_search" style="transform: translate(0px, 2px);" @click=" $parent.$parent.getFiles(row)">下载模板</button>
+                <button class="button_delete" title="权限名称:删除模板" style="transform: translate(0px, 2px);" @click=" $parent.$parent.deleteFiles(row)">删除模板</button>
+              </div>
+            </div>
+          </div>
+
+        </div>
+      </accordion>
+    </criteria-paged>
+    <modal :show.sync="splitInfo" width="480px"
+           title="请输入模板类型并选择上传的文件" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body">
+        <div class="col-sm-12" style="display: flex;margin-bottom: 1em">
+          <label style="width: 20%">模板名称</label>
+          <input type="text" class="form-control _zoom6" v-model="headers.fusetype"
+                 placeholder='模板名称'>
+        </div>
+        <file-upload class="my-file-uploader" name="my-file"
+                     accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
+                     action="rs/file/uploadFile" :headers="headers" tagname="确定" v-ref:file>
+        </file-upload>
+      </article>
+      <footer slot="modal-footer" style="display: none">
+      </footer>
+    </modal>
+    <work-busy :is-busy="iswork"></work-busy>
+  </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import axios from 'axios'
+  import fileDownload from 'js-file-download'
+  export default {
+    title: '模板管理',
+    data () {
+      return {
+        model: new PagedList('rs/sql/singleTable_OrderBy', 8, {
+          items: '"*"',
+          tablename: '"t_files"',
+          orderitem: '"id"'
+        }),
+        iswork: false,
+        headers: {'username': this.$login.f.name, 'blodid': '模板管理', 'fusetype': ''},
+        splitInfo: false
+      }
+    },
+    ready () {
+    },
+    events: {
+      'onFileError' (file, error) {
+        this.iswork = false
+        this.$showAlert('文件上传失败请检查格式' + JSON.stringify(error), 'warning', 3000)
+      },
+      'beforeFileUpload' () {
+        this.iswork = true
+      },
+      'closeFileUpload' () {
+        this.iswork = false
+      },
+      onFileChange: function (file) {
+        console.log('onFileChange', file)
+      },
+      onFileUpload: function (file, res) {
+        console.log('上传完毕' + JSON.stringify(res))
+        this.headers.f_usetype = ''
+        this.iswork = false
+        this.splitInfo = false
+        console.log(res)
+        this.$showMessage('成功上传')
+        setTimeout(() => {
+          this.selfSearch()
+        }, 1000)
+      }
+  },
+    methods: {
+      // 下载文件
+      getFiles (row) {
+        let data = {filepath: row.f_downloadpath}
+        let name = `${row.f_filename.split('_')[0]}.xlsx`
+        axios.post('rs/file/getUploadFile', data, {responseType: 'arraybuffer'}).then(res => {
+          fileDownload(res.data, name)
+          this.iswork = false
+        })
+      },
+      // 删除部分需要调整，这块是删除文件，还需要在t_files中删除记录。目前未完成
+      deleteFiles (row) {
+        if(this.$login.r.includes('删除模板')){
+          row.path = row.f_downloadpath
+          row.blobid = row.f_blobid
+          this.$resetpost('rs/logic/deletefiles', row).then((res) => {
+            setTimeout(() => {
+            this.selfSearch()
+            }, 1000)
+          })
+        }else{
+          this.$showMessage('当前登录用户没有删除模板权限, 请联系管理员!')
+        }
+      },
+      // 查询条件这块后面根据需求调整
+      selfSearch () {
+        this.model.search("f_blobid= '模板管理'")
+      }
+    }
+  }
+</script>
+<style scoped>
+  .title-td{
+    font-weight: bold;
+  }
+  .content-td{
+    padding-left: 2em;
+  }
+  .datapanel {
+    color: #333;
+    background-color: white;
+    padding: 10px 20px;
+    border-radius: 15px;
+  }
+</style>