address-client 3.2.19 → 3.2.22

package/src/filiale/qianneng/AddStreetOrPcd.vue

@@ -0,0 +1,318 @@
+<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">
+              <label class="font_normal_body">街道编号</label>
+              <input type="text"  v-model="streetmodel.f_street_number"
+                     @change="streetyanzheng"
+                     class="input_search" style="width:60%" placeholder="街道编号">
+            </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'>保存</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)
+        if (this.streetmodel.f_street_number.length != 2){
+          this.$showAlert('请输入正确的位数', 'warning', 2000)
+          this.streetmodel.f_street_number = ''
+        }else{
+          let res =await this.$resetpost('rs/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('rs/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', 'rs/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()
+        }
+        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('rs/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('rs/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>

package/src/filiale/qianneng/AreaList.vue

@@ -33,16 +33,11 @@
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_district"
                       condition="f_district like '%{}%'" placeholder="区县"/>
             </div>
-            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">
-              <label class="font_normal_body">街道/乡镇</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道/乡镇"/>
-            </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" @click="$parent.$parent.batchDelete()">批量删除</button>
-              <button class="button_new button_spacing" style="width: max-content;"  @click="$parent.$parent.add('楼栋')">楼栋管理</button>
               <button v-if="!$parent.$parent.f_special" 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 v-if="$parent.$parent.f_special"class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('单位')">添加单位</button>
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
               <export-excel :data="$parent.$parent.getCondition"
@@ -55,6 +50,11 @@
             </div>
           </div>
           <div class="row" v-if="$parent.$parent.criteriaShow">
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">街道/乡镇</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
+                      condition="f_street like '%{}%'" placeholder="街道/乡镇"/>
+            </div>
             <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.areaShow">
               <label class="font_normal_body">城&emsp;&emsp;市</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_city"
@@ -133,9 +133,9 @@
             <td style="text-align:center" v-if="false"><nobr>{{row.f_province}}</nobr></td>
             <td style="text-align:center" v-if="false"><nobr>{{row.f_city}}</nobr></td>
             <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_area_address}}{{row.f_residential_area}}</nobr></td>
+            <td style="text-align:left"><nobr>{{row.f_street}}</nobr></td>
+            <td style="text-align:left"><nobr>{{row.f_residential_area}}</nobr></td>
+            <td style="text-align:left"><nobr>{{row.f_area_address}}{{row.f_residential_area}}</nobr></td>
             <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_comments}}</nobr></td>
             <!--非民用单位信息开始-->
             <td  v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkname}}</nobr></td>

package/src/filiale/qianneng/UserAddress.vue

@@ -166,6 +166,11 @@
                    class="input_search" style="width:60%" placeholder="合同顺序号"
                    v-validate:f_contracts_number='{required: true }'>
           </div>
+          <div class="col-sm-6 form-group ">
+            <label class="font_normal_body">&emsp;&emsp;&nbsp;入户证号</label>
+            <input type="text"  v-model="model.f_enter_number"
+                   class="input_search" style="width:60%" placeholder="入户证号">
+          </div>
           <div class="col-sm-12 form-group">
             <label  class="font_normal_body " >&emsp;&emsp;&nbsp;备&emsp;&emsp;注</label>
             <textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%;height: auto;" v-model="model.f_comments"></textarea>
@@ -407,7 +412,8 @@
           //单位地址
           f_company_address: '',
           f_lng: '',  //经度
-          f_lat: '' //纬度
+          f_lat: '', //纬度
+          f_enter_number: '' //入户证号
         },
         //判读是否为单个数据录入
         onedata: 'one',
@@ -897,7 +903,8 @@
           //单位地址
           f_company_address: '',
           f_lng: '',
-          f_lat: ''
+          f_lat: '',
+          f_enter_number: ''
         }
         // this.pcdslist = []
         // this.streetslist = []

package/src/filiale/qianneng/sale.js

@@ -5,7 +5,11 @@ let specialComp = {
   //地址管理
   'user-address': (resolve) => { require(['./UserAddress'], resolve) },
   //街道管理
-  'city-manage': (resolve) => { require(['./CityManage'], resolve) }
+  'city-manage': (resolve) => { require(['./CityManage'], resolve) },
+  // 小区管理
+  'add-area-msg': (resolve) => { require(['./AddAreaMsg'], resolve) },
+  // 街道管理
+  'add-street-pcd': (resolve) => { require(['./AddStreetOrPcd'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/shanggao/AddAreaMsg.vue

@@ -33,7 +33,7 @@
             </div>
             <div class="col-sm-6 form-group"
                  :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">街道/乡镇</label>
+              <label class="font_normal_body">大片区号</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_street_id"
                      v-validate:f_street_id='{required: true }'>
               <v-select
@@ -236,7 +236,7 @@
             </div>
           </div>
           <div v-if="areatype == '楼栋'">
-            <div  class="col-sm-6 form-group " :class="[$v.f_residential_area_id1.required ? 'has-error' : 'has-success']">
+            <div  class="col-sm-4 form-group " :class="[$v.f_residential_area_id1.required ? 'has-error' : 'has-success']">
               <label class="font_normal_body">小区名称</label>
               <input type="text" style="width:41%" v-show="false" v-model="buildingmodel.f_residential_area_id"
                      v-validate:f_residential_area_id1='{required: true }'>
@@ -245,7 +245,7 @@
                         close-on-select search="true">
               </v-select>
             </div>
-            <div class="col-sm-6 form-group" :class="[$v.f_building.required ? 'has-error' : 'has-success']">
+            <div class="col-sm-4 form-group" :class="[$v.f_building.required ? 'has-error' : 'has-success']">
               <label class="font_normal_body">地址编码</label>
               <input type="number" class="input_search" style="width:60%" v-validate:f_building='{required: true }'
                      @change="streetyanzheng"
@@ -253,12 +253,18 @@
             </div>
           </div>
         </div>
-        <div class="row auto" style="text-align:right;">
+        <div class="row auto" style="text-align:right;margin-right:10%;">
           <button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
           <button class="button_clear button_spacing" @click="cancel()">取消</button>
         </div>
-        <div v-if="areatype == '楼栋'" class="row" style="margin-top:40px;height: 580px;">
+        <div v-if="areatype == '楼栋'" class="row" style="margin-top:15%;height: 70%;">
+          <!--<div class="bg-info text-center"  style="padding: 8px;font-size: 18px;font-weight: bold">-->
+          <div class="text-center"  style="padding: 8px;font-size: 18px;font-weight: bold">
+            <span >地址编码列表</span>
+          </div>
+<br/>
           <building-list v-ref:buildinglist @select-changed="selected" :areaslist="areaslist" :f_filialeids.sync="f_filialeids"></building-list>
+
         </div>
       </div>
     </validator>
@@ -488,7 +494,7 @@
           if (res.data.length>0){
             if (res.data[0].id != this.areamodel.id) {
               this.$showAlert('当前编号已存在', 'warning', 2000)
-              this.areamodel.f_area_id = ''
+              // this.areamodel.f_area_id = ''
             }
           }
         }