address-client 3.0.23-28-aode → 3.0.23-3-fx

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Jul 10 10:01:08 CST 2020
-gradle.version=3.5
+#Mon Nov 12 14:18:19 CST 2018
+gradle.version=3.5.1

package/build/dev-server.js

@@ -10,7 +10,7 @@ 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:8091/ldap', str2= 'http://192.168.10.14:8300'
+var str = 'http://61.163.115.30:8300/', str2= 'http://61.163.115.30:8300/'
 var proxyTable = {
 
   '/rs/logic/getLogin': {
@@ -32,11 +32,11 @@ var proxyTable = {
     target: str2
   },
   '/rs/logic/getSaleInitData': {
-    target: str2
+    target: 'http://61.163.115.30:8300/'
   },
   '/rs': {
     // target: 'http://192.168.50.199:8300'
-    target: str2
+    target: 'http://61.163.115.30:8300/'
   }
 }
 

package/package.json

@@ -1,98 +1,99 @@
-{
-  "name": "address-client",
-  "version": "3.0.23-28-aode",
-  "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": "1.0.66-aode",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.1.84",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.22.20-5",
-    "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"
-  }
-}
+{
+  "name": "address-client",
+  "version": "3.0.23-3-fx",
+  "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",
+    "axios": "0.15.3",
+    "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",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-client": "3.1.2-50-fanxian",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.0.47-fanxian",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.22.7",
+    "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"
+  }
+}

package/src/address.js

@@ -27,8 +27,6 @@ export default function () {
   Vue.component('add-street-pcd', (resolve) => { require(['./components/AddStreetOrPcd'], resolve) })
   //小区列表
   Vue.component('area-list', (resolve) => { require(['./components/AreaList'], resolve) })
-  // 使用该小区的用户信息
-  Vue.component('area-user', (resolve) => { require(['./components/areauser/AreaUser.vue'], resolve) })
   //小区管理（包含修改表具，小区的添加）
   Vue.component('area-manage', (resolve) => { require(['./components/AreaManage'], resolve) })
   //单位管理（）
@@ -45,5 +43,4 @@ export default function () {
   Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
   //批量置换接单
   Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
-
 }

package/src/components/AddAreaMsg.vue

@@ -10,15 +10,9 @@
             <span v-if="operation=='modify'&&f_special">修改【{{areamodel.f_residential_area}}】单位</span>
           </div>
           <!--基本小区(单位)信息-->
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body">小区编号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="areamodel.f_area_id"
-                   @blur="areaidChange" placeholder="小区编号">
-          </div>
-
-          <div class="col-sm-6 form-group"
+          <div class="col-sm-6 "
                :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
-            <label class="font_normal_body">省&ensp;市&ensp;区</label>
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;省市区</label>
             <input type="text" class="input_search" class="input_search" style="width:60%" v-show="false" v-model="areamodel.f_pcd_id"
                    v-validate:f_pcd_id='{required: true }'>
             <v-select
@@ -27,7 +21,7 @@
               close-on-select search="true" @change="pcdChange">
             </v-select>
           </div>
-          <div class="col-sm-6 form-group"
+          <div class="col-sm-6 "
                :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_street_id"
@@ -38,8 +32,8 @@
               close-on-select search="true" @change="streetChange">
             </v-select>
           </div>
-          <div class="col-sm-6 form-group" :class="[$v.slice.required ? 'has-error' : 'has-success']">
-            <label class="font_normal_body">片&emsp;&emsp;区</label>
+          <div class="col-sm-6 " :class="[$v.slice.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;片区&nbsp;&nbsp;&nbsp;</label>
             <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
                    v-validate:slice='{required: true }'>
             <v-select :value.sync="areamodel.slice_area" v-model="areamodel.slice_area"
@@ -49,7 +43,7 @@
           </div>
           <!--小区(特殊)信息-->
           <div v-if="!f_special"
-               class="col-sm-6 form-group"
+               class="col-sm-6 "
                :class="[$v.f_residential_area.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">小区名称</label>
             <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_residential_area"
@@ -57,14 +51,14 @@
                    v-validate:f_residential_area='{required: true }'>
           </div>
           <div v-if="!f_special"
-               class="col-sm-12 form-group">
+               class="col-sm-12 ">
             <label class="font_normal_body">小区地址</label>
             <input type="text" style="width:80%" class="input_search"  v-model="areamodel.f_area_address"
                    class="form-control" placeholder="小区地址">
           </div>
           <!--单位(特殊)信息-->
           <div v-if="f_special"
-               class="col-sm-6 form-group"
+               class="col-sm-6 "
                :class="[$v.f_residential_area.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">单位名称</label>
             <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_residential_area"
@@ -72,40 +66,40 @@
                    v-validate:f_residential_area='{required: true }'>
           </div>
           <div v-if="f_special"
-               class="col-sm-12 form-group">
+               class="col-sm-12 ">
             <label class="font_normal_body">单位地址</label>
             <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_area_address"
                    class="form-control" placeholder="单位地址">
           </div>
           <div v-if="f_special"
-               class="col-sm-6 form-group"
+               class="col-sm-6 "
                :class="[$v.f_linkname.required ? 'has-error' : 'has-success']">
-            <label class="font_normal_body">联&ensp;系&ensp;人</label>
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;联系人</label>
             <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_linkname"
                    class="form-control" placeholder="联系人"
                    v-validate:f_linkname='{required: true }'>
           </div>
           <div v-if="f_special"
-               class="col-sm-6 form-group"
+               class="col-sm-6 "
                :class="[$v.f_linkphone.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">联系电话</label>
             <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_linkphone"
                    class="form-control" placeholder="联系电话"
                    v-validate:f_linkphone='{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:20px;width:80%;height: auto;" v-model="areamodel.f_comments"></textarea>
+          <div class="col-sm-12">
+            <label  class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+            <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="areamodel.f_comments"></textarea>
           </div>
-          <div class="col-sm-12 form-group">
+          <div class="col-sm-12">
             <br/>
           </div>
           <!--表具信息-->
           <div v-if="!f_special" class="col-sm-12 bg-info text-center"  style="padding: 8px;font-size: 18px;font-weight: bold">
             <span >默认表具信息</span>
           </div>
-          <div v-if="!f_special" class="row">
-            <div class="col-sm-6 form-group">
+          <div v-if="!f_special">
+            <div class="col-sm-6 ">
               <label class="font_normal_body">用户类型</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_user_type"
               >
@@ -115,7 +109,7 @@
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group"
+            <div class="col-sm-6 "
             >
               <label class="font_normal_body">用气性质</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_gasproperties"
@@ -126,7 +120,7 @@
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group"
+            <div class="col-sm-6 "
             >
               <label class="font_normal_body">气价类型</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_type"
@@ -137,7 +131,7 @@
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group"
+            <div class="col-sm-6 "
             >
               <label class="font_normal_body">气价名称</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_name"
@@ -148,7 +142,7 @@
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group"
+            <div class="col-sm-6 "
             >
               <label class="font_normal_body">气表品牌</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_brand"
@@ -159,7 +153,7 @@
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group"
+            <div class="col-sm-6 "
             >
               <label class="font_normal_body">气表型号</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_style"
@@ -170,7 +164,7 @@
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group">
+            <div class="col-sm-6 ">
               <label class="font_normal_body">安装位置</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_position">
               <v-select
@@ -179,8 +173,8 @@
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group">
-              <label class="font_normal_body">抄&ensp;表&ensp;员</label>
+            <div class="col-sm-6 ">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表员</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_inputtor">
               <v-select
                 :value.sync="areamodel.f_inputtor" :value-single="true"
@@ -188,8 +182,8 @@
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group">
-              <label class="font_normal_body">调&ensp;压&ensp;箱</label>
+            <div class="col-sm-6 ">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;调压箱</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_adjustable_id">
               <v-select
                 :value.sync="areamodel.f_adjustable_id" :value-single="true"
@@ -198,7 +192,7 @@
               </v-select>
             </div>
           </div>
-          <div v-if="f_special" class="col-sm-6 form-group">
+          <div v-if="f_special" class="col-sm-6">
             <br/>
           </div>
         </div>
@@ -229,7 +223,6 @@
         streetslist:[],
         //小区
         areamodel: {
-          f_area_id: '',
           f_pcd_id:'',
           f_linkname:'',
           f_linkphone:'',
@@ -298,22 +291,18 @@
 
       async initSlice (val) {
         if (val) {
-          this.sliceArea = [];
-          let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
-            data:{
-              items: '*',
-              tablename: 't_zone',
-              orderitem: 'id',
-              condition: ` parentid = ${val}`
-            }
+          let getAllArea = await this.$resetpost('/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
           }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
 
-          if(getAllArea.data){
-            getAllArea.data.forEach((res) => {
-              this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-            })
-          }
-
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          this.sliceArea = []
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+          })
         }
       },
 
@@ -365,25 +354,6 @@
         this.streetslist=redata
       },
 
-      async areaidChange () {
-        // 验证小区编号是否已存在
-
-        let param = {
-          id: this.areamodel.id,
-          f_area_id: this.areamodel.f_area_id,
-          f_filialeid: this.f_filialeids
-        }
-
-        let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
-        console.log('验证小区是否存在', res)
-        if (res.data) {
-          this.$showAlert('这个小区编号已存在！！！请核实', 'warning', 3000)
-          this.areamodel.f_area_id = ''
-        }
-
-      },
-
-
       //根据名字找数据
       findbyid(list,name){
         var result
@@ -423,13 +393,11 @@
       //街道变化
       streetChange(val){
         if(val&&this.operation=='add'){
-         // if(this.areamodel.f_pcd_id.length==0){
+          if(this.areamodel.f_pcd_id.length==0){
             if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
-              console.log("aa",this.findbyid(this.streetslist,this.areamodel.f_street_id))
-              console.log("bbb",this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id)
               this.areamodel.f_pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
             }
-         // }
+          }
         }
         this.$resetValidation()
       },
@@ -464,7 +432,6 @@
       },
       cleardara(){
         this.areamodel= {
-          f_area_id: '',
           f_pcd_id:'',
           f_street_id:'',
           f_slice_area:'',
@@ -493,22 +460,22 @@
         this.initdata()
       },
       'areamodel.f_pcd_id'(){
-        // if (!this.areamodel.f_area_address) {
+        if (!this.areamodel.f_area_address) {
           if(this.areamodel.f_pcd_id&&this.areamodel.f_street_id){
             if (this.findbyid(this.pcdslist,this.areamodel.f_pcd_id) && this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
               this.areamodel.f_area_address = this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
             }
           }
-        // }
+        }
       },
       'areamodel.f_street_id'(){
-        // if (!this.areamodel.f_area_address) {
+        if (!this.areamodel.f_area_address) {
           if (this.areamodel.f_pcd_id && this.areamodel.f_street_id) {
             if (this.findbyid(this.pcdslist, this.areamodel.f_pcd_id) && this.findbyid(this.streetslist, this.areamodel.f_street_id)) {
               this.areamodel.f_area_address = this.findbyid(this.pcdslist, this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist, this.areamodel.f_street_id).f_street
             }
           }
-        // }
+        }
       },
       'f_filialeids'(){
         if (this.areamodel.f_filialeid) {

package/src/components/AddStreetOrPcd.vue

@@ -8,37 +8,37 @@
         <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 "
+            <div class="col-sm-6 "
                  :class="[$v.f_province.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">省&emsp;&emsp;份</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;省份&nbsp;&nbsp;&nbsp;</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 "
+            <div class="col-sm-6 "
                  :class="[$v.f_city.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;城市&nbsp;&nbsp;&nbsp;</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 "
+            <div class="col-sm-6 "
                  :class="[$v.f_district.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">区&ensp;&ensp;/&ensp;县</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;区/县&nbsp;&nbsp;</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-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 class="col-sm-12">
+              <label  class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+              <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="pcdmodel.f_comments"></textarea>
             </div>
           </div>
           <!-- 街道-->
-          <div v-if="areatype=='街道'" class="row">
-            <div class="col-sm-6 form-group "
+          <div v-if="areatype=='街道'">
+            <div class="col-sm-6 "
                  :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">省&ensp;市&ensp;区</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;省市区</label>
                 <input type="text" v-show="false"  v-model="streetmodel.f_pcd_id"
                        v-validate:f_pcd_id='{required: true }'>
                 <v-select
@@ -47,21 +47,21 @@
                   close-on-select search="true" @change="pcdChange">
                 </v-select>
             </div>
-            <div class="col-sm-6 form-group "
+            <div class="col-sm-6 "
                  :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-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 class="col-sm-12">
+              <label  class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+              <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="streetmodel.f_comments"></textarea>
             </div>
           </div>
 
           <div class="row">
-          <div style="margin-top:40px;text-align:right;">
+          <div style="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>