address-client 4.0.12 → 4.0.13

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",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/filiale/yangchun/AddStreetOrPcd.vue

@@ -0,0 +1,316 @@
+<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' v-if="this.$login.r.includes('街道修改保存')">保存</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)
+        let res =await this.$resetpost('api/af-revenue/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('api/af-revenue/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', 'api/af-revenue/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('api/af-revenue/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('api/af-revenue/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>