sale-client 3.5.210 → 3.5.212

package/.babelrc

@@ -1,5 +1,6 @@
 {
   "presets": ["es2015", "stage-2"],
   "plugins": ["transform-runtime"],
-  "comments": false
+  "comments": false,
+  "ignore": ["jsoneditor.min.js"]
 }

package/build/webpack.base.conf.js

@@ -1,35 +1,59 @@
 var path = require('path')
-var cssLoaders = require('./css-loaders')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
 
 module.exports = {
   entry: {
     app: './src/main.js'
   },
   output: {
-    path: path.resolve(__dirname, '../dist/mergeUser'),
-    publicPath: 'mergeUser/',
+    path: path.resolve(__dirname, '../dist/static'),
+    publicPath: 'static/',
     filename: '[name].js'
   },
   resolve: {
-    extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
-    alias: {
-      'src': path.resolve(__dirname, '../src'),
-      'test': path.resolve(__dirname, '../test')
-    }
+    extensions: ['.js', '.vue'],
+    modules: [
+      path.resolve(__dirname, 'src'),
+      'node_modules'
+    ]
   },
   resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
+    modules: [
+      path.join(__dirname, 'loaders'),
+      'node_modules'
+    ]
   },
   module: {
     loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            // 将所有的样式提取到一个文件中，而不是将其注入到JavaScript文件中
+            // 注意，这里提取样式的loader也需要使用ExtractTextPlugin.loader
+            css: ExtractTextPlugin.extract({
+              use: 'css-loader',
+              fallback: 'vue-style-loader'
+            }),
+            less: ExtractTextPlugin.extract({
+              use: ['css-loader', 'less-loader'],
+              fallback: 'vue-style-loader'
+            }),
+            stylus: ExtractTextPlugin.extract({
+              use: ['css-loader', 'stylus-loader'],
+              fallback: 'vue-style-loader'
+            }),
+            sass: ExtractTextPlugin.extract({
+              use: ['css-loader', 'sass-loader'],
+              fallback: 'vue-style-loader'
+            })
+          }
+        }
       },
       {
         test: /\.js$/,
-        loader: 'babel',
+        loader: 'babel-loader',
         include: [
           /src/,
           /build/,
@@ -41,45 +65,51 @@ module.exports = {
           /node_modules\/system-clients\/src/,
           /node_modules\/ldap-clients\/src/,
           /node_modules\/address-client\/src/
-        ],
-        options: {
-          presets: ['es2015']
-        }
+        ]
       },
       {
-        test: /\.json$/,
-        loader: 'json'
+        test: /\.html$/,
+        loader: 'vue-html-loader'
       },
       {
-        test: /\.html$/,
-        loader: 'vue-html'
+        test: /\.css$/,
+        loader: ExtractTextPlugin.extract({
+          use: 'css-loader',
+          fallback: 'vue-style-loader'
+        })
       },
       {
         test: /\.less$/,
-        loader: 'style!css!less'
+        loader: ExtractTextPlugin.extract({
+          use: ['css-loader', 'less-loader'],
+          fallback: 'vue-style-loader'
+        })
       },
       {
-        test: /\.css$/,
-        loader: 'style!css'
+        test: /\.stylus$/,
+        loader: ExtractTextPlugin.extract({
+          use: ['css-loader', 'stylus-loader'],
+          fallback: 'vue-style-loader'
+        })
+      },
+      {
+        test: /\.sass$/,
+        loader: ExtractTextPlugin.extract({
+          use: ['css-loader', 'sass-loader'],
+          fallback: 'vue-style-loader'
+        })
       },
       {
         test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
-        loader: 'url',
+        loader: 'url-loader',
         query: {
           limit: 10000,
-          name: '[name].[ext]?[hash:7]'
+          name: 'static/[name].[ext]?[hash:7]'
         }
       }
     ]
   },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: false,
-      extract: false
-    })
-  },
-  plugins: [],
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  }
+  plugins: [
+  ]
 }
+

package/build/webpack.dev.conf.js

@@ -2,6 +2,7 @@ var webpack = require('webpack')
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.base.conf')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 // add hot-reload related code to entry chunks
 Object.keys(baseConfig.entry).forEach(function (name) {
@@ -17,15 +18,15 @@ module.exports = merge(baseConfig, {
     publicPath: '/'
   },
   plugins: [
-    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
-    new webpack.optimize.OccurenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoErrorsPlugin(),
+    new ExtractTextPlugin('[name].css'),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: 'index.html',
-      inject: true
+      inject: true,
+      date: new Date().getTime()
     })
   ]
 })

package/build/webpack.prod.conf.js

@@ -1,65 +1,31 @@
-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')
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+const TerserPlugin = require('terser-webpack-plugin-legacy')
 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)
-
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 // whether to generate source map for production files.
 // disabling this can speed up the build.
-const SOURCE_MAP = false
+var SOURCE_MAP = false
+if (process.env.VUE_APP_PAGE === 'true') {
+  console.log('page打包')
+  baseConfig.entry.app = './src/iotMain.js'
+}
 
 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: {
+    path: path.resolve(__dirname, '../dist'),
+    publicPath: './',
     // naming output files with hashes for better caching.
     // dist/index.html will be auto-generated with correct URLs.
-    publicPath: 'library/sale/lib/',
-    path: path.resolve(__dirname, '../lib/lib'),
-    filename: 'lib.js',
-    libraryTarget: 'umd'  // 不管在commonJS环境还是在AMD环境,能让任何形式引入都可以引入
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: SOURCE_MAP,
-      extract: true
-    })
+    filename: 'static/[name][chunkhash].js',
+    chunkFilename: 'static/[id].[chunkhash].js'
   },
   plugins: [
     // http://vuejs.github.io/vue-loader/workflow/production.html
@@ -68,59 +34,46 @@ module.exports = merge(baseConfig, {
         NODE_ENV: '"production"'
       }
     }),
-    new ParallelUglifyPlugin({
-      // 用作缓存的可选绝对路径。如果未提供，则不使用缓存。
-      // cacheDir: '.cache/',
-      uglifyJS: {
-        output: {
-          // 是否保留代码中的注释，默认为保留
-          comments: false
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      minChunks: Infinity
+    }),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'runtime'
+    }),
+    // new BundleAnalyzerPlugin(),
+    new TerserPlugin({
+      parallel: true,
+      cache: true,
+      terserOptions: {
+        parse: {
+          ecma: 6
         },
-        // 是否在UglifyJS删除没有用到的代码时输出警告信息，默认为false
-        warnings: false,
         compress: {
-          // 是否删除代码中所有的console语句，默认为false
-          drop_console: true,
-          // 是否内嵌虽然已经定义了，但是只用到一次的变量， 默认值false
-          collapse_vars: true,
-          // 是否提取出现了多次但是没有定义成变量去引用的静态值，默认为false
-          reduce_vars: true
+          ecma: 5,
+          warnings: false,
+          comparisons: false,
+          inline: 2
         }
       }
     }),
-    // 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 FileManagerPlugin({
-      onEnd: {
-        copy: [
-          {source: './package.json', destination: './lib/package_' + timeStamp + '.json'}
-        ],
-        archive: [
-          { source: './lib', destination: './sale_lib' + timeStamp + '.zip' }
-        ]
-      }
+    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
+      },
+      date: new Date().getTime()
     })
   ]
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.210",
+  "version": "3.5.212",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -52,7 +52,8 @@
     "eslint-plugin-standard": "^3.0.1",
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "terser-webpack-plugin-legacy": "^1.2.5",
     "file-loader": "^0.8.4",
     "filemanager-webpack-plugin": "^2.0.5",
     "function-bind": "^1.0.2",
@@ -99,7 +100,7 @@
     "vue-strap": "^1.0.9",
     "vue-style-loader": "^1.0.0",
     "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
+    "webpack": "^3.12.0",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3",

package/src/components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser.vue

@@ -92,7 +92,11 @@
               <th>
                 <nobr>操作日期</nobr>
               </th>
-
+              <th>
+                <nobr>
+                  收费记录时间
+                </nobr>
+              </th>
               <th>
                 <nobr>人员</nobr>
               </th>
@@ -162,7 +166,11 @@
             <td style="text-align: center;">
               <nobr>{{row.f_operate_date}}</nobr>
             </td>
-
+            <td style="text-align: center;">
+              <nobr>
+                {{row.f_sfjl===null?"00:00:00.000":row.f_sfjl}}
+              </nobr>
+            </td>
             <td style="text-align: center;">
               <nobr>{{row.f_operator}}</nobr>
             </td>

package/src/components/revenue/base/leftview/CheckGas.vue

@@ -20,7 +20,7 @@
 <script>
   import {HttpResetClass} from 'vue-client'
   let checkGas = async function (self) {
-    let temp = []
+    let temp = {data:[]}
     try {
       let http = new HttpResetClass()
       temp = await http.load('POST', 'rs/sql/sale_checkGas', {data: {id: self.data.f_userinfo_id}}, {resolveMsg: null, rejectMsg: null})

package/src/filiale/fugu/components/{BlackList.vue → BlackList/BlackList.vue}

@@ -30,7 +30,6 @@
               <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"   v-validate:f_user_name='{required: true }'
                      v-model="model.f_user_name" readonly
                      placeholder="用户姓名">
-
             </div>
             <div class="col-sm-4 form-group" id="phone" :class="[$v.f_user_phone.required ? 'has-error' : 'has-success']">
               <label for="f_user_phone" class=" font_normal_body">联系方式</label>
@@ -173,18 +172,7 @@
       }
     },
     ready () {
-      if (this.data) {
-        console.log(this.data + '*****************************')
-        if(this.data.f_parameter_value){
-          this.isBlackList = true
-          initGen(this, this.data)
-        } else {
-          this.isBlackList = false
-          this.initNormalModel(this.data,this)
-        }
-      } else {
-        this.initModel()
-      }
+
     },
     watch: {
       'data' (val) {

package/src/filiale/fugu/components/BlackList/BlackListBatch.vue

@@ -0,0 +1,221 @@
+<template>
+  <div class="auto">
+    <modal :show.sync="blackbatchshow" v-ref:modal large backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <h4 class="modal-title">用户批量拉黑</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <validator name='v'>
+        <form novalidate class="form-horizontal select-overspread ">
+          <div>
+            <div class="row">
+<!--              <div class="col-sm-4 form-group" id="f_meternumber">-->
+<!--                <label for="f_userinfo_code" class="font_normal_body">表&emsp;&emsp;号</label>-->
+<!--                <input class="input_search" style="width:60%" type="text"-->
+<!--                       v-model="model.f_meternumber" readonly>-->
+<!--              </div>-->
+<!--              <div class="col-sm-4 form-group" id="f_card_id">-->
+<!--                <label for="f_userinfo_code" class="font_normal_body">卡&emsp;&emsp;号</label>-->
+<!--                <input class="input_search" style="width:60%" type="text"-->
+<!--                       v-model="model.f_card_id" readonly>-->
+<!--              </div>-->
+<!--              <div class="col-sm-4 form-group" id="f_userinfo_code">-->
+<!--                <label for="f_userinfo_code" class="font_normal_body">用户编号</label>-->
+<!--                <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"-->
+<!--                       v-model="model.f_userinfo_code" readonly>-->
+<!--              </div>-->
+<!--              <div class="col-sm-4 form-group" id="name">-->
+<!--                <label for="f_user_name" class=" font_normal_body">用户姓名</label>-->
+<!--                <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"-->
+<!--                       v-model="model.f_user_name" readonly-->
+<!--                       placeholder="用户姓名">-->
+<!--              </div>-->
+<!--              <div class="col-sm-4 form-group" id="phone">-->
+<!--                <label for="f_user_phone" class=" font_normal_body">联系方式</label>-->
+<!--                <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"-->
+<!--                       v-model="model.f_user_phone" readonly-->
+<!--                       placeholder="联系方式">-->
+<!--              </div>-->
+              <div class="col-sm-4 form-group" id="f_limit_times"
+                   :class="[$v.f_limit_times.required ? 'has-error' : 'has-success']">
+                <label class="font_normal_body">限购次数</label>
+                <input class="input_search" style="width:60%" type="number"
+                       v-model="model.f_limit_times" v-validate:f_limit_times='{required: true }'
+                       placeholder="限购次数">
+              </div>
+              <div class="col-sm-2 form-group" id="f_limit">
+                <v-select
+                  width="82%"
+                  v-model="f_limit"
+                  :value.sync="f_limit"
+                  :options='limites'
+                  close-on-select>
+                </v-select>
+              </div>
+              <div class="col-sm-3 form-group" id="f_limit_gas" style="right: 3%;">
+                <input class="input_search" style="width:60%" type="number" v-if="f_limit=='限购气量'"
+                       v-model="model.f_limit_value"
+                       v-scale="[model.f_limit_value, 2]"
+                       @click="gg()"
+                       placeholder="限购气量">
+                <input class="input_search" type="number" v-if="f_limit=='限购金额'"
+                       v-model="model.f_limit_amount"
+                       v-scale="[model.f_limit_amount, 2]"
+                       @click="gg()"
+                       placeholder="限购金额">
+
+              </div>
+            </div>
+            <div class="row">
+<!--              <div class="col-sm-12 form-group" id="address">-->
+<!--                <label for="f_address" class=" font_normal_body">地&emsp;&emsp;址</label>-->
+<!--                <input class="input_search" type="text" class="input_search" style="width:87%"-->
+<!--                       v-model="model.f_address"-->
+<!--                       readonly-->
+<!--                       placeholder="地址">-->
+<!--              </div>-->
+              <div class="col-sm-12 form-group" id="f_comments"
+                   :class="[$v.f_comments.required ? 'has-error' : 'has-success']">
+                <label for="f_comments" class=" font_normal_body">原&emsp;&emsp;因</label>
+                <input class="input_search" type="text" class="input_search" style="width:87%"
+                       v-model="model.f_comments"
+                       placeholder="原因" v-validate:f_comments='{required: true }'>
+              </div>
+            </div>
+          </div>
+        </form>
+      </validator>
+    </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <div style="text-align:right;height:auto;margin-top:6px;">
+          <button class="button_search" type="button" style="width:80px;" @click="confirm('拉黑')" :disabled='!$v.valid'>
+            拉黑
+          </button>
+          <button class="button_search" type="button" style="width:80px;" @click="close()">
+            取消
+          </button>
+        </div>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from "vue-client";
+
+export default {
+  name: "BlackListBatch",
+  title: '黑名单批量管理',
+  props: {
+    blackbatchshow: {
+      type: Boolean,
+      default: false
+    },
+    data: {
+      type: Array,
+      default: []
+    }
+  },
+  data () {
+    return {
+      model: {
+        // 限购次数
+        f_limit_times: '',
+        // 限购气量
+        f_limit_value: '',
+        // 限购金额
+        f_limit_amount: ''
+      },
+      // 编辑控制
+      isBlackList: false,
+      f_filialeid: '',  // 所属公司
+      f_filialename: '',  // 所属公司名称
+      f_limit: '限购气量',
+      limites: [{label: '限购气量', value: '限购气量'}, {label: '限购金额', value: '限购金额'}]
+    }
+  },
+  ready () {
+    if (this.data) {
+      console.log(this.data + '*****************************')
+    } else {
+      this.initModel()
+    }
+  },
+  watch:{
+    'data' () {
+      this.initModel()
+    }
+  },
+  methods: {
+    gg () {
+      if (this.f_limit[0] === '限购气量') {
+        this.model.f_limit_amount = ''
+      } else {
+        this.model.f_limit_value = ''
+      }
+    },
+    async confirm (type) {
+      console.log('所有要添加的数据',this.data)
+
+      let msg = this.data.map((value, index, array)=>{
+        let r = {}
+        r.f_operat_type = type
+        r.f_state = '有效'
+        r.f_user_id = value.f_user_id
+        r.f_user_name = value.f_user_name
+        r.f_comments = this.model.f_comments
+        r.f_operator = this.$login.f.name
+        r.f_operatorid = this.$login.f.id
+        r.f_orgid = this.$login.f.orgid
+        r.f_orgname = this.$login.f.orgs
+        r.f_depid = this.$login.f.depids
+        r.f_depname = this.$login.f.deps
+        r.f_operate_date = this.$login.toStandardTimeString()
+        r.f_describe = `${this.$login.f.name}对客户${value.f_user_name}进行${type}`
+        r.f_userinfo_code = value.f_userinfo_code
+        r.f_userinfo_id = {
+          f_userinfo_id: value.f_userinfo_id,
+          f_user_state: '正常',
+          version: 0
+        },
+        r.f_limit_times = this.model.f_limit_times
+        r.f_limit_value = this.model.f_limit_value
+        r.f_limit_amount = this.model.f_limit_amount
+        return r
+      })
+      console.log('查看参数msg', msg)
+      for (let i = 0; i < msg.length; i++) {
+        let v = await this.$resetpost('rs/sql/sale_getUserAndVersion', {data: {condition: `f_userinfo_code='${msg[i].f_userinfo_code}'`, f_orgid: this.$login.f.orgid}}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        msg[i].f_userinfo_id.version = v.data[0].version
+        let res = await this.$resetpost('rs/logic/backlistOperate', msg[i], {resolveMsg: null, rejectMsg: `${type}失败`})
+        if (res.data.code == 500) {
+          this.$showMessage(`${type}失败,名单中已拉黑用户无法再拉黑,请先取消拉黑`)
+          return
+        }
+      }
+      this.$showMessage(`${type}成功`)
+      this.$dispatch('success')
+      this.$dispatch('blackclose')
+      this.initModel()
+    },
+    initModel () {
+      if (this.data) {
+        console.log('initModel', this.data)
+      }
+    },
+  },
+}
+</script>
+
+<style lang="less">
+#gas-price-form {
+  .form-group {
+    margin-left: 0px;
+    margin-right: 0px;
+  }
+}
+
+</style>