address-client 3.2.4 → 3.2.7

package/AddressClient.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="AddressClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.7.0" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/build/dev-server.js

@@ -1,126 +1,125 @@
-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:8090', str2= 'http://192.168.0.227:8400/'
-// var str = 'http://127.0.0.1:8090', str2= 'http://39.98.189.166:8300'
-var proxyTable = {
-
-  '/rs/logic/getLogin': {
-    target: str2
-  },
-  '/rs/vue': {
-    target: str2
-  },
-  '/rs/user': {
-    target: str2
-  },
-  '/rs/db': {
-    target: str2
-  },
-  '/rs/search': {
-    target: str2
-  },
-  '/rs/data': {
-    target: str2
-  },
-  '/rs/logic/getInitData': {
-    target: str2
-  },
-  '/rs/logic/getSaleInitData': {
-    target: str2
-  },
-  '/rs': {
-    // target: 'http://192.168.50.199:8300'
-    target: str2
-  }
-}
-
-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(8086, 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:8080', str2= 'http://192.168.50.4:8400/'
+var proxyTable = {
+
+  '/rs/logic/getLogin': {
+    target: str2
+  },
+  '/rs/vue': {
+    target: str2
+  },
+  '/rs/user': {
+    target: str2
+  },
+  '/rs/db': {
+    target: str2
+  },
+  '/rs/search': {
+    target: str2
+  },
+  '/rs/data': {
+    target: str2
+  },
+  '/rs/logic/getInitData': {
+    target: str2
+  },
+  '/rs/logic/getSaleInitData': {
+    target: str2
+  },
+  '/rs': {
+    // target: 'http://192.168.50.199:8300'
+    target: str
+  }
+}
+
+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.4",
+  "version": "3.2.7",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/components/AddressList.vue

@@ -222,11 +222,11 @@
             </v-select>
           </div>
           <div  class="col-sm-6 form-group " v-if="showModify"
-                :class="[$v.f_area_id.required ? 'has-error' : 'has-success']">
+                :class="[$v.f_residential_area_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">小区名称</label>
-            <input type="text" style="width:41%" v-show="false" v-model="areamodel.f_area_id"
+            <input type="text" style="width:41%" v-show="false" v-model="areamodel.f_residential_area_id"
                    v-validate:f_area_id='{required: true }'>
-            <v-select :value.sync="areamodel.f_area_id" :value-single="true"
+            <v-select :value.sync="areamodel.f_residential_area_id" :value-single="true"
                       :options='areaslist' placeholder='请选择'
                       @change=""
                       close-on-select search="true">
@@ -321,7 +321,7 @@
       readyGen(this)
       this.search()
       this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
-      this.initAreas(this.f_filialeids)
+      this.initareas(`f_filialeid = '${this.f_filialeids}'`)
       this.$refs.paged.$refs.grid.selectInit()
     },
     methods: {
@@ -429,7 +429,7 @@
         let modifyBatchData = {
           userInfos: this.userInfos,
           f_pcd_id: this.areamodel.f_pcd_id,
-          f_area_id: this.areamodel.f_area_id,
+          f_residential_area_id: this.areamodel.f_residential_area_id,
           f_street_id: this.areamodel.f_street_id,
           f_operator: this.$login.f.name,
           f_operatorid: this.$login.f.id,

package/src/components/AddressModel.vue

@@ -1,95 +1,95 @@
-<template>
-  <modal :show.sync="isshow" :width='width'  v-ref:modal backdrop="false">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="closeTree"><span>&times;</span></button>
-      <h4 class="modal-title">地址管理</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="from-group" style="height: 450px;overflow: auto;">
-        <address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
-        <!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect  :show="showType" :value="value"  @re-ref="selectclick"></address-select>-->
-      </div>
-    </article>
-    <footer slot="modal-footer">
-      <button  type="button" class="btn btn-success" @click='confirm'>确认</button>
-    </footer>
-  </modal>
-</template>
-
-<script>
-  export default {
-    name: "AddressModel",
-    title: '地址管理弹窗',
-    props: {
-      // 地址查询方式
-      isquery: {
-        type: Boolean,
-        default: true,
-      },
-      //位置信息
-      f_location: {
-        type: Object,
-        default: {
-          f_locationId: '1535',
-          f_locationType: 't_organization',
-        }
-      },
-      //是否显示
-      isshow: {
-        type: Boolean,
-        default : false,
-      },
-      // 是否选中
-      isselect: {
-        type: Boolean,
-        default: false,
-      },
-      // 默认显示地址
-      value:{
-        type: Object
-      },
-      // 下拉选择 || 树选择
-      showType: {
-        type: Boolean,
-        default: false
-      },
-      // 是否显示批量添加
-      isbasch: {
-        type: Boolean,
-        default: true,
-      }
-    },
-    data(){
-      return{
-        width: '90%'
-      }
-    },
-    methods:{
-      confirm(){
-        this.$emit('addressno')
-      },
-      // 关闭 弹窗
-      closeTree() {
-        this.isshow = false
-        this.$emit('addressno')
-      }
-      // 选中
-      // selectclick(newobj, address) {
-      //   this.$emit('re-ref', newobj, address)
-      // }
-    },
-    watch:{
-      //显示改变且为true
-      'isshow'(val){
-        if(val){
-          //刷新数据
-          this.$refs.addresstree.init()
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <modal :show.sync="isshow" :width='width'  v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeTree"><span>&times;</span></button>
+      <h4 class="modal-title">地址管理</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group" style="height: 450px;overflow: auto;">
+        <address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
+        <!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect  :show="showType" :value="value"  @re-ref="selectclick"></address-select>-->
+      </div>
+    </article>
+    <footer slot="modal-footer">
+      <button  type="button" class="btn btn-success" @click='confirm'>确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+  export default {
+    name: "AddressModel",
+    title: '地址管理弹窗',
+    props: {
+      // 地址查询方式
+      isquery: {
+        type: Boolean,
+        default: true,
+      },
+      //位置信息
+      f_location: {
+        type: Object,
+        default: {
+          f_locationId: '1535',
+          f_locationType: 't_organization',
+        }
+      },
+      //是否显示
+      isshow: {
+        type: Boolean,
+        default : false,
+      },
+      // 是否选中
+      isselect: {
+        type: Boolean,
+        default: false,
+      },
+      // 默认显示地址
+      value:{
+        type: Object
+      },
+      // 下拉选择 || 树选择
+      showType: {
+        type: Boolean,
+        default: false
+      },
+      // 是否显示批量添加
+      isbasch: {
+        type: Boolean,
+        default: true,
+      }
+    },
+    data(){
+      return{
+        width: '90%'
+      }
+    },
+    methods:{
+      confirm(){
+        this.$emit('addressno')
+      },
+      // 关闭 弹窗
+      closeTree() {
+        this.isshow = false
+        this.$emit('addressno')
+      }
+      // 选中
+      // selectclick(newobj, address) {
+      //   this.$emit('re-ref', newobj, address)
+      // }
+    },
+    watch:{
+      //显示改变且为true
+      'isshow'(val){
+        if(val){
+          //刷新数据
+          this.$refs.addresstree.init()
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>