address-client 3.2.110 → 3.2.111-1

package/package.json

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

package/src/filiale/qianneng/UserAddress.vue

@@ -363,17 +363,17 @@
       </div>
     </validator>
 
-    <modal :show.sync="isshow"  large backdrop="false" :width="900">
-      <header slot="modal-header" class="modal-header">
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <amap-location :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button v-show="isshow" type="button" class="button_search button_spacing" @click='confirmLocation'>确认</button>
-        <button v-show="isshow" type="button" class="button_clear button_spacing" @click='closeModal'>取消</button>
-      </footer>
-    </modal>
+<!--    <modal :show.sync="isshow"  large backdrop="false" :width="900">-->
+<!--      <header slot="modal-header" class="modal-header">-->
+<!--      </header>-->
+<!--      <article slot="modal-body" class="modal-body">-->
+<!--        <amap-location :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>-->
+<!--      </article>-->
+<!--      <footer slot="modal-footer" class="modal-footer">-->
+<!--        <button v-show="isshow" type="button" class="button_search button_spacing" @click='confirmLocation'>确认</button>-->
+<!--        <button v-show="isshow" type="button" class="button_clear button_spacing" @click='closeModal'>取消</button>-->
+<!--      </footer>-->
+<!--    </modal>-->
 
   </div>
 </template>
@@ -385,8 +385,8 @@
   let getAreaConfig = async function (self) {
     // 获取气价里面的配置
     await self.$getConfig(self, 'UserAddress')
-    console.log('原地址配置',self.config)
-    console.log('获取地址配置',self.config)
+    // console.log('原地址配置',self.config)
+    // console.log('获取地址配置',self.config)
     // Object.assign(self.model, self.config)
   }
 
@@ -475,7 +475,7 @@
       this.initdata()
       getAreaConfig(this)
       //打印config
-      console.log(this.config)
+      // console.log(this.config)
       this.model.f_building_suffix=this.config.f_building_suffix
       this.model.f_unit_suffix=this.config.f_unit_suffix
       this.model.f_floor_suffix=this.config.f_floor_suffix
@@ -525,7 +525,7 @@
             id: row.id
           })
         })
-        console.log("获取到的redata",redata)
+        // console.log("获取到的redata",redata)
         this.areaslist=redata
       },
       standardyanzheng() {

package/src/filiale/xihu/AreaList.vue

@@ -0,0 +1,409 @@
+<template>
+  <div class="flex" @keyup.enter="search">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">组织机构</label>
+              <res-select restype='organization'
+                          @res-select="$parent.$parent.getorg"
+                          is-mul="false"
+                          :initresid='$parent.$parent.curorgid'>
+              </res-select>
+            </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_area_id"
+                      condition="f_area_id = '{}'" placeholder="小区编号"/>
+            </div>
+            <div :class="$parent.$parent.style" v-if="false">
+              <label class="font_normal_body">省&emsp;&emsp;份</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_province"
+                      condition="f_province like '%{}%'" placeholder="省份"/>
+            </div>
+            <!--<div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">-->
+            <div :class="$parent.$parent.style" v-if="false">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_city"
+                      condition="f_city 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_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 v-if="!$parent.$parent.f_special" 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"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="api/af-revenue/logic/exportfile"
+                            sql-name="manage_getarealist"
+                            template-name='小区信息查询导出'
+                            :choose-col="true"></export-excel>
+              <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+            </div>
+          </div>
+          <div class="row" v-if="$parent.$parent.criteriaShow">
+            <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_area_id"
+                      condition="f_area_id = '{}'" 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"
+                      condition="f_city like '%{}%'" placeholder="城市"
+                      :size="model.f_city ? model.f_city.length*2 : 6"/>
+            </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_district"
+                      condition="f_district like '%{}%'" placeholder="区县"
+                      :size="model.f_district ? model.f_district.length*2 : 6"/>
+            </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="街道/乡镇"
+                      :size="model.f_street ? model.f_street.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">小区名称</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_area"
+                      condition="f_residential_area like '%{}%'" placeholder="小区"
+                      :size="model.f_residential_area ? model.f_residential_area.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">房屋类型</label>
+              <v-select :options='$parent.$parent.housetype' :value.sync="model.f_house_type"
+                        close-on-select condition="f_house_type='{}'"
+                        placeholder='房屋类型' v-model="model.f_house_type"></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">安装位置</label>
+              <v-select :options='$parent.$parent.position' :value.sync="model.f_position"
+                        close-on-select condition="f_position='{}'"
+                        placeholder='安装位置' v-model="model.f_position"></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">&emsp;抄表员</label>
+              <v-select :options='$parent.$parent.inputtores' :value.sync="model.f_inputtor"
+                        close-on-select condition="f_inputtor='{}'"
+                        placeholder='抄表员' v-model="model.f_inputtor"></v-select>
+            </div>
+          </div>
+        </div>
+      </criteria>
+
+      <data-grid  :model="model" partial='list'  class="list_area table_sy" :optional="true" v-ref:grid>
+        <template partial='head'>
+            <th><nobr>序号</nobr></th>
+<!--            <th v-if="false"><nobr>省份</nobr></th>-->
+<!--            <th v-if="false"><nobr>城市</nobr></th>-->
+<!--            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>区/县</nobr></th>-->
+            <th><nobr>街道/乡镇</nobr></th>
+            <!--民用小区信息开始-->
+            <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
+            <th v-if="!$parent.$parent.$parent.f_special"><nobr>地址</nobr></th>
+            <th v-if="!$parent.$parent.$parent.f_special && !$parent.$parent.$parent.$parent.areaShow"><nobr>小区备注</nobr></th>
+            <!--民用小区信息结束-->
+            <!--非民用单位信息开始-->
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位名称</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位地址</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系人</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
+            <!--非民用单位信息结束-->
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>抄表员</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>房屋类型</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>安装位置</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>片区/管理站 </nobr></th>
+            <th><nobr>操作人</nobr></th>
+            <th><nobr>操作日期</nobr></th>
+            <th title="该小区下现有的地址数"><nobr>地址数</nobr></th>
+            <th><nobr>操作</nobr></th>
+        </template>
+        <template partial='body'>
+            <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
+<!--            <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}}</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>
+            <td  v-if="$parent.$parent.$parent.f_special"  style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
+            <!--非民用单位信息结束-->
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_inputtor}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_house_type}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_position}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.addressnum}}</nobr></td>
+            <td><nobr>
+              <!--<button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
+              <button v-if="!row.addressnum>0" type="button" name="button" class="btn btn-danger"
+                      style="padding: 5px 12px"
+                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
+                </nobr>
+            </td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show="showDelete"  large backdrop="false" :width="900">
+        <header slot="modal-header" class="modal-header">
+          <p class="bg-info text-center" style="padding: 8px;">提示</p>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <p>您一共选中{{selectDataLen}}个小区，您确定是否要删除吗？</p>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button v-show="showDelete" type="button" class="button_search button_spacing" @click='confirmDelete()' :disabled='!$v.valid'>确认</button>
+          <button v-show="showDelete" type="button" class="button_clear button_spacing" @click='cancelDelete()'>取消</button>
+        </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+    self.search()
+  }
+  export default {
+
+    data () {
+      return {
+        showDelete: false,
+        criteriaShow: false,
+        model: new PagedList('api/af-revenue/sql/address_getarealist',20),
+        selectDataLen: 0,
+        addflag: false,
+        addtitle:'',
+        getfield: {},
+        getRowData:[],
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+        //初始化小区数据
+        areaslist:[],
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_street':'街道名称',
+            'f_residential_area':'小区名称',
+            'f_area_address':'小区地址',
+            'f_comments':'小区备注',
+            'f_inputtor':'抄表员',
+            'f_house_type':'房屋类型',
+            'f_position':'安装位置',
+            'f_slice_area':'片区/管理站',
+            'f_operator':'操作人',
+            'f_operate_date':'操作日期',
+            'addressnum':'地址数'
+          }
+        },
+        housetype:[{label:'全部',value:''},{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
+        position:this.$appdata.getParam('安装位置')?[{label:'全部',value:''},...this.$appdata.getParam('安装位置')]:[{label:'全部',value:''}]
+      }
+    },
+    title: '小区管理',
+    props:{
+      f_filialeids:{
+        type: String
+      },
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group'
+      },
+      f_special:{
+        type: String
+      }
+    },
+    ready(){
+      readyGen(this)
+
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+
+      async delete(row){
+        if(row.id >= 0){
+          var id = row.id
+          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
+            {data: {
+                items: 'f_residential_area_id',
+                tablename: 't_user_address',
+                condition: `f_residential_area_id='${id}'`}
+            },
+            {resolveMsg: null, rejectMsg: null})
+          if(useraredss.data.length>0){
+            this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
+          }else{
+            this.$resetdelete('api/af-revenue/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      add(val){
+        if (this.f_filialeids) {
+          this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add')
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      selfSearch (args) {
+
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        if(this.f_special){
+          args.condition =  `${args.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
+        }else{
+          args.condition =  `${args.condition} and s.f_filialeid = ${this.f_orgid}`
+        }
+        this.model.search(args.condition, args.model)
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      },
+      async batchDelete () {
+        let flag = true
+        if (this.f_filialeids) {
+          if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
+            // 获取要批量删除的小区数据
+            this.getRowData = this.$refs.paged.$refs.grid.getRowData()
+            this.getRowData.forEach((row,n) => {
+              console.log(JSON.stringify(row) + '==========')
+              if (row.addressnum > 0 ) {
+                this.$showAlert('您所选择的小区下已有地址信息,无法删除!','warning',2000)
+                this.selectDataLen = 0
+                flag = false
+              }
+            })
+            if(flag){
+              this.selectDataLen = this.getRowData.length
+              console.log(this.selectDataLen + '-----------------------')
+              this.showDelete = true
+            }
+          } else {
+            this.$showAlert('请至少选择一项！', 'warning', 2000)
+          }
+        }else {
+          this.$showAlert('请先选择左上角的所在分公司！', 'warning', 2000)
+        }
+      },
+      confirmDelete () {
+        let msg = {
+          resolveMsg: '批量删除成功！',
+          rejectMsg: '批量删除失败！'
+        }
+        let oldAreaIds = this.getRowData
+        console.log('所选中的小区信息:=======' + JSON.stringify(oldAreaIds))
+        this.$resetpost('api/af-revenue/logic/batchDelete',{
+          data:{
+                oldAreaIds:oldAreaIds,
+                f_operator: this.$login.f.name,
+                f_operatorid: this.$login.f.id,
+                f_orgid: this.$login.f.orgid,
+                f_orgname: this.$login.f.orgs,
+                f_depid: this.$login.f.depids,
+                f_depname: this.$login.f.deps
+          }
+        },msg)
+        this.$refs.paged.$refs.grid.selectInit()
+        this.$refs.paged.$refs.cri.search()
+        this.showDelete = false
+      },
+      cancelDelete () {
+        this.$refs.paged.$refs.grid.selectInit()
+        this.$refs.paged.$refs.cri.search()
+        this.showDelete = false
+      },
+      // areaChange(val){
+      //   console.log("小区变化",val)
+      //   let selectArea // 选中的小区数据
+      //   for (let row of this.areaslist) {
+      //     if (val == row.value) {
+      //       selectArea = row.data
+      //       break
+      //     }
+      //   }
+      //   if (selectArea) {
+      //     this.areamodel.f_residential_area_id = selectArea.id
+      //     this.areamodel.f_pcd = selectArea.f_pcd
+      //     this.areamodel.f_pcd_id = selectArea.f_pcd_id
+      //     this.areamodel.f_street = selectArea.f_street
+      //     this.areamodel.f_street_id = selectArea.f_street_id
+      //     this.areamodel.f_slice_area = selectArea.f_slice_area
+      //     this.areamodel.f_residential_area = selectArea.f_residential_area
+      //   }
+      //   this.$nextTick(() => {
+      //     this.$resetValidation()
+      //   })
+      // },
+    },
+    watch:{
+
+    },
+    computed:{
+      getCondition() {
+        var condition=''
+        if(this.f_special){
+          condition =  `${this.$refs.paged.$refs.cri.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
+        }else{
+          condition =  `${this.$refs.paged.$refs.cri.condition} and s.f_filialeid = ${this.f_orgid}`
+        }
+        return {
+          condition: condition
+        }
+      },
+      inputtores () {
+        // 获取抄表员
+        let rs = new Array()
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
+        }
+        return rs
+      }
+    }
+
+  }
+</script>

package/src/filiale/xihu/StreetList.vue

@@ -0,0 +1,238 @@
+<template>
+  <div class="flex" @keyup.enter="search">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' @sort="sort()" v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">组织机构</label>
+              <res-select restype='organization'
+                          @res-select="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.curorgid'>
+              </res-select>
+            </div>
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$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_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_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="api/af-revenue/logic/exportfile"
+                            sql-name="manage_getstreetlist"
+                            template-name='街道信息查询导出'
+                            :choose-col="true"></export-excel>
+              <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">省&emsp;&emsp;份</label>
+              <input  type="text"    style="width:60%" class="input_search" v-model="model.f_province"
+                      condition="f_province like '%{}%'" placeholder="省份"
+                      :size="model.f_province ? model.f_province.length*2 : 6"/>
+            </div>
+            <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <input  type="text" style="width:60%" class="input_search" v-model="model.f_city"
+                      condition="f_city like '%{}%'" placeholder="城市"
+                      :size="model.f_city ? model.f_city.length*2 : 6"/>
+            </div>
+            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">省&emsp;&emsp;份</label>
+              <input  type="text"    style="width:60%" class="input_search" v-model="model.f_province"
+                condition="f_province like '%{}%'" placeholder="省份"
+                :size="model.f_province ? model.f_province.length*2 : 6"/>
+            </div>
+            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <input  type="text" style="width:60%" class="input_search" v-model="model.f_city"
+                condition="f_city like '%{}%'" placeholder="城市"
+                :size="model.f_city ? model.f_city.length*2 : 6"/>
+            </div>
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">区&emsp;&emsp;县</label>
+              <input  type="text" style="width:60%" class="input_search"  v-model="model.f_district"
+                      condition="f_district like '%{}%'" placeholder="区县"
+                      :size="model.f_district ? model.f_district.length*2 : 6"/>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th><nobr>序号</nobr></th>
+<!--            <th><nobr>省份</nobr></th>-->
+<!--            <th><nobr>城市</nobr></th>-->
+<!--            <th><nobr>区/县</nobr></th>-->
+            <th><data-order field="f_iscity" name="地区类型"
+                            :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
+            <th><nobr>街道/乡镇</nobr></th>
+            <th><nobr>街道编号</nobr></th>
+            <th><data-order field="f_address" name="地址"
+                            :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
+            <th><nobr>分公司</nobr></th>
+            <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>
+            <th><nobr>操作</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr @click="$parent.$parent.changestyle()">
+            <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
+<!--            <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>-->
+<!--            <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>-->
+<!--            <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>-->
+            <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street_number}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
+            <td style="text-align:center"><nobr>
+            <!--  <button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
+              <button v-if="!row.streetid" type="button" name="button" class="btn btn-danger"
+                      style="padding: 5px 12px"
+                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
+            </nobr></td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+  }
+  export default {
+    data () {
+      return {
+        criteriaShow: false,
+        model: new PagedList('api/af-revenue/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
+        addflag: false,
+        getfield: {},
+        //排序
+        orderitem:'f_city,f_district,f_iscity,f_street desc',
+        addtitle:'',
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_street':'街道名称',
+            'f_org_name':'分公司',
+            'streenum':'小区数量'
+          }
+        },
+        orderFields: {
+          f_operate_date: 'no'
+        },
+      }
+    },
+    title: '街道管理',
+    props:{
+      f_filialeids:{
+        type: String
+      }
+    },
+    ready(){
+      console.log("===========",this.$login.f.orgid)
+      readyGen(this)
+      this.search()
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async delete(row){
+        if(row.id >= 0 ){
+          var id = row.id
+          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
+            {data: {
+                items: 'f_street_id',
+                tablename: 't_area',
+                condition: `f_street_id='${id}'`}
+            },
+            {resolveMsg: null, rejectMsg: null})
+          if(useraredss.data.length>0){
+            this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
+          }else{
+            this.$resetdelete('api/af-revenue/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      add(val){
+        if (this.f_filialeids) {
+          this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add',val)
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        args.condition = `${args.condition} and s.f_filialeid  in ${this.f_orgid}`
+        this.model.search(args.condition, args.model)
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      }
+    },
+    computed: {
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`,
+          orderitem: this.orderitem?`${this.orderitem}`: " id desc"
+        }
+      }
+    },
+    events:{
+      'sort' (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        console.log("field",field, rule)
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
+    },
+  }
+</script>

package/src/filiale/xihu/sale.js

@@ -0,0 +1,14 @@
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+let specialComp = {
+  //街道列表
+  'street-list':(resolve) => { require(['./StreetList'], resolve) },
+  //小区列表
+  'area-list':(resolve) => { require(['./AreaList'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/main.js

@@ -10,7 +10,7 @@ Vue.config.silent = true
 
 /** **************************通用组件******************************/
 all()
-address("lixianV3")
+address()
 system(false)
 ldap()
 sale()

package/build/tmp/jar/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-

package/gradle/wrapper/gradle-wrapper.properties

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

package/gradlew

@@ -1,249 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       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
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# 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
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -1,92 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-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.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-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.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega