address-client 4.0.13-kelai → 4.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "4.0.13-kelai",
+  "version": "4.0.14",
   "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="楼层" disabled />
+                   placeholder="楼层" />
             <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,11 +416,10 @@
 
         f_orgid: '',
 
-        sliceArea: [],
-        disableFloor: false
+        sliceArea: []
       }
     },
-    props: ['f_filialeids', 'row','operation','usertype', 'disableFloor'],
+    props: ['f_filialeids', 'row','operation','usertype'],
     ready(){
       this.initdata()
       getAreaConfig(this)
@@ -428,25 +427,6 @@
       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(){
@@ -792,10 +772,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
-          // 确保楼层值为空
-          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
+          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
         }
         await this.$resetpost('api/af-revenue/logic/address_updateuseraddress', this.model)
       },

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.name, value: {name: row.name, code:row.number}})
+        this.sliceArea.push({label: row.name, value: {name: row.name, code:row.id}})
       })
     },
     //初始化小区添加小区

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>