address-client 3.2.83 → 3.2.85

package/build/dev-server.js

@@ -10,85 +10,85 @@ 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 str = 'http://127.0.0.1:8488', str2= 'http://192.168.50.4:8400/'
 var str3= 'http://192.168.50.4:8400/'
 var proxyTable = {
-  '/rs/sql':{
-    target: str3
-    // ,
+  '/rs/entity': {
+    target: str
     // secure:true,
     // changeOrigin:true
     // target: 'http://127.0.0.1:8080'
   },
   '/webapps':{
-    target: str3
-    // ,
-    // secure:true,
-    // changeOrigin:true
+    target: str3,
+    secure:true,
+    changeOrigin:true
     // target: 'http://127.0.0.1:8080'
   },
   '/rs/logic/getLogin': {
-    target: str3
-    // ,
-    // secure:true,
-    // changeOrigin:true
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/logic/getInitData': {
-    target: str3
-    // ,
-    // secure:true,
-    // changeOrigin:true,
+    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'
+    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
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/user': {
-    target: str3
-    // ,
-    // secure:true,
-    // changeOrigin:true
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/db': {
-    target: str3
-    // ,
-    // secure:true,
-    // changeOrigin:true
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/search': {
-    target: str3
-    // ,
-    // secure:true,
-    // changeOrigin:true
+    target: str3,
+    secure:true,
+    changeOrigin:true
     // target: 'http://127.0.0.1:8080'
   },
   '/rs/data': {
-    target: str3
-    // ,
-    // secure:true,
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/sql': {
+    target: str
+    // secure: true,
     // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/logic': {
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
   '/rs': {
     // target: 'http://192.168.50.199:8300'
-    target: str3
-    // ,
-    // secure:true,
-    // changeOrigin:true
+    target: str3,
+    secure:true,
+    changeOrigin:true
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.83",
+  "version": "3.2.85",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -78,10 +78,10 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "ldap-clients": "3.0.55-test-1",
-    "system-clients": "3.2.61",
+    "ldap-clients": "3.0.48",
+    "system-clients": "3.2.68",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.86",
+    "vue-client": "1.24.98",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/address.js

@@ -1,57 +1,65 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-// import 'babel-polyfill'
-
-export default function (filiale) {
-  Vue.config.silent = false
-  /** ********************** pc端 *********************** **/
-  Vue.component('address-select', (resolve) => { require(['./components/AddressModel'], resolve) })
-  Vue.component('address-model', (resolve) => { require(['./components/AddressModel'], resolve) })
-// 添加地址
-  Vue.component('address-add-address', (resolve) => { require(['./components/AddressAddAddress'], resolve) })
-//  地址树
-  Vue.component('address-tree', (resolve) => { require(['./components/AddressTree'], resolve) })
-  //小区树
-  Vue.component('area-tree', (resolve) => { require(['./components/AreaTree'], resolve) })
-  /** ********************** 新地址管理 *********************** **/
-  //地址建档
-  Vue.component('address-files', (resolve) => { require(['./components/AddressFiles'], resolve) })
-  //小区建档
-  Vue.component('area-files', (resolve) => { require(['./components/AreaFiles'], resolve) })
-  //街道列表
-  Vue.component('street-list', (resolve) => { require(['./components/StreetList'], resolve) })
-  //省市区列表
-  Vue.component('city-list', (resolve) => { require(['./components/CityList'], resolve) })
-  //街道管理（包含街道，省区县的添加）
-  Vue.component('city-manage', (resolve) => { require(['./components/CityManage'], resolve) })
-  //街道区县添加
-  Vue.component('add-street-pcd', (resolve) => { require(['./components/AddStreetOrPcd'], resolve) })
-  //小区列表
-  Vue.component('area-list', (resolve) => { require(['./components/AreaList'], resolve) })
-  //小区管理（包含修改表具，小区的添加）
-  Vue.component('area-manage', (resolve) => { require(['./components/AreaManage'], resolve) })
-  // 楼栋列表
-  Vue.component('building-list', (resolve) => { require(['./components/BuildingList'], resolve) })
-  //单位管理（）
-  Vue.component('company-manage', (resolve) => { require(['./components/CompanyManage'], resolve) })
-  //小区添加
-  Vue.component('add-area-msg', (resolve) => { require(['./components/AddAreaMsg'], resolve) })
-  //地址管理父组件
-  Vue.component('address-manage', (resolve) => { require(['./components/AddressManage'], resolve) })
-  //地址列表
-  Vue.component('address-list', (resolve) => { require(['./components/AddressList'], resolve) })
-  //地址管理
-  Vue.component('user-address', (resolve) => { require(['./components/UserAddress'], resolve) })
-  //地址变更记录
-  Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
-  //批量置换接单
-  Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
-  // 分公司特殊页面注册替换
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
-}
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+// import 'babel-polyfill'
+
+export default function (filiale) {
+  Vue.config.silent = false
+  /** ********************** pc端 *********************** **/
+  Vue.component('address-select', (resolve) => { require(['./components/AddressModel'], resolve) })
+  Vue.component('address-model', (resolve) => { require(['./components/AddressModel'], resolve) })
+// 添加地址
+  Vue.component('address-add-address', (resolve) => { require(['./components/AddressAddAddress'], resolve) })
+//  地址树
+  Vue.component('address-tree', (resolve) => { require(['./components/AddressTree'], resolve) })
+  //小区树
+  Vue.component('area-tree', (resolve) => { require(['./components/AreaTree'], resolve) })
+  /** ********************** 新地址管理 *********************** **/
+  //地址建档
+  Vue.component('address-files', (resolve) => { require(['./components/AddressFiles'], resolve) })
+  //小区建档
+  Vue.component('area-files', (resolve) => { require(['./components/AreaFiles'], resolve) })
+  //街道列表
+  Vue.component('street-list', (resolve) => { require(['./components/StreetList'], resolve) })
+  //省市区列表
+  Vue.component('city-list', (resolve) => { require(['./components/CityList'], resolve) })
+  //街道管理（包含街道，省区县的添加）
+  Vue.component('city-manage', (resolve) => { require(['./components/CityManage'], resolve) })
+  //街道区县添加
+  Vue.component('add-street-pcd', (resolve) => { require(['./components/AddStreetOrPcd'], resolve) })
+  //小区列表
+  Vue.component('area-list', (resolve) => { require(['./components/AreaList'], resolve) })
+  //小区管理（包含修改表具，小区的添加）
+  Vue.component('area-manage', (resolve) => { require(['./components/AreaManage'], resolve) })
+  // 楼栋列表
+  Vue.component('building-list', (resolve) => { require(['./components/BuildingList'], resolve) })
+  //单位管理（）
+  Vue.component('company-manage', (resolve) => { require(['./components/CompanyManage'], resolve) })
+  //小区添加
+  Vue.component('add-area-msg', (resolve) => { require(['./components/AddAreaMsg'], resolve) })
+  //地址管理父组件
+  Vue.component('address-manage', (resolve) => { require(['./components/AddressManage'], resolve) })
+  //地址列表
+  Vue.component('address-list', (resolve) => { require(['./components/AddressList'], resolve) })
+  //地址管理
+  Vue.component('user-address', (resolve) => { require(['./components/UserAddress'], resolve) })
+  //地址变更记录
+  Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
+  //批量置换接单
+  Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
+  // 地址管理琉璃
+  Vue.component('address-list-liuli', (resolve) => { require(['./components/AddressListLiuLi'], resolve) })
+  // 街道办管理
+  Vue.component('street-manage-manage', (resolve) => { require(['./components/StreetManage'], resolve) })
+  // 街道办列表
+  Vue.component('street-manage-list', (resolve) => { require(['./components/StreetManageList'], resolve) })
+  // 新增/修改 街道办信息
+  Vue.component('add-street-manage-msg', (resolve) => { require(['./components/AddStreetManageMsg'], resolve) })
+  // 分公司特殊页面注册替换
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}

package/src/components/AddStreetManageMsg.vue

@@ -0,0 +1,209 @@
+<template>
+  <div class="span">
+    <validator name='v'>
+      <p class="bg-info text-center" style="padding: 8px;">{{ businesstype }}街道办</p>
+      <div class="auto select-overspread form-horizontal">
+        <div style="text-align:right;margin-top:6px;" class="col-sm-12">
+          <!-- 街道办-->
+          <div class="row">
+            <div class="col-sm-6 form-group "
+                 :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">省&ensp;市&ensp;区</label>
+              <input type="text" v-show="false" v-model="streetmanagemodel.f_pcd_id"
+                     v-validate:f_pcd_id='{required: true }'>
+              <v-select
+                :value.sync="streetmanagemodel.f_pcd_id" :value-single="true"
+                :options='pcdslist' placeholder='请选择'
+                close-on-select search="true" @change="pcdChange">
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group "
+                 :class="[$v.f_street_manage_name.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">街道办名称</label>
+              <input type="text" v-model="streetmanagemodel.f_street_manage_name"
+                     class="input_search" style="width:60%" placeholder="街道办名称"
+                     v-validate:f_street_manage_name='{required: true }'>
+            </div>
+            <div class="col-sm-6 form-group " v-if="config.hasnumber"
+                 :class="[$v.f_street_manage_number.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">街道办编号</label>
+              <input type="text" v-model="streetmanagemodel.f_street_manage_number"
+                     @change="streetyanzheng"
+                     class="input_search" style="width:60%" placeholder="街道办编号"
+                     v-validate:f_street_manage_number='{required: true }'>
+            </div>
+<!--            <div class="col-sm-6 form-group "-->
+<!--                 :class="[$v.f_iscity.required ? 'has-error' : 'has-success']">-->
+<!--              <label class="font_normal_body">地区类型</label>-->
+<!--              <input type="text" v-show="false" v-model="streetmanagemodel.f_iscity"-->
+<!--                     v-validate:f_iscity='{required: true }'>-->
+<!--              <v-select-->
+<!--                :value.sync="streetmanagemodel.f_iscity" :value-single="true"-->
+<!--                :options='iscity' placeholder='请选择'-->
+<!--                close-on-select>-->
+<!--              </v-select>-->
+<!--            </div>-->
+            <div class="col-sm-12 form-group">
+              <label class="font_normal_body " style="">备&emsp;&emsp;注</label>
+              <textarea class="input_textarea" rows="3" style="margin-top:25px;width:80%;height: auto;"
+                        v-model="streetmanagemodel.f_comments"></textarea>
+            </div>
+          </div>
+          <div class="row">
+            <div style="margin-top:40px;text-align:right;">
+              <button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
+              <button class="button_clear button_spacing" @click="cancel()">取消</button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </validator>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+let getAreaConfig = async function (self) {
+  // 获取气价里面的配置
+  await self.$getConfig(self, 'StreetManage')
+  console.log('原地址配置', self.config)
+  console.log('获取地址配置', self.config)
+  Object.assign(self.model, self.config)
+}
+export default {
+  title: '街道办信息添加',
+  data() {
+    return {
+      //初始化省市区数据
+      config: {
+        hasnumber: true
+      },
+      pcdslist: [],
+      //街道办
+      streetmanagemodel: {
+        f_pcd_id: '',
+        f_street_manage_id: '',
+        slice_area: null,
+        f_slice_area: null,
+        f_adjustable_id: null,
+        f_street_manage_name: '',
+        f_comments: '',
+        f_street_manage_number: ''
+      }
+    }
+  },
+  props: ['f_filialeids', 'businesstype'],
+  ready() {
+    this.initdata()
+    getAreaConfig(this)
+  },
+  methods: {
+    async streetyanzheng() {
+      console.log(this.streetmanagemodel.f_street_manage_number.length)
+      if (this.streetmanagemodel.f_street_manage_number.length != 2) {
+        this.$showAlert('请输入正确的位数', 'warning', 2000)
+        this.streetmanagemodel.f_street_manage_number = ''
+      } else {
+        let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_street_manage',
+            orderitem: 'id',
+            condition: `f_street_manage_number = '${this.streetmanagemodel.f_street_manage_number}' and f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        if (res.data.length > 0) {
+          if (res.data[0].id != this.streetmanagemodel.id) {
+            this.$showAlert('当前编号已存在', 'warning', 2000)
+            this.streetmanagemodel.f_street_manage_number = ''
+          }
+        }
+      }
+    },
+    //根据名字找数据
+    findbyid(list, name) {
+      var result
+      list.forEach((row, n) => {
+        if (name == row.id) {
+          result = row.data
+        }
+      })
+      return result
+    },
+    //初始化数据
+    initdata() {
+      console.log("省市区准备")
+      let HttpReset = new HttpResetClass()
+      HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        data: {
+          items: '*',
+          tablename: 't_pcd',
+          orderitem: 'id',
+          condition: ` f_filialeid = '${this.f_filialeids}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'}).then((req) => {
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_pcd,
+            value: row.id,
+            data: row,
+            id: row.id
+          }
+        })
+        this.pcdslist = redata
+      })
+    },
+    //省/市/区变化
+    pcdChange(val) {
+      console.log("省/市/区变化", val)
+      this.$resetValidation()
+    },
+    //保存
+    async confirm() {
+      await this.savestreet()
+      this.clearData()
+      this.$dispatch('confirm')
+    },
+    //保存街道
+    async savestreet() {
+      this.streetmanagemodel.f_filialeid = this.f_filialeids
+      this.streetmanagemodel.f_operator = this.$login.f.name
+      this.streetmanagemodel.f_operatorid = this.$login.f.id
+      this.streetmanagemodel.f_orgid = this.$login.f.orgid
+      this.streetmanagemodel.f_orgname = this.$login.f.orgs
+      this.streetmanagemodel.f_depid = this.$login.f.depids
+      this.streetmanagemodel.f_depname = this.$login.f.deps
+      this.streetmanagemodel.f_pcd = this.findbyid(this.pcdslist, this.streetmanagemodel.f_pcd_id).f_pcd
+      console.log('获取街道model', this.streetmanagemodel)
+      await this.$resetpost('rs/logic/address_updateStreetManage', this.streetmanagemodel)
+    },
+    cancel() {
+      this.clearData()
+      this.$dispatch('cancel')
+    },
+    clearData() {
+      this.streetmanagemodel = {
+        f_pcd_id: '',
+        f_slice_area: '',
+        f_adjustable_id: '',
+        f_street_manage_name: '',
+        f_street_manage_number: '',
+        f_comments: ''
+      }
+    }
+
+  },
+  watch: {
+    'f_filialeids'() {
+      if (this.streetmanagemodel.f_filialeid) {
+        if (this.streetmanagemodel.f_filialeid != this.f_filialeids) {
+          this.$dispatch('cancel')
+        }
+      }
+      this.initdata()
+    }
+  }
+}
+</script>