address-client 3.2.33 → 3.2.35

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Sep 07 11:19:30 CST 2022
-gradle.version=7.1
+#Mon Dec 07 15:35:10 CST 2020
+gradle.version=5.2.1

package/build/dev-server.js

@@ -10,36 +10,73 @@ var proxy = httpProxy.createProxyServer()
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var str = 'http://39.108.82.124:8400', str2= 'http://39.108.82.124:8400'
+var str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
+var str3= 'https://qnjtkf.cn:7400'
 var proxyTable = {
-
+  '/rs/sql':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/webapps':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
   '/rs/logic/getLogin': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/logic/getInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true,
+  },
+  '/rs/logic/getSaleInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/logic':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
   '/rs/vue': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/user': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/db': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/search': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
   '/rs/data': {
-    target: str2
-  },
-  '/rs/logic/getInitData': {
-    target: str2
-  },
-  '/rs/logic/getSaleInitData': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs': {
     // target: 'http://192.168.50.199:8300'
-    target: str
+    target: str3,
+    secure:true,
+    changeOrigin:true
   }
 }
 

package/package.json

@@ -1,99 +1,99 @@
-{
-  "name": "address-client",
-  "version": "3.2.33",
-  "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",
-    "system-clients": "3.1.88-5",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.27",
-    "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.35",
+  "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",
+    "system-clients": "3.1.88-5",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.27",
+    "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/components/AddAreaMsg.vue

@@ -576,7 +576,7 @@
         this.buildingmodel.f_orgname = this.$login.f.orgs
         this.buildingmodel.f_depid = this.$login.f.depids
         this.buildingmodel.f_depname = this.$login.f.deps
-        await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel,{resolveMsg: null,rejectMsg: null})
+        await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
         this.$refs.buildinglist.search()
       },
       //保存小区
@@ -600,7 +600,7 @@
         this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
         this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
 
-        await this.$resetpost('rs/logic/address_updatearea', this.areamodel,{resolveMsg: null,rejectMsg: null})
+        await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
       },
       cleardara(){
         this.areamodel= {

package/src/components/AddStreetOrPcd.vue

@@ -262,7 +262,7 @@
         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,{resolveMsg: null,rejectMsg: null})
+        await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
       },
       //保存街道
       async savestreet(){
@@ -275,7 +275,7 @@
         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,{resolveMsg: null,rejectMsg: null})
+        await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
       },
       cancel(){
         this.cleardara()

package/src/components/AddressList.vue

@@ -456,7 +456,7 @@
           f_depname: this.$login.f.deps,
           f_filialeid: this.f_filialeids
         }
-        this.$resetpost('rs/logic/modifyBatch',modifyBatchData,{resolveMsg: null,rejectMsg: null})
+        this.$resetpost('rs/logic/modifyBatch',modifyBatchData)
         this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
         this.showModify = false
         this.$refs.paged.$refs.grid.selectInit()

package/src/filiale/qianneng/AddressList.vue

@@ -34,8 +34,8 @@
             </div>
             <div class="col-sm-4 form-group button-range" >
               <button class="button_search button_spacing" @click="search()" >查询</button>
-              <button class="button_new button_spacing"  style="width: max-content" @click="$parent.$parent.add('民用')">添加民用</button>
-              <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
+              <button class="button_new button_spacing"  style="width: max-content" @click="$parent.$parent.add('民用')">添加地址</button>
+<!--              <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>-->
               <button class="button_new button_spacing" style="width: max-content" v-show="this.$login.r.includes('批量修改')" @click="$parent.$parent.modifyBatch()">批量修改</button>
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
               <button class="button_export button_spacing"  @click="$parent.$parent.importAddress('导入')">模板导入</button>
@@ -122,6 +122,17 @@
                         close-on-select>
               </v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">地区类型</label>
+              <v-select
+                class="select_list select"
+                :value.sync="model.f_iscity"
+                v-model="model.f_iscity"
+                :options='$parent.$parent.iscity' placeholder='地区类型'
+                condition="a.f_iscity = '{}'"
+                close-on-select>
+              </v-select>
+            </div>
             <div :class="$parent.$parent.style" >
               <label class="font_normal_body">状&emsp;&emsp;态</label>
               <v-select :value.sync="model.f_state"
@@ -154,6 +165,7 @@
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼层</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>门牌号</nobr></th>
           <th><nobr>详细地址</nobr></th>
+          <th><nobr>地区类型</nobr></th>
           <th><nobr>地址状态</nobr></th>
           <th><nobr>状态</nobr></th>
           <th><nobr>入户证号</nobr></th>
@@ -172,6 +184,7 @@
           <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
           <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_address_state}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_state ==='作废'?'作废':'有效'}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_enter_number}}</nobr></td>
@@ -261,7 +274,9 @@
     data () {
       return {
         criteriaShow: false,
+        // rs/sql/address_singleTableOrderBy
         model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
+        //address_getAddress params:{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}
         config: {
           // 导出列要和查询列相同
           excelHeaders: {
@@ -277,11 +292,13 @@
             'f_floor':'楼层',
             'f_room':'门牌号',
             'f_address':'详细地址',
+            'f_iscity':'地区类型',
             'f_address_state':'地址状态',
             'f_create_date':'时间',
             'f_state':'状态'
           },
         },
+        iscity:[{label:'市区',value:'市区'},{label:'乡镇',value:'乡镇'},{label:'全部',value:''}],
         isbusy:false,
         addflag: false,
         addtitle:'',
@@ -398,7 +415,7 @@
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
-        args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+        args.condition =  `${args.condition} and f_filialeid = '${this.f_filialeids}'`
         this.model.search(args.condition, args.model)
       },
 
@@ -613,7 +630,7 @@
       },
       getCondition() {
         return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and a.f_filialeid = '${this.f_filialeids}'`}
+          condition: `${this.$refs.paged.$refs.cri.condition}` + `and f_filialeid = '${this.f_filialeids}'`}
       }
     }
 

package/src/filiale/qianneng/UserAddress.vue

@@ -8,6 +8,10 @@
           <label for="true">单户</label>
           <input type="radio" id="false" value="more" v-model="onedata">
           <label for="false">多户</label>
+          <button class="button_new-1 button_spacing" v-if="false" v-show=" $login.f.f_role_name.includes('管理员') "style="width: max-content;position: fixed;right: 20px" @click="add('非民用')">添加特殊地址</button>
+        </div>
+        <div class="form-group" v-if="usertype&&!model.id&&!config.hasnumber" style="height: 30.5px">
+          <button class="button_new-1 button_spacing" style="width: max-content;position: fixed;right: 20px" @click="add('民用')">添加民用地址</button>
         </div>
         <!--单个录入-->
         <div v-if="onedata=='one'" class="row">
@@ -15,6 +19,7 @@
                :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']" v-if="!usertype">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;省&ensp;市&ensp;区</label>
             <input type="text" style="width:41%" v-show="false" v-model="model.f_pcd_id"
+                   v-validate:f_pcd_id='{required: true }'
             >
             <v-select :value.sync="model.f_pcd_id" :value-single="true"
                       :options='pcdslist' placeholder='请选择'
@@ -36,6 +41,7 @@
                :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&emsp;&emsp;街道/乡镇</label>
             <input type="text" style="width:41%" v-show="false" v-model="model.f_street_id"
+                   v-validate:f_street_id='{required: true }'
             >
             <v-select :value.sync="model.f_street_id" :value-single="true"
                       :options='streetslist' placeholder='请选择'
@@ -92,6 +98,7 @@
               @change="changecity"
               close-on-select>
             </v-select>
+
           </div>
           <div v-if="!usertype" class="col-sm-6 form-group" :class="[$v.f_building_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;楼&emsp;&emsp;号</label>
@@ -113,13 +120,11 @@
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
             />
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group "
+          <div v-if="!usertype" class="col-sm-6 form-group"
                :class="[$v.f_room.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">&emsp;&emsp;&nbsp;门&ensp;牌&ensp;号</label>
             <input type="text" style="width:40%" v-model="model.f_room" class="input_search" placeholder="门牌号"
                    v-validate:f_room='{required: true }'/>
-            <input type="text" style="width:20%" v-model="model.f_room_suffix" class="input_search"
-            />
           </div>
           <div class="col-sm-6 form-group">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;地址状态</label>
@@ -130,6 +135,10 @@
                       close-on-select>
             </v-select>
           </div>
+          <div v-if="!usertype" class="col-sm-6 form-group">
+            <label for="f_address" class="font_normal_body">&emsp;&emsp;&nbsp;地址杂项</label>
+            <input type="text" style="width:60%" v-model="model.f_room_suffix" placeholder="地址杂项" class="input_search"/>
+          </div>
           <div v-if="!usertype" class="col-sm-8 form-group ">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;经&ensp;纬&ensp;度</label>
             <input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
@@ -137,11 +146,18 @@
             &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
           </div>
 
+          <div v-if="!usertype" class="col-sm-12 form-group "
+               :class="[$v.f_address.required ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">&emsp;&emsp;&nbsp;详细地址</label>
+            <input type="text" style="width:80%" v-model="model.f_address" class="input_search" placeholder="详细地址"
+                   v-validate:f_address='{required: true }' disabled="true"/>
+          </div>
+
           <div v-if="usertype" class="col-sm-12 form-group "
                :class="[$v.f_address.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">&emsp;&emsp;&nbsp;详细地址</label>
             <input type="text" style="width:80%" v-model="model.f_address" class="input_search" placeholder="详细地址"
-                   v-validate:f_address='{required: true }'/>
+                   v-validate:f_address='{required: true }' disabled="true"/>
           </div>
           <div v-if="usertype" class="col-sm-8 form-group ">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;经&ensp;纬&ensp;度</label>
@@ -187,6 +203,7 @@
                :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;省&ensp;市&ensp;区</label>
             <input type="text" style="width:60%" v-show="false" v-model="model.f_pcd_id"
+                   v-validate:f_pcd_id='{required: true }'
             >
             <v-select :value.sync="model.f_pcd_id" :value-single="true"
                       :options='pcdslist' placeholder='请选择'
@@ -197,6 +214,7 @@
                :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;街&emsp;&emsp;道</label>
             <input type="text" style="width:60%" v-show="false" v-model="model.f_street_id"
+                   v-validate:f_street_id='{required: true }'
             >
             <v-select :value.sync="model.f_street_id" :value-single="true"
                       :options='streetslist' placeholder='请选择'
@@ -349,7 +367,7 @@
     await self.$getConfig(self, 'UserAddress')
     console.log('原地址配置',self.config)
     console.log('获取地址配置',self.config)
-    Object.assign(self.model, self.config)
+    // Object.assign(self.model, self.config)
   }
 
   export default {
@@ -392,19 +410,19 @@
           f_building: '',
           f_building_start: '',
           f_building_end: '',
-          f_building_suffix: '',
+          f_building_suffix: '号楼',
           f_unit: '',
           f_unit_start: '',
           f_unit_end: '',
-          f_unit_suffix: '',
+          f_unit_suffix: '单元',
           f_floor: '',
           f_floor_start: '',
           f_floor_end: '',
-          f_floor_suffix: '',
+          f_floor_suffix: '层',
           f_room: '',
           f_room_start: '',
           f_room_end: '',
-          f_room_suffix: '',
+          f_room_suffix: '室',
           //详细地址
           f_address: '',
           //单位名称
@@ -432,13 +450,24 @@
     props: ['f_filialeids', 'row','operation','usertype'],
    async ready(){
       this.initdata()
-      getAreaConfig(this)
+      // getAreaConfig(this)
+     //打印config
+     console.log(this.config)
       this.model.f_building_suffix=this.config.f_building_suffix
       this.model.f_unit_suffix=this.config.f_unit_suffix
       this.model.f_floor_suffix=this.config.f_floor_suffix
       this.model.f_room_suffix=this.config.f_room_suffix
     },
     methods: {
+      //添加方法
+      add(val){
+        if (this.f_filialeids) {
+          // this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add',val)
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
       async sliceChange(slice){
         this.areaschoice=[]
         if(slice){
@@ -457,7 +486,8 @@
         this.areaslist = []
         // this.model.f_residential_area_id = null
         // this.model.f_residential_area = null
-        let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and  a.f_orgid = '${this.f_filialeids}'`
+        // isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and
+        let condition = `a.f_orgid = '${this.f_filialeids}'`
         let req = await this.$resetpost('rs/sql/address_getresidential', {
           data: {
             condition: condition
@@ -472,6 +502,7 @@
             id: row.id
           })
         })
+        console.log("获取到的redata",redata)
         this.areaslist=redata
       },
       standardyanzheng() {
@@ -581,6 +612,14 @@
           }
         }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
         let redata = []
+        if (req.data.length === 0){
+          redata.push({
+            label: '['+row.f_street+']'+'无',
+            value: '',
+            data: '',
+            id: ''
+          })
+        }
         req.data.forEach((row) => {
           redata.push({
             label: '['+row.f_street+']'+row.f_residential_area,
@@ -604,6 +643,12 @@
           }
         }, {resolveMsg: null, rejectMsg: '获取楼栋失败!'})
         let redata = []
+        if(req.data.length === 0){
+          redata.push({
+            label: '无',
+            value: ' ',
+          })
+        }
         req.data.forEach((row) => {
           redata.push({
             label: row.f_building,
@@ -671,7 +716,9 @@
           this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
           this.model.slice_area = selectArea.f_slice_area
           // 拼接地址
-          this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
+          if(selectArea.f_residential_area !== '无'){
+            this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
+          }
           this.getbuildingList(`f_filialeid = '${this.f_filialeids}' and f_residential_area_id ='${selectArea.id}'`)
         }
         this.$nextTick(() => {
@@ -724,10 +771,14 @@
                   console.log('批量', this.model)
                   let data=Object.assign({},this.model)
                   data.f_create_person= this.$login.f.name
-                  if ((i+'').length == 1) {
-                    data.f_building= data.f_building_prefix + '0' +i
-                  } else {
-                    data.f_building= data.f_building_prefix + '' +i
+                  if ( i != '无'){
+                    if ((i+'').length == 1) {
+                      data.f_building= data.f_building_prefix + '0' +i
+                    } else {
+                      data.f_building= data.f_building_prefix + '' +i
+                    }
+                  }else {
+                    data.f_building = data.f_building_prefix + ''
                   }
                   if ((j+'').length == 1) {
                     data.f_unit= data.f_unit_prefix + '0'+j
@@ -823,6 +874,7 @@
             this.model.f_slice_area = this.model.slice_area
           }
         }
+
         if (( this.model.f_unit+'').length == 1) {
           this.model.f_unit= '0'+ this.model.f_unit
         }
@@ -847,7 +899,7 @@
           this.model.f_pcd=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
           this.model.f_street=this.findbyid(this.streetslist,this.model.f_street_id).f_street
           this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
-          if (( this.$refs.f_building_id.selectedItems+'').length == 1) {
+          if (( this.$refs.f_building_id.selectedItems+'').length == 1 && this.$refs.f_building_id.selectedItems!= '无') {
             this.model.f_building= '0'+ this.$refs.f_building_id.selectedItems
           }else{
             this.model.f_building = this.$refs.f_building_id.selectedItems
@@ -857,7 +909,7 @@
             this.$showMessage('请选择楼栋数据!!!')
             return
           }
-          this.model.f_address = this.model.f_street + this.model.f_residential_area +  (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
+          this.model.f_address = this.model.f_street + (this.model.f_residential_area!='无'?this.model.f_residential_area:'') +  (this.model.f_building&&this.model.f_building!='无'?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
         }
         await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
       },

package/src/main.js

@@ -9,7 +9,7 @@ Vue.config.silent = true
 
 /** **************************通用组件******************************/
 all()
-address("dongguan")
+address("qianneng")
 system(false)
 sale()
 require('system-clients/src/styles/less/bootstrap.less')

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

package/gradlew

@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega