address-client 4.0.10 → 4.0.12

package/.gradle/buildOutputCleanup/cache.properties

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

package/build/dev-server.js

@@ -14,92 +14,105 @@ 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
   },
-  '/api/af-system': {
+  '/sketch': {
+    target: str,
+    changeOrigin: true
+  },
+  '/invoice/rs/logic/getInvoice': {
     target: str
   },
-  '/api/af-revenue': {
-    pathRewrite: {'/api/af-revenue': '/'},
-    target: 'http://127.0.0.1:9026'
+  // '/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
   },
-  '/rs/entity': {
+  '/webapps': {
+    target: str
+  },
+  '/rs/sql/singleTable': {
+    target: str
+  },
+  '/invoice': {
+    target: str
+  },
+  '/rs/batchSettlement': {
     target: str
-    // 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/search': {
+    target: str
   },
+  // 查找资源服务数据
   '/rs/logic/getLogin': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
+    target: str
   },
+  // 查找资源服务数据
   '/rs/logic/getInitData': {
-    target: str3,
-    secure:true,
-    changeOrigin:true,
+    target: str
   },
   '/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: str3,
-    secure:true,
-    changeOrigin:true
+    target: str
   },
+  // 用户登录服务地址
   '/rs/user': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
+    target: str
+  },
+  '/rs/path': {
+    target: str
+  },
+  '/rs/data': {
+    target: str
+  },
+  '/rs/license': {
+    target: str
   },
   '/rs/db': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
+    target: str
   },
-  '/rs/search': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
+  '/excel': {
+    target: str
   },
-  '/rs/data': {
-    target: str3,
-    secure:true,
-    changeOrigin:true
+  '/rs/config': {
+    target: str
   },
-  '/rs/sql': {
+  '/rs/report': {
+    target: str
+  },
+  '/rs/vue': {
     target: str
-    // secure: true,
-    // changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
   },
+
   '/rs/logic': {
     target: str
-    // secure: true,
-    // changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/entity': {
+    target: str
+  },
+  '/rs/sql': {
+    target: str
+  },
+  '/webmeter': {
+    target: str
   },
   '/rs': {
-    // target: 'http://192.168.50.199:8300'
-    target: str3,
-    secure:true,
-    changeOrigin:true
+    target: str
+    // 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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/gradlew

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

package/gradlew.bat

@@ -13,6 +13,8 @@
 @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 ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 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.
+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
 
 goto fail
 
@@ -57,11 +59,11 @@ 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.
+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
 
 goto fail
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "4.0.10",
+  "version": "4.0.12",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -80,9 +80,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "ldap-clients": "3.0.48",
-    "system-clients": "3.2.95",
+    "system-clients": "3.3.2",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.150",
+    "vue-client": "1.24.162",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/AddressList.vue

@@ -34,6 +34,7 @@
             </div>
             <div class="col-sm-4 form-group button-range" >
               <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_search button_spacing" v-show="this.$login.r.includes('清空安检')" @click="$parent.$parent.clearPlanId()">清空安检id</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>
@@ -315,7 +316,9 @@
         //初始化街道数据
         areaslist:[],
         // 要修改的用户信息
-        userInfos:  []
+        userInfos:  [],
+        // 要清空f_plan_id的数据集
+        ids: []
       }
     },
     title: '地址列表',
@@ -331,6 +334,7 @@
     ready(){
       readyGen(this)
       this.search()
+      console.log(this.$login.r)
       this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
       this.initareas(`f_filialeid = '${this.f_filialeids}'`)
       //this.$refs.paged.$refs.grid.selectInit()
@@ -469,6 +473,24 @@
         this.$refs.paged.$refs.grid.selectInit()
         this.$refs.paged.$refs.cri.search()
       },
+      clearPlanId(){
+        this.ids=[]
+        if (this.$refs.paged.$refs.grid.getRowData().length != 0){
+          this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
+            console.log("看看数据",row)
+            this.ids[n] = row.id
+          })
+          console.log("看看id数据",this.ids)
+          let data = {
+            ids:this.ids
+          }
+          this.$resetpost('api/af-revenue/logic/clearPlanId',data)
+          this.$refs.paged.$refs.grid.selectInit()
+        }else {
+          this.$showAlert('请至少选择一项！', 'warning', 2000)
+        }
+
+      },
       cancelModify() {
         this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
         this.showModify = false

package/src/filiale/yangchun/AddAreaMsg.vue

@@ -413,7 +413,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       this.sliceArea = []
       req.data.forEach((row) => {
-        this.sliceArea.push({label: row, value: {name: row.name, code:row.number}})
+        this.sliceArea.push({label: row.name, value: {name: row.name, code:row.number}})
       })
     },
     //初始化小区添加小区
@@ -602,12 +602,12 @@ export default {
       this.$refs.buildinglist.search()
     },
     //保存小区
-    async savearea(){
-      if(this.f_special){
-        this.areamodel.f_special='1'
+    async savearea() {
+      if (this.f_special) {
+        this.areamodel.f_special = '1'
       }
-      if(this.areamodel.f_sell_add==='0'){
-        this.areamodel.f_residential_area=this.areamodel.f_residential_area+'(L)'
+      if (this.areamodel.f_sell_add === '0') {
+        this.areamodel.f_residential_area = this.areamodel.f_residential_area + '(L)'
       } else {
         this.areamodel.f_residential_area = this.areamodel.f_residential_area.replace(/\(L\)/g, '')
       }
@@ -624,62 +624,62 @@ export default {
           this.areamodel.f_area_code = this.areamodel.slice_area[0].code
         }
       }
-      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
+      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('api/af-revenue/logic/address_updatearea', this.areamodel)
     },
-    cleardara(){
-      this.areamodel= {
+    cleardara() {
+      this.areamodel = {
         f_area_id: '',
-        f_pcd_id:'',
-        f_street_id:'',
-        f_slice_area:'',
-        f_linkname:'',
-        f_linkphone:'',
-        f_adjustable_id:'',
-        f_residential_area:'',
-        f_user_type:'',
-        f_gasproperties:'',
-        f_area_address:'',
-        f_meter_brand:'',
-        f_price_name:'',
-        f_price_type:'',
-        f_meter_style:'',
-        f_position:'',
-        f_comments:'',
+        f_pcd_id: '',
+        f_street_id: '',
+        f_slice_area: '',
+        f_linkname: '',
+        f_linkphone: '',
+        f_adjustable_id: '',
+        f_residential_area: '',
+        f_user_type: '',
+        f_gasproperties: '',
+        f_area_address: '',
+        f_meter_brand: '',
+        f_price_name: '',
+        f_price_type: '',
+        f_meter_style: '',
+        f_position: '',
+        f_comments: '',
         f_meter_type: '',
-        f_sell_add:''
+        f_sell_add: ''
       }
     },
-    cancel(){
+    cancel() {
       this.cleardara()
       this.$dispatch('cancel')
     },
   },
   watch: {
-    'areamodel.f_meter_type' (val) {
+    'areamodel.f_meter_type'(val) {
       if (val === '机表')
         this.isMachine = false
     },
-    'areatype'(){
+    'areatype'() {
       this.initdata()
     },
-    'areamodel.f_pcd_id'(){
-      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_pcd_id'() {
+      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'(){
+    'areamodel.f_street_id'() {
       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'(){
+    'f_filialeids'() {
       if (this.areamodel.f_filialeid) {
         if (this.areamodel.f_filialeid != this.f_filialeids) {
           this.$dispatch('cancel')
@@ -693,27 +693,27 @@ export default {
     metertypes() {
       return this.$appdata.getParam('气表类型')
     },
-    usertypes () {
+    usertypes() {
       return this.$appdata.getParam('用户类型')
     },
-    f_price_types () {
+    f_price_types() {
       return this.$appdata.getParam('气价类型')
     },
-    meterstyle () {
+    meterstyle() {
       let ret = this.$GetSaleParam.getGasbrand()
       let rs = new Array()
-      if(this.areamodel.f_meter_brand) {
+      if (this.areamodel.f_meter_brand) {
         ret.forEach((item, index) => {
-          if(this.areamodel.f_meter_brand == item.value.f_meter_brand) {
-            item.value.gasmodel.forEach((item1, index) =>{
-              rs.push({label: item1.label, value:item1.label})
+          if (this.areamodel.f_meter_brand == item.value.f_meter_brand) {
+            item.value.gasmodel.forEach((item1, index) => {
+              rs.push({label: item1.label, value: item1.label})
             })
           }
         })
       }
       return rs
     },
-    pricenames () {
+    pricenames() {
       let rs = new Array()
       if (this.areamodel.f_user_type && this.areamodel.f_gasproperties && this.areamodel.f_price_type) {
         let params = {
@@ -732,10 +732,10 @@ export default {
       }
       return rs
     },
-    positions () {
+    positions() {
       return this.$appdata.getParam('安装位置')
     },
-    inputtores () {
+    inputtores() {
       // 获取抄表员
       let rs = new Array()
       if (this.$login.f.f_gasman.length > 0) {
@@ -761,11 +761,12 @@ export default {
   border: 1px solid #999999;
   margin-top: 13px;
 }
+
 .datapanel {
   color: #333;
   background-color: white;
-  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
   padding: 10px 30px 10px 30px;
-  border-radius:15px;
+  border-radius: 15px;
 }
 </style>