sale-client 3.4.188 → 3.4.191

package/build/dev-server.js

@@ -1,160 +1,160 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://121.36.106.17:8400/',bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-var fuwu = 'http://121.36.106.17:8400'
-//铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-//铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-//韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/logic/saleGetExportProgress': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    target:fuwu
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var 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) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://121.36.106.17:8400/',bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://121.36.106.17:8400/'
+//铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+//铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+//韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://121.36.106.17:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: 'http://192.168.50.4:8450'
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    target: 'http://121.36.106.17:8400/'
+    // target:fuwu
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var 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) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.188",
+  "version": "3.4.191",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/FileUserPhone.vue

@@ -0,0 +1,93 @@
+<template>
+  <div class="auto">
+    <modal width="30%" :show.sync="show" v-ref:modal title="备用电话管理" large backdrop="false" class="">
+      <article slot="modal-body" class="modal-body">
+        <div class="text-center">
+          <div v-for="row in userphonelist">
+            <validator name='v'>
+              <form class="form-horizontal  select-overspread">
+                <div class="row" v-if="row.f_state==='有效'">
+                  <div class="col-sm-10 form-group">
+                    <label for="f_rent_phone" class="font_normal_body">&emsp;&emsp;&emsp;&emsp;&emsp;备用电话&emsp;&emsp;</label>
+                    <input class="input_search"
+                           style="width:50%"
+                           type="text"
+                           v-model="row.f_rent_phone"
+                           :value.sync="row.f_rent_phone"
+                           placeholder="备用电话">
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <button type="button" class="glyphicon glyphicon-minus btn-danger" @click.stop="delphone($index,row)"></button>
+                  </div>
+                </div>
+              </form>
+            </validator>
+          </div>
+          <div class="panel panel-default auto text-center" @click="addphone()" style="cursor: pointer;">
+            <span class="glyphicon glyphicon-plus"></span>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='close()'>确认</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  export default {
+    title: '备用电话管理',
+    data () {
+      return {
+      }
+    },
+    props: {
+      userphonelist: {
+        type: Array
+      },
+      show: {
+        type: Boolean,
+        default: false
+      }
+    },
+    ready () {
+      console.log('备用电话管理:',JSON.stringify(this.userphonelist))
+    },
+    methods: {
+      addphone () {
+        this.userphonelist.push({
+          f_userinfo_id: this.f_userinfo_id?this.f_userinfo_id:'',
+          f_rent_phone:'',
+          f_state: '有效',
+          f_operator: Vue.$login.f.name,
+          f_operatorid: Vue.$login.f.id,
+          f_orgid: Vue.$login.f.orgid,
+          f_orgname: Vue.$login.f.orgs,
+          f_depid: Vue.$login.f.depids,
+          f_depname: Vue.$login.f.deps
+        })
+      },
+      delphone (index,row) {
+        this.$showMessage('是否确定要删除此条数据？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            if (row.id) {
+              this.userphonelist[index].f_state = '无效'
+            } else {
+              this.userphonelist.splice(index, 1)
+            }
+          }
+        })
+      },
+      close(){
+        this.show = false
+      }
+    },
+    computed: {
+
+    }
+  }
+</script>
+
+<style lang="less">
+</style>

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -1,5 +1,8 @@
 <template>
   <div>
+    <div style="margin-bottom: 2%; margin-top: 2%">
+      <button class="button_search" style="width: max-content" @click="phoneManage()">管理备用电话</button>
+    </div>
     <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
       <form class="form-horizontal select-overspread ">
         <div class="row">
@@ -203,6 +206,7 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
+    <file-user-phone :show.sync="showphone" :userphonelist="userphonelist" :f_userinfo_id="baseinfo.base.f_userinfo_id"></file-user-phone>
   </div>
 </template>
 
@@ -223,11 +227,12 @@
 
   export default {
     title: '基本信息',
-    props: ['baseinfo', 'addressinfo', 'isedit'],
+    props: ['baseinfo', 'addressinfo', 'isedit', 'userphonelist'],
     data () {
       return {
         showselectaddress: false,
         site: '',
+        showphone: false,
         areas: [],
         streets: [],
         residentials: [],
@@ -283,6 +288,10 @@
         compoent.baseinfo.base.f_idnumber = msg.strID
         compoent.baseinfo.base.f_user_name = msg.strName.trim()
         // compoent.baseinfo.base.f_credentials=["身份证"]
+      },
+      phoneManage () {
+        this.showphone = true
+        console.log('查看用户备用电话信息', this.userphonelist)
       }
     },
     watch: {

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -10,7 +10,7 @@
           <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
           <button class="button_search" style="width: max-content" @click="openBankAccount()" v-if="data.meterinfo[0].f_user_type[0] === '非民用' && ($login.r.includes('银行开户'))">银行开户</button>
         </div>
-        <file-user-essential-info :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
+        <file-user-essential-info :userphonelist="data.baseinfo.userphonelist" :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
                              @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info>
         <file-userinfo-device :userinfodevices.sync="userinfodevices" :show_userinfodevices.sync="show_userinfodevices"
                                    :userinfoid='data.baseinfo.base.f_userinfo_id'></file-userinfo-device>
@@ -160,7 +160,9 @@ export default {
           userinfodevices: [],
           bank: {
             f_bank_name: ''
-          }
+          },
+          //用户备用电话信息
+          userphonelist: []
         },
         addressinfo: {},
         meterinfo: [{
@@ -530,7 +532,9 @@ export default {
             f_idnumber: '',
             f_meter_book_num: ''
           },
-          bank: {}
+          bank: {},
+          //用户备用电话信息
+          userphonelist: []
         },
         addressinfo: {
                 // 详细地址