sale-client 3.5.213 → 3.5.215

package/build/dev-server.js

@@ -1,108 +1,97 @@
-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 [local, server] = ['http://121.36.60.63:8800/#', 'http://121.36.60.63:8800/#']
-const port = 8089
-
-const proxyTable = {
-  '/rs/file': {
-    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': {
-    target: server
-  },
-  '/rs/data': {
-    target: server
-  },
-  '/rs/license': {
-    target: server
-  },
-  '/rs/db': {
-    target: server
-  },
-  '/excel': {
-    target: server
-  },
-  '/rs/config': {
-    target: server
-  },
-  '/rs/report': {
-    target: server
-  },
-  '/rs/vue': {
-    target: server
-  },
-  '/rs/logic': {
-    target: local
-  },
-  '/rs/sql': {
-    target: local
-  },
-  '/webmeter': {
-    target: server
-  },
-  '/rs': {
-    target: server,
-    // changeOrigin: true
-  }
-}
-
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-const hotMiddleware = require('webpack-hot-middleware')(compiler)
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-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(port, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:' + port)
-})
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var path = require('path')
+var webpackDevServer = require('webpack-dev-server')
+var compiler = webpack(config)
+// 自己改了这里不要提交 来回覆盖挺麻烦的
+const [localUrl, serverRul] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
+const port = 8089
+
+// eslint-disable-next-line new-cap
+var server = new webpackDevServer(compiler, {
+  contentBase: path.join(__dirname, 'src'),
+  hot: true,
+  publicPath: config.output.publicPath,
+  historyApiFallback: true,
+  open: true,
+  stats: {
+    all: false, // 关闭全部日志
+    colors: true, // 配置控制台输出彩色日志
+    errors: true, // 输出构建错误日志
+    warnings: true, // 输出构建警告日志
+    moduleTrace: true, // 显示 module 路径信息
+    errorDetails: true, // 显示构建错误的详细信息
+    chunks: false, // 不输出构建 chunk 信息
+    entrypoints: false, // 不输出入口文件信息
+    children: false, // 不输出子模块构建信息
+    performance: true // 输出性能提示
+  },
+  proxy: {
+    '/rs/file': {
+      target: serverRul
+    },
+    // 查找资源服务数据
+    '/rs/search': {
+      target: serverRul
+    },
+    // 查找资源服务数据
+    '/rs/logic/getLogin': {
+      target: serverRul
+    },
+    // 查找资源服务数据
+    '/rs/logic/getInitData': {
+      target: serverRul
+    },
+    '/rs/logic/getSaleInitData': {
+      target: serverRul
+    },
+    // 用户登录服务地址
+    '/rs/user': {
+      target: serverRul
+    },
+    '/rs/path': {
+      target: serverRul
+    },
+    '/rs/data': {
+      target: serverRul
+    },
+    '/rs/license': {
+      target: serverRul
+    },
+    '/rs/db': {
+      target: serverRul
+    },
+    '/excel': {
+      target: serverRul
+    },
+    '/rs/config': {
+      target: serverRul
+    },
+    '/rs/report': {
+      target: serverRul
+    },
+    '/rs/vue': {
+      target: serverRul
+    },
+    '/rs/logic': {
+      target: localUrl
+    },
+    '/rs/sql': {
+      target: localUrl
+    },
+    '/webmeter': {
+      target: serverRul
+    },
+    '/rs': {
+      target: serverRul
+      // changeOrigin: true
+    }
+  }
+})
+server.listen(port, 'localhost', function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:' + port)
+})

package/build/webpack.dev.conf.js

@@ -2,24 +2,27 @@ 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) {
-  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
-})
-
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
 module.exports = merge(baseConfig, {
-  // eval-source-map is faster for development
-  devtool: '#eval-source-map',
+  devtool: 'eval-cheap-module-source-map',
   output: {
-    // necessary for the html plugin to work properly
-    // when serving the html from in-memory
     publicPath: '/'
   },
+  stats: {
+    all: false, // 关闭全部日志
+    colors: true, // 配置控制台输出彩色日志
+    errors: true, // 输出构建错误日志
+    warnings: true, // 输出构建警告日志
+    moduleTrace: true, // 显示 module 路径信息
+    errorDetails: true, // 显示构建错误的详细信息
+    chunks: false, // 不输出构建 chunk 信息
+    entrypoints: false, // 不输出入口文件信息
+    children: false, // 不输出子模块构建信息
+    performance: true // 输出性能提示
+  },
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin(),
+    new webpack.NoEmitOnErrorsPlugin(),
     new ExtractTextPlugin('[name].css'),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.213",
+  "version": "3.5.215",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -23,6 +23,7 @@
     "less-loader": "^2.2.3",
     "qrcodejs2": "0.0.2",
     "vue": "^1.0.17",
+    "webpack-dev-server": "^2.11.5",
     "yarn": "^1.22.10"
   },
   "devDependencies": {

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -223,7 +223,11 @@ export default {
     }
   },
   async ready () {
-    this.blodid = this.data.baseinfo.base.f_userinfo_id
+    if (this.data.baseinfo.base.f_userinfo_id){
+      this.blodid = this.data.baseinfo.base.f_userinfo_id
+    }else {
+      this.blodid = '临时id' + Date.now()
+    }
     console.log('ready，，，', this.row)
     await this.getOvedueset()
     if (this.row) { // 修改用户
@@ -232,6 +236,7 @@ export default {
             // 将小区信息转化为综合信息的格式
       await this.areainfoInUser(this.areainfo)
     }
+    console.log('this.blodid------------>',this.blodid)
   },
   watch: {
     async 'row' (val) {

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

@@ -1,93 +1,104 @@
 <template>
   <partial-view v-ref:pv>
-    <div class="panel panel-info auto" >
-      <div class="panel-heading"  style="height: 35px">
+    <div class="panel panel-info auto" style="margin-top: auto">
+      <div class="panel-heading" style="height: 35px">
         <h4 style="display:inline-block;margin-top: auto">档案信息</h4>
       </div>
       <div class="auto info-content">
         <div class="row" v-if="warninginfo.data.insMsg">
-          <p align="center"><font color="red" style="font-weight: bold">{{warninginfo.data.insMsg}}</font></p>
+          <p align="center"><font color="red" style="font-weight: bold">{{ warninginfo.data.insMsg }}</font></p>
         </div>
 
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;客户编号</label>
-          <span class = "col-sm-7"><a @click="dealmsg(data)">{{data?data.f_userinfo_code:dafault.f_userinfo_code}}</a></span>
+          <label class="col-sm-5">客户编号</label>
+          <span class="col-sm-7"><a
+            @click="dealmsg(data)">{{ data ? data.f_userinfo_code : dafault.f_userinfo_code }}</a></span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;客户名称</label>
-          <span class = "col-sm-7">{{data?data.f_user_name:dafault.f_user_name}}</span>
+          <label class="col-sm-5">客户名称</label>
+          <span class="col-sm-7">{{ data ? data.f_user_name : dafault.f_user_name }}</span>
+        </div>
+        <div class="row" v-if="data.f_name_pinyin">
+          <label class="col-sm-5">名称首拼</label>
+          <span class="col-sm-7">{{ data ? data.f_name_pinyin : dafault.f_name_pinyin }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;客户类型</label>
-          <span class = "col-sm-7">{{data?data.f_user_type:dafault.f_user_type}}</span>
+          <label class="col-sm-5">客户类型</label>
+          <span class="col-sm-7">{{ data ? data.f_user_type : dafault.f_user_type }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;账户余额</label>
-          <span class = "col-sm-7">{{data ? data.f_balance:dafault.f_user_type}}</span>
+          <label class="col-sm-5">账户余额</label>
+          <span class="col-sm-7">{{ data ? data.f_balance : dafault.f_user_type }}</span>
         </div>
         <div class="row" v-show="data &&  data.f_sys_balance !== 0">
-          <label class = "col-sm-5 " >&emsp;系统余额</label>
-          <span class = "col-sm-7">{{data.f_sys_balance ? data.f_sys_balance:dafault.f_user_type}}</span>
+          <label class="col-sm-5">系统余额</label>
+          <span class="col-sm-7">{{ data.f_sys_balance ? data.f_sys_balance : dafault.f_user_type }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;证件号码</label>
-          <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_idnumber:dafault.f_idnumber}}</span>
+          <label class="col-sm-5">证件号码</label>
+          <span class="col-sm-7" style="word-break: break-all">{{ data ? data.f_idnumber : dafault.f_idnumber }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;客户电话</label>
-          <span class = "col-sm-7">{{data?data.f_user_phone:dafault.f_user_phone}}
-            <span v-if="data && data.f_user_phone" @click.stop="changeuserphone" class="glyphicon glyphicon-pencil  clickchange" title="修正客户电话"></span>
+          <label class="col-sm-5">客户电话</label>
+          <span class="col-sm-7">{{ data ? data.f_user_phone : dafault.f_user_phone }}
+            <span v-if="data && data.f_user_phone" @click.stop="changeuserphone"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修正客户电话"></span>
           </span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;备用电话</label>
-          <span class = "col-sm-7">{{data?data.f_rent_phone:dafault.f_rent_phone}}</span>
+          <label class="col-sm-5">备用电话</label>
+          <span class="col-sm-7">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;客户状态</label>
-          <span class = "col-sm-7">{{data?data.f_user_state:dafault.f_user_state}}</span>
+          <label class="col-sm-5">客户状态</label>
+          <span class="col-sm-7">{{ data ? data.f_user_state : dafault.f_user_state }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;备注信息</label>
-          <span class = "col-sm-7">{{data?data.f_comments:dafault.f_comments}}</span>
+          <label class="col-sm-5">备注信息</label>
+          <span class="col-sm-7">{{ data ? data.f_comments : dafault.f_comments }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;客户地址</label>
-          <span class = "col-sm-7">{{data?data.f_address:dafault.f_address}}</span>
+          <label class="col-sm-5">客户地址</label>
+          <span class="col-sm-7">{{ data ? data.f_address : dafault.f_address }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;开户时间</label>
-          <span class = "col-sm-7">{{data?data.f_open_date.substr(0,10):dafault.f_open_date}}</span>
+          <label class="col-sm-5">开户时间</label>
+          <span class="col-sm-7">{{ data ? data.f_open_date.substr(0, 10) : dafault.f_open_date }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;安装时间</label>
-          <span class = "col-sm-7">{{data?data.f_install_date.substr(0,10):dafault.f_input_date}}</span>
+          <label class="col-sm-5">安装时间</label>
+          <span class="col-sm-7">{{ data ? data.f_install_date.substr(0, 10) : dafault.f_input_date }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;人&ensp;口&ensp;数</label>
-          <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_people_num:dafault.f_people_num}}</span>
+          <label class="col-sm-5">&emsp;人&ensp;口&ensp;数</label>
+          <span class="col-sm-7"
+                style="word-break: break-all">{{ data ? data.f_people_num : dafault.f_people_num }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;客户等级</label>
-          <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_user_level:dafault.f_people_num}}</span>
+          <label class="col-sm-5">客户等级</label>
+          <span class="col-sm-7"
+                style="word-break: break-all">{{ data ? data.f_user_level : dafault.f_people_num }}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >旧客户编号</label>
-          <span class = "col-sm-7">{{data?data.f_olduserinfo_code:dafault.f_userinfo_code}}</span>
+          <label class="col-sm-5">旧客户编号</label>
+          <span class="col-sm-7">{{ data ? data.f_olduserinfo_code : dafault.f_userinfo_code }}</span>
         </div>
-        <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码" v-ref:modal large backdrop="false">
+        <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
+               v-ref:modal large backdrop="false">
           <article slot="modal-body" class="modal-body">
-            <div class="form-horizontal" >
+            <div class="form-horizontal">
               <div class="row">
                 <div class="col-sm-12 form-group">
                   <label class="font_normal_body">旧客户电话</label>
-                  <input disabled readonly type="text" style="width:80%" class="input_search" v-model="data.f_user_phone" placeholder='旧客户电话'>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_user_phone" placeholder='旧客户电话'>
                 </div>
               </div>
               <div class="row">
                 <div class="col-sm-12 form-group">
                   <label class="font_normal_body">新客户电话</label>
-                  <input type="text" style="width:80%" class="input_search" v-model="newuserphone" placeholder='新客户电话'>
+                  <input type="text" style="width:80%" class="input_search" v-model="newuserphone"
+                         placeholder='新客户电话'>
                 </div>
               </div>
             </div>
@@ -103,83 +114,83 @@
 </template>
 
 <script>
-  /**
-   *用户档案相关信息组件
-   */
+/**
+ *用户档案相关信息组件
+ */
 
-  export default {
-    ready () {
-      console.log('看看userinfo里面接收的data数据：', this.data)
-    },
-    title: '客户基本信息',
-    data () {
-      return {
-        dafault: {
-          f_user_name: '***',
-          f_userinfo_code: '********',
-          f_people_num: '**',
-          f_idnumber: '****',
-          f_user_phone: '************',
-          f_address: '*****',
-          f_user_type: '***',
-          f_open_date: '****年**月**日',
-          f_input_date: '****年**月**日',
-          f_hand_date: '****年**月**日',
-          f_rent_phone: '************',
-          f_comments: '**',
-          f_user_state: '****'
-        },
-        model: null,
-        showselectncuserinfo: false,
-        newuserphone: ''
-      }
-    },
-    props: ['data', 'warninginfo'],
-    methods: {
-      dealmsg (val) {
-        if (val.f_userinfo_code !== '********') {
-          this.$dispatch('deal-msg', val)
-        }
-      },
-      changeuserphone () {
-        // 修正客户电话
-        this.showselectncuserinfo = true
-        this.newuserphone = ''
-      },
-      async modifyUser () {
-        let param = {
-          new_userphone: this.newuserphone,
-          f_userinfo_id: this.data.f_userinfo_id,
-          f_user_id: this.data.f_user_id,
-          f_operator: this.$login.f.name,
-          f_operatorid: this.$login.f.id,
-          f_orgid: this.$login.f.orgid,
-          f_orgname: this.$login.f.orgs,
-          f_depid: this.$login.f.depids,
-          f_depname: this.$login.f.deps
-        }
-        await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
-        this.data.f_user_phone = this.newuserphone
-        this.$parent.$parent.close()
-        this.$parent.$parent.clean()
-        this.$parent.$parent.$refs.list.searchNoData()
-        this.close()
+export default {
+  ready() {
+    console.log('看看userinfo里面接收的data数据：', this.data)
+  },
+  title: '客户基本信息',
+  data() {
+    return {
+      dafault: {
+        f_user_name: '***',
+        f_userinfo_code: '********',
+        f_people_num: '**',
+        f_idnumber: '****',
+        f_user_phone: '************',
+        f_address: '*****',
+        f_user_type: '***',
+        f_open_date: '****年**月**日',
+        f_input_date: '****年**月**日',
+        f_hand_date: '****年**月**日',
+        f_rent_phone: '************',
+        f_comments: '**',
+        f_user_state: '****'
       },
-      close () {
-        this.showselectncuserinfo = false
-        this.newuserphone = ''
+      model: null,
+      showselectncuserinfo: false,
+      newuserphone: ''
+    }
+  },
+  props: ['data', 'warninginfo'],
+  methods: {
+    dealmsg(val) {
+      if (val.f_userinfo_code !== '********') {
+        this.$dispatch('deal-msg', val)
       }
     },
-    watch: {
-      'data' (val) {
+    changeuserphone() {
+      // 修正客户电话
+      this.showselectncuserinfo = true
+      this.newuserphone = ''
+    },
+    async modifyUser() {
+      let param = {
+        new_userphone: this.newuserphone,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
       }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_user_phone = this.newuserphone
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    close() {
+      this.showselectncuserinfo = false
+      this.newuserphone = ''
+    }
+  },
+  watch: {
+    'data'(val) {
     }
   }
+}
 </script>
 <style scoped>
-  .clickchange:hover{
-    color:#3592ef;
-    cursor: pointer;
-  }
+.clickchange:hover {
+  color: #3592ef;
+  cursor: pointer;
+}
 
 </style>

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

@@ -5,7 +5,7 @@
         <h4 style="display:inline-block;margin-top: auto">表具信息</h4>
       </div>
       <div class="auto ">
-        <div class="row">
+        <div class="row" v-if="data.f_customer">
           <label class = "col-sm-5 " style="color: brown">团缴编号</label>
           <span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
         </div>

package/src/components/revenue/comprehen/gasbrand/GasBrandList.vue

@@ -4,6 +4,15 @@
       <criteria @condition-changed='$parent.selfSearch' partial='criteria' v-ref:cri>
         <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
           <div class="row">
+            <div class="form-group col-sm-3" >
+              <label class="font_normal_body">组织机构</label>
+              <res-select :initresid='$parent.$parent.curorgid'
+                          @res-select="$parent.$parent.getorg"
+                          class="select select_list"
+                          restype='organization'
+                          style="width: 60%">
+              </res-select>
+            </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" for="f_meter_type">气表类型</label>
               <v-select :options='$parent.$parent.meterType'
@@ -162,6 +171,12 @@ export default {
       // if (!this.f_orgid) {
       //   this.getorg([this.$login.f.orgid])h
       // }
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      if (this.f_orgid) {
+        this.model.params.orgcondition = ` and f_orgid in ${this.f_orgid} `
+      }
       args.condition = `${args.condition}`
       this.model.search(args.condition, args.model)
       this.gasmodelbrand.search(args.condition, args.gasmodelbrand)
@@ -169,10 +184,9 @@ export default {
     search () {
       this.$dispatch('search')
     },
-    getorg (orgid, orgname) {
-      this.f_orgid = this.$login.convertToIn(orgid)
-      this.f_filialename = orgname ? orgname[0] : ''
-      this.f_filialeid = orgid ? orgid[0] : ''
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.$parent.f_orgid = this.f_orgid
     },
     selected () {},
     success () {