address-client 3.2.42 → 3.2.44

package/build/dev-server.js

@@ -1,162 +1,162 @@
-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 str = 'http://219.153.176.6:8400/', str2= 'hhttp://219.153.176.6:8400/'
-var str3= 'http://219.153.176.6:8400/'
-var proxyTable = {
-  '/rs/sql':{
-    target: str3,
-    secure:true,
-    changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
-  },
-  '/webapps':{
-    target: str3,
-    secure:true,
-    changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
-  },
-  '/rs/logic/getLogin': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/logic/getInitData': {
-    target: str3,
-    secure:true,
-    changeOrigin:true,
-  },
-  '/rs/logic/getSaleInitData': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/logic':{
-    target: str3,
-    secure:true,
-    changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
-  },
-  '/rs/vue': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/user': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/db': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs/search': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
-  },
-  '/rs/data': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  },
-  '/rs': {
-    // target: 'http://192.168.50.199:8300'
-    target: str3,
-    secure:true,
-    changeOrigin:true
-  }
-}
-
-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')())
-
-// 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'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+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 str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
+var str3= 'https://qnjtkf.cn:7400'
+var proxyTable = {
+  '/rs/sql':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/webapps':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/logic/getLogin': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/logic/getInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true,
+  },
+  '/rs/logic/getSaleInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/logic':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/vue': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/user': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/db': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/search': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/data': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs': {
+    // target: 'http://192.168.50.199:8300'
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  }
+}
+
+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')())
+
+// 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'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.42",
+  "version": "3.2.44",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/components/AddressList.vue

@@ -15,7 +15,7 @@
               </res-select>
             </div>
             <div :class="$parent.$parent.style" v-if="$parent.$parent.showrightchange">
-              <label class="font_normal_body">用户编号</label>
+              <label class="font_normal_body">客户编号</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
                       condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
             </div>
@@ -101,7 +101,7 @@
               />
             </div>
             <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">详细地址</label>
+              <label class="font_normal_body">客户地址</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_address" style="width:60%"
                       condition="a.f_address like '%{}%'" placeholder="详细地址"
                       :size="model.f_address ? model.f_address.length*2 : 8"/>
@@ -138,7 +138,7 @@
       <data-grid  :model="model" partial='list' style="overflow: auto" class="list_area table_sy" :optional="true" v-ref:grid>
         <template partial='head'>
           <th><nobr>序号</nobr></th>
-          <th><nobr>用户编号</nobr></th>
+          <th><nobr>客户编号</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>区/县</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
           <th><nobr>街道/乡镇</nobr></th>
@@ -147,7 +147,7 @@
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>单元</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼层</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>门牌号</nobr></th>
-          <th><nobr>详细地址</nobr></th>
+          <th><nobr>客户地址</nobr></th>
           <th><nobr>地址状态</nobr></th>
           <th><nobr>状态</nobr></th>
           <th><nobr>时间</nobr></th>

package/src/components/AreaList.vue

@@ -114,7 +114,7 @@
             <th><nobr>街道/乡镇</nobr></th>
             <!--民用小区信息开始-->
             <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
-            <th v-if="!$parent.$parent.$parent.f_special"><nobr>详细地址</nobr></th>
+            <th v-if="!$parent.$parent.$parent.f_special"><nobr>地址</nobr></th>
             <th v-if="!$parent.$parent.$parent.f_special && !$parent.$parent.$parent.$parent.areaShow"><nobr>小区备注</nobr></th>
             <!--民用小区信息结束-->
             <!--非民用单位信息开始-->

package/src/components/StreetList.vue

@@ -75,7 +75,7 @@
                             :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
             <th><nobr>街道/乡镇</nobr></th>
             <th><nobr>街道编号</nobr></th>
-            <th><data-order field="f_address" name="详细地址"
+            <th><data-order field="f_address" name="地址"
                             :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
             <th><nobr>分公司</nobr></th>
             <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>

package/src/filiale/WEINAN/AddAreaMsg.vue

@@ -56,6 +56,17 @@
                    class="form-control" placeholder="小区名称"
                    v-validate:f_residential_area='{required: true }'>
           </div>
+          <div class="col-sm-6 form-group"
+               :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">安检片区</label>
+            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_check_book_id"
+                   v-validate:f_street_id='{required: true }'>
+            <v-select
+              :value.sync="areamodel.f_check_book_id" :value-single="true"
+              :options='safeCheckArea' placeholder='请选择'
+              close-on-select search="true">
+            </v-select>
+          </div>
           <div v-if="!f_special"
                class="col-sm-12 form-group">
             <label class="font_normal_body">小区地址</label>
@@ -289,7 +300,7 @@
         meterbrands: [],
         adjustables: [],
         sliceArea: [],
-
+        safeCheckArea: [],
         gasproperties: [],
         meterbooks:[{label: '全部',value: ''}],
         housetypeoptions:[{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
@@ -335,6 +346,7 @@
       async initParams() {
         await this.$LoadParams.loadParam(this.f_filialeids)
         this.initBrands()
+        this.initSafeCheckArea()
        // this.initAdjustables()
       },
 
@@ -346,6 +358,19 @@
         })
         this.meterbrands = rs
       },
+      async initSafeCheckArea () {
+        this.safeCheckArea = []
+        let data = {
+          items: 'id,f_check_book_name',
+          tablename: 't_check_book',
+          orderitem: 'id',
+          condition: `f_orgid=${this.$login.f.orgid}`
+        }
+        let ret = await this.$resetpost('rs/sql/address_singleTableOrderBy',{data: data},{resolveMsg: null, rejectMsg: null})
+        ret.data.forEach(item => {
+          this.safeCheckArea.push({label: item.f_check_book_name, value: item.id})
+        })
+      },
 /*
       initAdjustables () {
         let filter = this.$login.f.orgid