address-client 3.2.102 → 3.2.103-ls

package/package.json

@@ -1,100 +1,100 @@
-{
-  "name": "address-client",
-  "version": "3.2.102",
-  "description": "地址管理前台组件",
-  "author": "wanbochao",
-  "license": "ISC",
-  "main": "src/index.js",
-  "keywords": [
-    "sale"
-  ],
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js",
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/address_management.git"
-  },
-  "dependencies": {
-    "less-loader": "^2.2.3",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less": "^2.7.3",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.5.0",
-    "sale-client": "3.2.11-17",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "ldap-clients": "3.0.48",
-    "system-clients": "3.2.68",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.98",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "jsencrypt": "3.0.0-rc.1",
-    "axios": "0.15.3"
-  }
-}
+{
+  "name": "address-client",
+  "version": "3.2.103-ls",
+  "description": "地址管理前台组件",
+  "author": "wanbochao",
+  "license": "ISC",
+  "main": "src/index.js",
+  "keywords": [
+    "sale"
+  ],
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js",
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/address_management.git"
+  },
+  "dependencies": {
+    "less-loader": "^2.2.3",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "less": "^2.7.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-client": "3.2.11-17",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "ldap-clients": "3.0.48",
+    "system-clients": "3.2.68",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.98",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "jsencrypt": "3.0.0-rc.1",
+    "axios": "0.15.3"
+  }
+}

package/src/address.js

@@ -1,74 +1,74 @@
-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) })
-  // 社区管理
-  Vue.component('community-manage', (resolve) => { require(['./components/CommunityManage'], resolve) })
-  // 街道办列表
-  Vue.component('community-manage-list', (resolve) => { require(['./components/CommunityManageList'], resolve) })
-  // 新增/修改 街道办信息
-  Vue.component('add-community-manage-msg', (resolve) => { require(['./components/AddCommunityManageMsg'], resolve) })
-  // 新增/修改 街道办信息
-  Vue.component('community-area-list', (resolve) => { require(['./components/CommunityAreaList'], 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) })
+  // 社区管理
+  Vue.component('community-manage', (resolve) => { require(['./components/CommunityManage'], resolve) })
+  // 街道办列表
+  Vue.component('community-manage-list', (resolve) => { require(['./components/CommunityManageList'], resolve) })
+  // 新增/修改 街道办信息
+  Vue.component('add-community-manage-msg', (resolve) => { require(['./components/AddCommunityManageMsg'], resolve) })
+  // 新增/修改 街道办信息
+  Vue.component('community-area-list', (resolve) => { require(['./components/CommunityAreaList'], resolve) })
+
+  // 分公司特殊页面注册替换
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}

package/src/components/AddStreetOrPcd.vue

@@ -1,320 +1,321 @@
-<template>
-  <div class="span">
-    <validator name='v'>
-      <p class="bg-info text-center" style="padding: 8px;" v-if="operation=='add'">添加{{areatype}}</p>
-      <p class="bg-info text-center" style="padding: 8px;" v-if="operation=='modify'&&areatype=='街道'">修改【{{streetmodel.f_street}}】街道</p>
-      <p class="bg-info text-center" style="padding: 8px;" v-if="operation=='modify'&&areatype=='省市区'">修改【{{pcdmodel.f_pcd}}】</p>
-      <div class="auto select-overspread form-horizontal">
-        <div style="text-align:right;margin-top:6px;" class="col-sm-12">
-          <!-- 省市区-->
-          <div v-if="areatype=='省市区'" class="row">
-            <div class="col-sm-6 form-group "
-                 :class="[$v.f_province.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">省&emsp;&emsp;份</label>
-                <input type="text"  v-model="pcdmodel.f_province"
-                       class="input_search" style="width:60%" placeholder="省份"
-                       v-validate:f_province='{required: true }'>
-            </div>
-            <div class="col-sm-6 form-group "
-                 :class="[$v.f_city.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">城&emsp;&emsp;市</label>
-                <input type="text"  v-model="pcdmodel.f_city"
-                       class="input_search" style="width:60%" placeholder="城市"
-                       v-validate:f_city='{required: true }'>
-            </div>
-            <div class="col-sm-6 form-group "
-                 :class="[$v.f_district.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">区&ensp;&ensp;/&ensp;县</label>
-                <input type="text"  v-model="pcdmodel.f_district"
-                       class="input_search" style="width:60%" placeholder="区/县"
-                       v-validate:f_district='{required: true }'>
-            </div>
-            <div class="col-sm-6 form-group " v-if="config.hasnumber"
-                 :class="[$v.f_pcd_number.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">区域编码</label>
-              <input type="number"  v-model="pcdmodel.f_pcd_number"
-                     class="input_search" style="width:60%" placeholder="区/县"
-                     @change="numberyanzheng"
-                     v-validate:f_pcd_number='{required: true }'>
-            </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="pcdmodel.f_comments"></textarea>
-            </div>
-          </div>
-          <!-- 街道-->
-          <div v-if="areatype=='街道'" 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="streetmodel.f_pcd_id"
-                       v-validate:f_pcd_id='{required: true }'>
-                <v-select
-                  :value.sync="streetmodel.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.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">街道/乡镇</label>
-                <input type="text"  v-model="streetmodel.f_street"
-                       class="input_search" style="width:60%" placeholder="街道/乡镇"
-                       v-validate:f_street='{required: true }'>
-            </div>
-            <div class="col-sm-6 form-group " v-if="config.hasnumber"
-                 :class="[$v.f_street_number.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">街道编号</label>
-              <input type="text"  v-model="streetmodel.f_street_number"
-                     @change="streetyanzheng"
-                     class="input_search" style="width:60%" placeholder="街道编号"
-                     v-validate:f_street_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="streetmodel.f_iscity"
-                     v-validate:f_iscity='{required: true }'>
-              <v-select
-                :value.sync="streetmodel.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="streetmodel.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 v-if="areatype=='省市区'" class="row" style="margin-top:40px;height: 580px;">
-            <city-list v-ref:addpcd @select-changed="selected" :f_filialeids.sync="f_filialeids"></city-list>
-            </div>
-          </div>
-        </div>
-    </validator>
-  </div>
-</template>
-
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  let getAreaConfig = async function (self) {
-    // 获取气价里面的配置
-    await self.$getConfig(self, 'UserPcd')
-    console.log('原地址配置',self.config)
-    console.log('获取地址配置',self.config)
-    Object.assign(self.model, self.config)
-  }
-  export default {
-    title: '区域地址添加',
-    data () {
-      return {
-        //初始化省市区数据
-        config:{
-          hasnumber: false
-        },
-        pcdslist:[],
-        iscity:[{label:'市区',value:'市区'},{label:'乡镇',value:'乡镇'}],
-        //省市区
-        pcdmodel: {
-          f_province:'',
-          f_city:'',
-          f_district:'',
-          f_comments:'',
-          f_pcd_number: ''
-        },
-        //街道
-        streetmodel: {
-          f_pcd_id:'',
-          f_street_id:'',
-          slice_area: null,
-          f_slice_area: null,
-          f_adjustable_id: null,
-          f_street:'',
-          f_comments:'',
-          f_street_number:''
-        }
-      }
-    },
-    props: ['f_filialeids', 'areatype','row','operation'],
-    ready(){
-      this.initdata()
-      getAreaConfig(this)
-    },
-    methods: {
-      async streetyanzheng(){
-        console.log(this.streetmodel.f_street_number.length)
-        if (this.streetmodel.f_street_number.length != 2){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
-          this.streetmodel.f_street_number = ''
-        }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
-            data: {
-              items: '*',
-              tablename: 't_street',
-              orderitem: 'id',
-              condition: `f_street_number = '${this.streetmodel.f_street_number}' and f_orgid = '${this.$login.f.orgid}'`
-            }
-          }, {resolveMsg: null, rejectMsg: null})
-          if (res.data.length>0){
-            if (res.data[0].id != this.streetmodel.id) {
-              this.$showAlert('当前编号已存在', 'warning', 2000)
-              this.streetmodel.f_street_number = ''
-            }
-          }
-        }
-      },
-      async numberyanzheng(){
-        console.log(this.pcdmodel.f_pcd_number.length)
-        if (this.pcdmodel.f_pcd_number.length != 3){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
-          this.pcdmodel.f_pcd_number = ''
-        }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
-            data: {
-              items: '*',
-              tablename: 't_pcd',
-              orderitem: 'id',
-              condition: `f_pcd_number = '${this.pcdmodel.f_pcd_number}' and f_orgid = '${this.$login.f.orgid}'`
-            }
-          }, {resolveMsg: null, rejectMsg: null})
-          if (res.data.length>0){
-            if (res.data[0].id != this.pcdmodel.id) {
-              this.$showAlert('当前编号已存在', 'warning', 2000)
-              this.pcdmodel.f_pcd_number = ''
-            }
-          }
-        }
-      },
-      //初始化省市区,添加街道
-      initpcds(pconditon){
-        console.log("省市区准备")
-        let HttpReset = new HttpResetClass()
-        HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
-          data: {
-            items: '*',
-            tablename: 't_pcd',
-            orderitem: 'id',
-            condition: pconditon
-          }
-        }, {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
-        })
-      },
-      //根据名字找数据
-      findbyid(list,name){
-        var result
-        list.forEach((row, n) => {
-          if(name==row.id){
-            result= row.data
-          }
-        })
-        return result
-      },
-      //初始化数据
-      initdata(){
-        if(this.areatype=='街道'){
-          this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
-        }
-        if(this.areatype=='小区'){
-          this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
-          this.initstreets(` f_filialeid = '${this.f_filialeids}'`)
-        }
-      },
-      //省/市/区变化
-      pcdChange(val){
-        console.log("省/市/区变化",val)
-        this.$resetValidation()
-      },
-      //保存
-      async confirm(){
-        if(this.areatype=='省市区'){
-          await this.savepcd()
-        }
-        if(this.areatype=='街道'){
-          await this.savestreet()
-        }
-        this.cleardara()
-        this.$dispatch('confirm')
-      },
-      //保存省市区
-      async savepcd(){
-        this.pcdmodel.f_filialeid = this.f_filialeids
-        this.pcdmodel.f_operator = this.$login.f.name
-        this.pcdmodel.f_operatorid = this.$login.f.id
-        this.pcdmodel.f_orgid = this.$login.f.orgid
-        this.pcdmodel.f_orgname = this.$login.f.orgs
-        this.pcdmodel.f_depid = this.$login.f.depids
-        this.pcdmodel.f_depname = this.$login.f.deps
-        this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
-        await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
-      },
-      //保存街道
-      async savestreet(){
-        this.streetmodel.f_filialeid = this.f_filialeids
-        this.streetmodel.f_operator= this.$login.f.name
-        this.streetmodel.f_operatorid = this.$login.f.id
-        this.streetmodel.f_orgid = this.$login.f.orgid
-        this.streetmodel.f_orgname = this.$login.f.orgs
-        this.streetmodel.f_depid = this.$login.f.depids
-        this.streetmodel.f_depname = this.$login.f.deps
-        this.streetmodel.f_pcd=this.findbyid(this.pcdslist,this.streetmodel.f_pcd_id).f_pcd
-        console.log('获取街道model', this.streetmodel)
-        await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
-      },
-      cancel(){
-        this.cleardara()
-        this.$dispatch('cancel')
-      },
-      cleardara () {
-        this.pcdmodel = {
-          f_province: '',
-          f_city: '',
-          f_district: '',
-          f_comments:''
-        }
-        this.streetmodel = {
-          f_pcd_id: '',
-          f_slice_area: '',
-          f_adjustable_id: '',
-          f_street: '',
-          f_comments:''
-        }
-      }
-
-    },
-    watch: {
-      'areatype'(){
-        this.initdata()
-      },
-      'f_filialeids'(){
-        if (this.streetmodel.f_filialeid) {
-          if (this.streetmodel.f_filialeid != this.f_filialeids) {
-            this.$dispatch('cancel')
-          }
-        }
-        if (this.pcdmodel.f_filialeid) {
-          if (this.pcdmodel.f_filialeid != this.f_filialeids) {
-            this.$dispatch('cancel')
-          }
-        }
-        this.initdata()
-      }
-    }
-  }
-</script>
+<template>
+  <div class="span">
+    <validator name='v'>
+      <p class="bg-info text-center" style="padding: 8px;" v-if="operation=='add'">添加{{areatype}}</p>
+      <p class="bg-info text-center" style="padding: 8px;" v-if="operation=='modify'&&areatype=='街道'">修改【{{streetmodel.f_street}}】街道</p>
+      <p class="bg-info text-center" style="padding: 8px;" v-if="operation=='modify'&&areatype=='省市区'">修改【{{pcdmodel.f_pcd}}】</p>
+      <div class="auto select-overspread form-horizontal">
+        <div style="text-align:right;margin-top:6px;" class="col-sm-12">
+          <!-- 省市区-->
+          <div v-if="areatype=='省市区'" class="row">
+            <div class="col-sm-6 form-group "
+                 :class="[$v.f_province.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">省&emsp;&emsp;份</label>
+                <input type="text"  v-model="pcdmodel.f_province"
+                       class="input_search" style="width:60%" placeholder="省份"
+                       v-validate:f_province='{required: true }'>
+            </div>
+            <div class="col-sm-6 form-group "
+                 :class="[$v.f_city.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+                <input type="text"  v-model="pcdmodel.f_city"
+                       class="input_search" style="width:60%" placeholder="城市"
+                       v-validate:f_city='{required: true }'>
+            </div>
+            <div class="col-sm-6 form-group "
+                 :class="[$v.f_district.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">区&ensp;&ensp;/&ensp;县</label>
+                <input type="text"  v-model="pcdmodel.f_district"
+                       class="input_search" style="width:60%" placeholder="区/县"
+                       v-validate:f_district='{required: true }'>
+            </div>
+            <div class="col-sm-6 form-group " v-if="config.hasnumber"
+                 :class="[$v.f_pcd_number.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">区域编码</label>
+              <input type="number"  v-model="pcdmodel.f_pcd_number"
+                     class="input_search" style="width:60%" placeholder="区/县"
+                     @change="numberyanzheng"
+                     v-validate:f_pcd_number='{required: true }'>
+            </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="pcdmodel.f_comments"></textarea>
+            </div>
+          </div>
+          <!-- 街道-->
+          <div v-if="areatype=='街道'" 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="streetmodel.f_pcd_id"
+                       v-validate:f_pcd_id='{required: true }'>
+                <v-select
+                  :value.sync="streetmodel.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.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">街道/乡镇</label>
+                <input type="text"  v-model="streetmodel.f_street"
+                       class="input_search" style="width:60%" placeholder="街道/乡镇"
+                       v-validate:f_street='{required: true }'>
+            </div>
+            <div class="col-sm-6 form-group " v-if="config.hasnumber"
+                 :class="[$v.f_street_number.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">街道编号</label>
+              <input type="text"  v-model="streetmodel.f_street_number"
+                     @change="streetyanzheng"
+                     class="input_search" style="width:60%" placeholder="街道编号"
+                     v-validate:f_street_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="streetmodel.f_iscity"
+                     v-validate:f_iscity='{required: true }'>
+              <v-select
+                :value.sync="streetmodel.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="streetmodel.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 v-if="areatype=='省市区'" class="row" style="margin-top:40px;height: 580px;">
+            <city-list v-ref:addpcd @select-changed="selected" :f_filialeids.sync="f_filialeids"></city-list>
+            </div>
+          </div>
+        </div>
+    </validator>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  let getAreaConfig = async function (self) {
+    // 获取气价里面的配置
+    await self.$getConfig(self, 'UserPcd')
+    console.log('原地址配置',self.config)
+    console.log('获取地址配置',self.config)
+    Object.assign(self.model, self.config)
+  }
+  export default {
+    title: '区域地址添加',
+    data () {
+      return {
+        //初始化省市区数据
+        config:{
+          hasnumber: false
+        },
+        pcdslist:[],
+        iscity:[{label:'市区',value:'市区'},{label:'乡镇',value:'乡镇'}],
+        //省市区
+        pcdmodel: {
+          f_province:'',
+          f_city:'',
+          f_district:'',
+          f_comments:'',
+          f_pcd_number: ''
+        },
+        //街道
+        streetmodel: {
+          f_pcd_id:'',
+          f_street_id:'',
+          slice_area: null,
+          f_slice_area: null,
+          f_adjustable_id: null,
+          f_street:'',
+          f_comments:'',
+          f_street_number:''
+        }
+      }
+    },
+    props: ['f_filialeids', 'areatype','row','operation'],
+    ready(){
+      this.initdata()
+      getAreaConfig(this)
+    },
+    methods: {
+      async streetyanzheng(){
+        console.log(this.streetmodel.f_street_number.length)
+        if (this.streetmodel.f_street_number.length != 2){
+          this.$showAlert('请输入正确的位数', 'warning', 2000)
+          this.streetmodel.f_street_number = ''
+        }else{
+          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+            data: {
+              items: '*',
+              tablename: 't_street',
+              orderitem: 'id',
+              condition: `f_street_number = '${this.streetmodel.f_street_number}' and f_orgid = '${this.$login.f.orgid}'`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          if (res.data.length>0){
+            if (res.data[0].id != this.streetmodel.id) {
+              this.$showAlert('当前编号已存在', 'warning', 2000)
+              this.streetmodel.f_street_number = ''
+            }
+          }
+        }
+      },
+      async numberyanzheng(){
+        console.log(this.pcdmodel.f_pcd_number.length)
+        if (this.pcdmodel.f_pcd_number.length != 3){
+          this.$showAlert('请输入正确的位数', 'warning', 2000)
+          this.pcdmodel.f_pcd_number = ''
+        }else{
+          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+            data: {
+              items: '*',
+              tablename: 't_pcd',
+              orderitem: 'id',
+              condition: `f_pcd_number = '${this.pcdmodel.f_pcd_number}' and f_orgid = '${this.$login.f.orgid}'`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          if (res.data.length>0){
+            if (res.data[0].id != this.pcdmodel.id) {
+              this.$showAlert('当前编号已存在', 'warning', 2000)
+              this.pcdmodel.f_pcd_number = ''
+            }
+          }
+        }
+      },
+      //初始化省市区,添加街道
+      initpcds(pconditon){
+        console.log("省市区准备")
+        let HttpReset = new HttpResetClass()
+        HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_pcd',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {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
+        })
+      },
+      //根据名字找数据
+      findbyid(list,name){
+        var result
+        list.forEach((row, n) => {
+          if(name==row.id){
+            result= row.data
+          }
+        })
+        return result
+      },
+      //初始化数据
+      initdata(){
+        if(this.areatype=='街道'){
+          this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
+        }
+        if(this.areatype=='小区'){
+          this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
+          this.initstreets(` f_filialeid = '${this.f_filialeids}'`)
+        }
+      },
+      //省/市/区变化
+      pcdChange(val){
+        console.log("省/市/区变化",val)
+        this.$resetValidation()
+      },
+      //保存
+      async confirm(){
+        if(this.areatype=='省市区'){
+          await this.savepcd()
+          this.$refs.addpcd.search()
+        }
+        if(this.areatype=='街道'){
+          await this.savestreet()
+        }
+        this.cleardara()
+        this.$dispatch('confirm')
+      },
+      //保存省市区
+      async savepcd(){
+        this.pcdmodel.f_filialeid = this.f_filialeids
+        this.pcdmodel.f_operator = this.$login.f.name
+        this.pcdmodel.f_operatorid = this.$login.f.id
+        this.pcdmodel.f_orgid = this.$login.f.orgid
+        this.pcdmodel.f_orgname = this.$login.f.orgs
+        this.pcdmodel.f_depid = this.$login.f.depids
+        this.pcdmodel.f_depname = this.$login.f.deps
+        this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
+        await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
+      },
+      //保存街道
+      async savestreet(){
+        this.streetmodel.f_filialeid = this.f_filialeids
+        this.streetmodel.f_operator= this.$login.f.name
+        this.streetmodel.f_operatorid = this.$login.f.id
+        this.streetmodel.f_orgid = this.$login.f.orgid
+        this.streetmodel.f_orgname = this.$login.f.orgs
+        this.streetmodel.f_depid = this.$login.f.depids
+        this.streetmodel.f_depname = this.$login.f.deps
+        this.streetmodel.f_pcd=this.findbyid(this.pcdslist,this.streetmodel.f_pcd_id).f_pcd
+        console.log('获取街道model', this.streetmodel)
+        await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
+      },
+      cancel(){
+        this.cleardara()
+        this.$dispatch('cancel')
+      },
+      cleardara () {
+        this.pcdmodel = {
+          f_province: '',
+          f_city: '',
+          f_district: '',
+          f_comments:''
+        }
+        this.streetmodel = {
+          f_pcd_id: '',
+          f_slice_area: '',
+          f_adjustable_id: '',
+          f_street: '',
+          f_comments:''
+        }
+      }
+
+    },
+    watch: {
+      'areatype'(){
+        this.initdata()
+      },
+      'f_filialeids'(){
+        if (this.streetmodel.f_filialeid) {
+          if (this.streetmodel.f_filialeid != this.f_filialeids) {
+            this.$dispatch('cancel')
+          }
+        }
+        if (this.pcdmodel.f_filialeid) {
+          if (this.pcdmodel.f_filialeid != this.f_filialeids) {
+            this.$dispatch('cancel')
+          }
+        }
+        this.initdata()
+      }
+    }
+  }
+</script>

package/src/components/CityList.vue

@@ -90,6 +90,7 @@
             this.$showAlert('该区县下已有街道信息,无法删除!','warning',1000)
           }else{
             this.$resetdelete('rs/entity/t_pcd', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.search()
               this.$dispatch('cancel')
             })
           }

package/src/components/CommunityManage.vue

@@ -1,78 +1,78 @@
-<template>
-  <div id="unit" class="flex-row " :class="{'binary':communityManageShow == 0}">
-    <div :class="{'basic-main':communityManageShow == 0,'binary-left':communityManageShow != 0}">
-      <community-manage-list @child-dblclick="selected"
-                          :f_filialeids.sync="f_filialeids"
-                          v-ref:communitymanage>
-      </community-manage-list>
-    </div>
-    <div v-show="communityManageShow == 1" class="binary-right">
-      <add-community-manage-msg v-ref:addcommunitymanage
-                             :f_filialeids.sync="f_filialeids">
-      </add-community-manage-msg>
-    </div>
-    <div v-show="communityManageShow == 2" style="width: 60%" class="binary-right">
-      <div class="flex">
-        <community-area-list v-if="communityid" :communityid="communityid"></community-area-list>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '社区管理',
-  components: {},
-  data () {
-    return {
-      // 分公司id串
-      f_filialeids: this.$login.f.orgid,
-      communityid: null,
-      communityManageShow: 0
-    }
-  },
-  props: {},
-  methods: {
-    selected (obj) {
-      if (obj && obj.id) {
-        if (obj.f_filialeid != this.f_filialeids) {
-          this.refresh()
-          return
-        }
-        this.communityManageShow = 1
-        this.$refs.addcommunitymanage.businesstype = '修改' + obj.f_community_name
-        this.$refs.addcommunitymanage.communitymodel = Object.assign({}, obj)
-      }
-    },
-    refresh () {
-      this.communityManageShow = 0
-      this.$refs.communitymanage.$refs.paged.$refs.cri.search()
-    }
-  },
-  events: {
-    'shouAllArea' (row) {
-      this.style = 'col-sm-3 form-group'
-      this.communityManageShow = 2
-      this.communityid = row.id
-    },
-    'add' (areatype) {
-      this.style = 'col-sm-3 '
-      this.communityManageShow = 1
-      this.$refs.addcommunitymanage.businesstype = '新增'
-      this.$refs.addcommunitymanage.clearData()
-    },
-    'confirm' () {
-      this.style = 'col-sm-2 '
-      this.refresh()
-    },
-    'cancel' () {
-      this.style = 'col-sm-2 '
-      this.communityManageShow = 0
-      this.communityid = null
-      this.$refs.communitymanage.$refs.paged.$refs.cri.search()
-    }
-  }
-}
-</script>
-
-
+<template>
+  <div id="unit" class="flex-row " :class="{'binary':communityManageShow == 0}">
+    <div :class="{'basic-main':communityManageShow == 0,'binary-left':communityManageShow != 0}">
+      <community-manage-list @child-dblclick="selected"
+                          :f_filialeids.sync="f_filialeids"
+                          v-ref:communitymanage>
+      </community-manage-list>
+    </div>
+    <div v-show="communityManageShow == 1" class="binary-right">
+      <add-community-manage-msg v-ref:addcommunitymanage
+                             :f_filialeids.sync="f_filialeids">
+      </add-community-manage-msg>
+    </div>
+    <div v-show="communityManageShow == 2" style="width: 60%" class="binary-right">
+      <div class="flex">
+        <community-area-list v-if="communityid" :communityid="communityid"></community-area-list>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '社区管理',
+  components: {},
+  data () {
+    return {
+      // 分公司id串
+      f_filialeids: this.$login.f.orgid,
+      communityid: null,
+      communityManageShow: 0
+    }
+  },
+  props: {},
+  methods: {
+    selected (obj) {
+      if (obj && obj.id) {
+        if (obj.f_filialeid != this.f_filialeids) {
+          this.refresh()
+          return
+        }
+        this.communityManageShow = 1
+        this.$refs.addcommunitymanage.businesstype = '修改' + obj.f_community_name
+        this.$refs.addcommunitymanage.communitymodel = Object.assign({}, obj)
+      }
+    },
+    refresh () {
+      this.communityManageShow = 0
+      this.$refs.communitymanage.$refs.paged.$refs.cri.search()
+    }
+  },
+  events: {
+    'shouAllArea' (row) {
+      this.style = 'col-sm-3 form-group'
+      this.communityManageShow = 2
+      this.communityid = row.id
+    },
+    'add' (areatype) {
+      this.style = 'col-sm-3 '
+      this.communityManageShow = 1
+      this.$refs.addcommunitymanage.businesstype = '新增'
+      this.$refs.addcommunitymanage.clearData()
+    },
+    'confirm' () {
+      this.style = 'col-sm-2 '
+      this.refresh()
+    },
+    'cancel' () {
+      this.style = 'col-sm-2 '
+      this.communityManageShow = 0
+      this.communityid = null
+      this.$refs.communitymanage.$refs.paged.$refs.cri.search()
+    }
+  }
+}
+</script>
+
+

package/src/filiale/xinkang/sale.js

@@ -1,9 +1,9 @@
-// 添加小区管理
-import Vue from 'vue'
-
-let specialComp = {
-  'area-list': (resolve) => { require(['./AreaList'], resolve) },
-  // 添加小区
-  'add-area-msg': (resolve) => { require(['./AddAreaMsg'], resolve) }
-}
-exports.specialComp = specialComp
+// 添加小区管理
+import Vue from 'vue'
+
+let specialComp = {
+  'area-list': (resolve) => { require(['./AreaList'], resolve) },
+  // 添加小区
+  'add-area-msg': (resolve) => { require(['./AddAreaMsg'], resolve) }
+}
+exports.specialComp = specialComp