address-client 4.0.12 → 4.0.13-kelai

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Apr 15 09:22:28 CST 2025
-gradle.version=8.10
+#Mon Dec 07 15:35:10 CST 2020
+gradle.version=5.2.1

package/build/dev-server.js

@@ -14,105 +14,92 @@ var proxy = httpProxy.createProxyServer()
 var str = 'http://192.168.50.4:8400', str2= 'http://192.168.50.4:8400'
 var str3= 'http://192.168.50.4:8400'
 var proxyTable = {
-  '/api/af-revenue': {
-    pathRewrite: {'/api/af-revenue': '/'},
-    target: 'http://127.0.0.1:9026'
-  },
-
-  '/api': {
-    target: str
-  },
   '/api/af-auth': {
     target: str
   },
-  '/sketch': {
-    target: str,
-    changeOrigin: true
-  },
-  '/invoice/rs/logic/getInvoice': {
-    target: str
-  },
-  // '/rs/sql/filemanage_getUserfies':{
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  // '/rs/logic/importNetworkValve':{
-  //   target: 'http://127.0.0.1:8080/'
-  // },
-  '/rs/file': {
-    target: str
-  },
-  '/webapps': {
+  '/api/af-system': {
     target: str
   },
-  '/rs/sql/singleTable': {
-    target: str
-  },
-  '/invoice': {
-    target: str
+  '/api/af-revenue': {
+    pathRewrite: {'/api/af-revenue': '/'},
+    target: 'http://127.0.0.1:9026'
   },
-  '/rs/batchSettlement': {
+  '/rs/entity': {
     target: str
+    // secure:true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-
-  // 查找资源服务数据
-  '/rs/search': {
-    target: str
+  '/webapps':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  // 查找资源服务数据
   '/rs/logic/getLogin': {
-    target: str
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
-  // 查找资源服务数据
   '/rs/logic/getInitData': {
-    target: str
+    target: str3,
+    secure:true,
+    changeOrigin:true,
   },
   '/rs/logic/getSaleInitData': {
-    target: str
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  // '/rs/logic':{
+  //   target: str3,
+  //   secure:true,
+  //   changeOrigin:true
+  //   // target: 'http://127.0.0.1:8080'
+  // },
+  '/rs/vue': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
-  // 用户登录服务地址
   '/rs/user': {
-    target: str
-  },
-  '/rs/path': {
-    target: str
-  },
-  '/rs/data': {
-    target: str
-  },
-  '/rs/license': {
-    target: str
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/db': {
-    target: str
-  },
-  '/excel': {
-    target: str
-  },
-  '/rs/config': {
-    target: str
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
-  '/rs/report': {
-    target: str
-  },
-  '/rs/vue': {
-    target: str
-  },
-
-  '/rs/logic': {
-    target: str
+  '/rs/search': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/rs/entity': {
-    target: str
+  '/rs/data': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/sql': {
     target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/webmeter': {
+  '/rs/logic': {
     target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
   '/rs': {
-    target: str
-    // changeOrigin: true
+    // target: 'http://192.168.50.199:8300'
+    target: str3,
+    secure:true,
+    changeOrigin:true
   }
 }
 

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,8 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

package/gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+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
 
@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+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
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "4.0.12",
+  "version": "4.0.13-kelai",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/components/UserAddress.vue

@@ -107,9 +107,9 @@
           <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;层</label>
             <input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
-                   placeholder="楼层" />
+                   placeholder="楼层" disabled />
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
-            />
+                   disabled />
           </div>
           <div v-if="!usertype" class="col-sm-6 form-group "
                :class="[$v.f_room.required ? 'has-error' : 'has-success']">
@@ -210,15 +210,15 @@
                       close-on-select search="true">
             </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>-->
-<!--            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"-->
-<!--                  >-->
-<!--            <v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"-->
-<!--                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"-->
-<!--                      close-on-select v-ref:slice>-->
-<!--            </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>-->
+          <!--            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"-->
+          <!--                  >-->
+          <!--            <v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"-->
+          <!--                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"-->
+          <!--                      close-on-select v-ref:slice>-->
+          <!--            </v-select>-->
+          <!--          </div>-->
 
           <div class="col-sm-6 form-group "
                :class="[$v.f_building_start.integernum || $v.f_building_start.dctest ?'has-error' : 'has-success']">
@@ -416,10 +416,11 @@
 
         f_orgid: '',
 
-        sliceArea: []
+        sliceArea: [],
+        disableFloor: false
       }
     },
-    props: ['f_filialeids', 'row','operation','usertype'],
+    props: ['f_filialeids', 'row','operation','usertype', 'disableFloor'],
     ready(){
       this.initdata()
       getAreaConfig(this)
@@ -427,6 +428,25 @@
       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
+
+      // 处理传入的 row 数据
+      if(this.row) {
+        // 复制原有数据到 model
+        Object.assign(this.model, this.row)
+
+        // 初始化省市区、街道、小区数据
+        this.initpcds(` f_orgid = '${this.$login.f.orgid}'`)
+        this.initstreets(` f_orgid = '${this.$login.f.orgid}' `)
+        this.initareas(` f_orgid = '${this.$login.f.orgid}'`)
+
+        // 设置选中值
+        this.$nextTick(() => {
+          this.model.f_pcd_id = this.row.f_pcd_id
+          this.model.f_street_id = this.row.f_street_id
+          this.model.f_residential_area_id = this.row.f_residential_area_id
+          this.model.f_slice_area = this.row.f_slice_area
+        })
+      }
     },
     methods: {
       async changecity(){
@@ -772,7 +792,10 @@
           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
-          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_floor = ''
+          this.model.f_floor_suffix = ''
+          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_room + this.model.f_room_suffix
         }
         await this.$resetpost('api/af-revenue/logic/address_updateuseraddress', this.model)
       },