address-client 3.1.3 → 3.1.4

package/package.json

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

package/src/filiale/zhoukou/AddAreaMsg.vue

@@ -0,0 +1,671 @@
+<template>
+  <div class="span">
+    <validator name='v'>
+      <div class="form-horizontal select-overspread container-fluid" style="overflow-y: auto">
+        <div class="row auto">
+          <div class="col-sm-12 bg-info text-center"  style="padding: 8px;font-size: 18px;font-weight: bold">
+<!--            <span v-if="operation=='add'&&!f_specia">添加{{areatype}}</span>-->
+<!--            <span v-if="operation=='modify'&&!f_special">修改【{{areamodel.f_residential_area}}】小区</span>-->
+            <span v-if="operation=='add'&&!f_specia">添加集收单位</span>
+            <span v-if="operation=='modify'&&!f_special">修改集收单位</span>
+            <span v-if="operation=='add'&&f_specia">添加{{areatype}}</span>
+            <span v-if="operation=='modify'&&f_special">修改【{{areamodel.f_residential_area}}】单位</span>
+          </div>
+          <!--基本小区(单位)信息-->
+          <div class="col-sm-6 form-group" v-if="!config.hasnumber">
+            <label class="font_normal_body">单位编号</label>
+            <input type="text" class="input_search" style="width:60%" v-model="areamodel.f_area_id"
+                   @blur="areaidChange" placeholder="单位编号">
+          </div>
+
+          <div class="col-sm-6 form-group" v-if="config.hasnumber"
+               :class="[$v.f_area_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">单位编号</label>
+            <input type="number" class="input_search" style="width:60%" v-model="areamodel.f_area_id"
+                   v-validate:f_area_id='{required: true }'
+                   @change="areaidChangeHasnumber" placeholder="单位编号">
+          </div>
+
+          <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" class="input_search" class="input_search" style="width:60%" v-show="false" v-model="areamodel.f_pcd_id"
+                   v-validate:f_pcd_id='{required: true }'>
+            <v-select
+              :value.sync="areamodel.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_id.required ? 'has-error' : 'has-success']">
+            <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
+              :value.sync="areamodel.f_street_id" :value-single="true"
+              :options='streetslist' placeholder='请选择'
+              close-on-select search="true" @change="streetChange">
+            </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-validate:slice='{required: true }'>
+            <v-select :value.sync="areamodel.slice_area" v-model="areamodel.slice_area"
+                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+                      close-on-select v-ref:slice>
+            </v-select>
+          </div>
+          <!--小区(特殊)信息-->
+          <div v-if="!f_special"
+               class="col-sm-6 form-group"
+               :class="[$v.f_residential_area.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">单位名称</label>
+            <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_residential_area"
+                   class="form-control" placeholder="小区名称"
+                   v-validate:f_residential_area='{required: true }'>
+          </div>
+          <div v-if="!f_special"
+               class="col-sm-12 form-group">
+            <label class="font_normal_body">单位地址</label>
+            <input type="text" style="width:80%" class="input_search"  v-model="areamodel.f_area_address"
+                   class="form-control" placeholder="单位地址">
+          </div>
+          <!--单位(特殊)信息-->
+          <div v-if="f_special"
+               class="col-sm-6 form-group"
+               :class="[$v.f_residential_area.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">单位名称</label>
+            <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_residential_area"
+                   class="form-control" placeholder="单位名称"
+                   v-validate:f_residential_area='{required: true }'>
+          </div>
+          <div v-if="f_special"
+               class="col-sm-12 form-group">
+            <label class="font_normal_body">单位地址</label>
+            <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_area_address"
+                   class="form-control" placeholder="单位地址">
+          </div>
+          <div v-if="f_special"
+               class="col-sm-6 form-group"
+               :class="[$v.f_linkname.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">联&ensp;系&ensp;人</label>
+            <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_linkname"
+                   class="form-control" placeholder="联系人"
+                   v-validate:f_linkname='{required: true }'>
+          </div>
+          <div v-if="f_special"
+               class="col-sm-6 form-group"
+               :class="[$v.f_linkphone.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">联系电话</label>
+            <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_linkphone"
+                   class="form-control" placeholder="联系电话"
+                   v-validate:f_linkphone='{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:20px;width:80%;height: auto;" v-model="areamodel.f_comments"></textarea>
+          </div>
+          <div class="col-sm-12 form-group">
+            <br/>
+          </div>
+          <!--表具信息-->
+          <div v-if="!f_special" class="col-sm-12 bg-info text-center"  style="padding: 8px;font-size: 18px;font-weight: bold">
+            <span >默认表具信息</span>
+          </div>
+          <div v-if="!f_special" class="row">
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_user_type">
+              <v-select
+                :value.sync="areamodel.f_user_type" :value-single="true"
+                :options='usertypes' placeholder='用户类型' @change="userTypeChange"
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">用气性质</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_gasproperties">
+              <v-select
+                :value.sync="areamodel.f_gasproperties" :value-single="true"
+                :options='gasproperties' placeholder='用气性质'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">气价类型</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_type">
+              <v-select
+                :value.sync="areamodel.f_price_type" :value-single="true"
+                :options='f_price_types' placeholder='气价类型'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">气价名称</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_name">
+              <v-select
+                :value.sync="areamodel.f_price_name" :value-single="true"
+                :options='pricenames' placeholder='气价名称'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">气表品牌</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_brand">
+              <v-select
+                :value.sync="areamodel.f_meter_brand" :value-single="true"
+                :options='meterbrands' placeholder='气表品牌'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">气表型号</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_style">
+              <v-select
+                :value.sync="areamodel.f_meter_style" :value-single="true"
+                :options='meterstyle' placeholder='气表型号'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group" :class="[$v.f_meter_type.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">气表类型</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false"
+                     v-model="areamodel.f_meter_type">
+              <v-select :value.sync="areamodel.f_meter_type" :value-single="true"
+                        :options='metertypes' placeholder='请选择'
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-6 form-group" v-if="isMachine">
+              <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false"
+                     v-model="areamodel.f_meter_book">
+              <v-select
+                :value.sync="areamodel.f_meter_book" :value-single="true"
+                :options='meterbooks' placeholder='抄表册'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group" v-if="!isMachine" :class="[$v.f_meter_book.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false"
+                     v-model="areamodel.f_meter_book">
+              <v-select
+                :value.sync="areamodel.f_meter_book" :value-single="true"
+                :options='meterbooks' placeholder='抄表册'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group" :class="[$v.f_inputtor.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">抄&ensp;表&ensp;员</label>
+              <input type="text" style="width:60%" class="input_search"
+                     v-show="false" v-model="areamodel.f_inputtor">
+              <v-select
+                :value.sync="areamodel.f_inputtor" :value-single="true"
+                :options='inputtores' placeholder='抄表员'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group" :class="[$v.f_adjustable_id.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">调&ensp;压&ensp;箱</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false"
+                     v-model="areamodel.f_adjustable_id">
+              <v-select
+                :value.sync="areamodel.f_adjustable_id" :value-single="true"
+                :options='adjustables' placeholder='调压箱'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group" :class="[$v.f_house_type.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">房屋类型</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false"
+                     v-model="areamodel.f_house_type" >
+              <v-select
+                :value.sync="areamodel.f_house_type" :value-single="true"
+                :options='housetypeoptions' placeholder='房屋类型'
+                close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group" :class="[$v.f_position.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">安装位置</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false"  v-model="areamodel.f_position" >
+              <v-select
+                :value.sync="areamodel.f_position" :value-single="true"
+                :options='positions' placeholder='安装位置'
+                close-on-select >
+              </v-select>
+            </div>
+          </div>
+          <div v-if="f_special" class="col-sm-6 form-group">
+            <br/>
+          </div>
+        </div>
+        <div class="row auto" style="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>
+    </validator>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  let initGen = async function (self) {
+    await self.$getConfig(self, 'UserArea')
+    console.log('原地址配置',self.config)
+    console.log('获取地址配置',self.config)
+    Object.assign(self.model, self.config)
+    await self.initdata()
+    await self.$LoadParams.loadMeterBook(self.f_filialeids)
+    await self.loadMeterBooks();
+  }
+  export default {
+    title: '小区添加',
+    data () {
+      return {
+        config:{
+          hasnumber:false,
+        },
+        //初始化省市区数据
+        pcdslist:[],
+        //初始化街道数据
+        streetslist:[],
+        //小区
+        areamodel: {
+          f_area_id: '',
+          f_pcd_id:'',
+          f_linkname:'',
+          f_linkphone:'',
+          f_street_id:'',
+          f_slice_area:'',
+          f_adjustable_id:'',
+          f_residential_area:'',
+          f_user_type:'',
+          f_gasproperties:'',
+          f_meter_brand:'',
+          f_price_name:'',
+          f_area_address:'',
+          f_price_type:'',
+          f_meter_style:'',
+          f_position:'',
+          f_comments:'',
+          f_meter_type: ''
+        },
+        meterbrands: [],
+        adjustables: [],
+        sliceArea: [],
+        gasproperties: [],
+        meterbooks:[{label: '全部',value: ''}],
+        housetypeoptions:[{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
+        isMachine: true
+      }
+    },
+    props: ['f_filialeids','f_special', 'areatype','row','operation'],
+    ready(){
+      initGen(this)
+    },
+    methods: {
+      loadMeterBooks(){
+        this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
+      },
+      //初始化数据
+      async initdata(){
+        // 初始化参数
+        await this.initParams()
+
+        // 初始化片区
+        await this.initSlice(this.f_filialeids)
+        await this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
+      },
+      initrow(val){
+        this.areamodel.f_meter_book = val.f_meter_book;
+        this.areamodel.f_adjustable_id = val.f_adjustable_id;
+      },
+      async initParams() {
+        await this.$LoadParams.loadParam(this.f_filialeids)
+        this.initBrands()
+        this.initAdjustables()
+      },
+
+      initBrands () {
+        let ret = this.$GetSaleParam.getGasbrand()
+        let rs = new Array()
+        ret.forEach((item, index) =>{
+          rs.push({label: item.label, value: item.value.f_meter_brand})
+        })
+        this.meterbrands = rs
+      },
+
+      initAdjustables () {
+        let filter = this.$login.f.orgid
+        let ret = this.$GetSaleParam.getAdjustable(filter)
+        let arr = new Array()
+        ret.forEach((item, index) => {
+          arr.push({label: `[${item.value.f_adjustable_id}]-${item.label}`, value: item.value.id})
+        })
+        this.adjustables = arr
+      },
+
+      async initSlice (val) {
+        if (val) {
+          let getAllArea = await this.$resetpost('/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          this.sliceArea = []
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+          })
+        }
+      },
+
+      //初始化省市区,添加街道
+      async initpcds(pconditon){
+        this.pcdslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_pcd',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_pcd,
+            value: row.id,
+            data:row,
+            id:row.id
+          }
+        })
+        this.pcdslist=redata
+
+      },
+      //初始化街道 添加小区
+      async initstreets(pconditon){
+        this.streetslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_street',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_street,
+            value: row.id,
+            data:row,
+            id:row.id
+          }
+        })
+        this.streetslist=redata
+      },
+      async areaidChangeHasnumber(){
+        console.log(this.areamodel.f_area_id.length)
+        if (this.areamodel.f_area_id.length != 2){
+          this.$showAlert('请输入正确的位数', 'warning', 2000)
+          this.areamodel.f_area_id = ''
+        }else{
+          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+            data: {
+              items: '*',
+              tablename: 't_area',
+              orderitem: 'id',
+              condition: `f_area_id = '${this.areamodel.f_area_id}' and f_orgid = '${this.$login.f.orgid}'`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          if (res.data.length>0){
+            if (res.data[0].id != this.areamodel.id) {
+              this.$showAlert('当前编号已存在', 'warning', 2000)
+              this.areamodel.f_area_id = ''
+            }
+          }
+        }
+      },
+      async areaidChange () {
+        // 验证小区编号是否已存在
+
+        let param = {
+          id: this.areamodel.id,
+          f_area_id: this.areamodel.f_area_id,
+          f_filialeid: this.f_filialeids
+        }
+
+        let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
+        console.log('验证小区是否存在', res)
+        if (res.data) {
+          this.$showAlert('这个小区编号已存在！！！请核实', 'warning', 3000)
+          this.areamodel.f_area_id = ''
+        }
+
+      },
+
+
+      //根据名字找数据
+      findbyid(list,name){
+        var result
+        list.forEach((row, n) => {
+          if(name==row.id){
+            result= row.data
+          }
+        })
+        return result
+      },
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.areamodel.f_user_type) {
+          this.gasproperties = this.$appdata.getParam(this.areamodel.f_user_type)
+        }
+      },
+
+      //省/市/区变化
+      async pcdChange(val){
+        if(val){
+          //那就把街道数据重新组织一下
+          await this.initstreets(` f_filialeid = '${this.f_filialeids}' and f_pcd_id ='${val}' `)
+          if(this.areamodel.f_street_id){
+            if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
+              let pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
+              if(pcd_id!=val){
+                this.areamodel.f_street_id=''
+              }
+            } else {
+              this.areamodel.f_street_id=''
+            }
+
+          }
+        }
+        this.$resetValidation()
+      },
+      //街道变化
+      streetChange(val){
+        if(val&&this.operation=='add'){
+          // if(this.areamodel.f_pcd_id.length==0){
+          if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
+            this.areamodel.f_pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
+          }
+          // }
+        }
+        this.$resetValidation()
+      },
+      //保存
+      async confirm(){
+        await this.savearea()
+        this.cleardara()
+        this.$dispatch('confirm')
+      },
+      //保存小区
+      async savearea(){
+        if(this.f_special){
+          this.areamodel.f_special='1'
+        }
+        this.areamodel.f_filialeid = this.f_filialeids
+        this.areamodel.f_operator = this.$login.f.name
+        this.areamodel.f_operatorid = this.$login.f.id
+        this.areamodel.f_orgid = this.$login.f.orgid
+        this.areamodel.f_orgname = this.$login.f.orgs
+        this.areamodel.f_depid = this.$login.f.depids
+        this.areamodel.f_depname = this.$login.f.deps
+        if (this.areamodel.slice_area) {
+          if (this.areamodel.slice_area.length > 0) {
+            this.areamodel.f_slice_area = this.areamodel.slice_area[0].name
+            this.areamodel.f_area_code = this.areamodel.slice_area[0].code
+          }
+        }
+        this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
+        this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
+
+        await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
+      },
+      cleardara(){
+        this.areamodel= {
+          f_area_id: '',
+          f_pcd_id:'',
+          f_street_id:'',
+          f_slice_area:'',
+          f_linkname:'',
+          f_linkphone:'',
+          f_adjustable_id:'',
+          f_residential_area:'',
+          f_user_type:'',
+          f_gasproperties:'',
+          f_area_address:'',
+          f_meter_brand:'',
+          f_price_name:'',
+          f_price_type:'',
+          f_meter_style:'',
+          f_position:'',
+          f_comments:'',
+          f_meter_type: ''
+        }
+      },
+      cancel(){
+        this.cleardara()
+        this.$dispatch('cancel')
+      },
+    },
+    watch: {
+      'areamodel.f_meter_type' (val) {
+        if (val === '机表')
+          this.isMachine = false
+      },
+      'areatype'(){
+        this.initdata()
+      },
+      'areamodel.f_pcd_id'(){
+        if(this.areamodel.f_pcd_id&&this.areamodel.f_street_id){
+          if (this.findbyid(this.pcdslist,this.areamodel.f_pcd_id) && this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
+            this.areamodel.f_area_address = this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
+          }
+        }
+      },
+      'areamodel.f_street_id'(){
+        if (this.areamodel.f_pcd_id && this.areamodel.f_street_id) {
+          if (this.findbyid(this.pcdslist, this.areamodel.f_pcd_id) && this.findbyid(this.streetslist, this.areamodel.f_street_id)) {
+            this.areamodel.f_area_address = this.findbyid(this.pcdslist, this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist, this.areamodel.f_street_id).f_street
+          }
+        }
+      },
+      'f_filialeids'(){
+        if (this.areamodel.f_filialeid) {
+          if (this.areamodel.f_filialeid != this.f_filialeids) {
+            this.$dispatch('cancel')
+          }
+        }
+        this.cleardara()
+        this.initdata()
+      }
+    },
+    computed: {
+      metertypes() {
+        return this.$appdata.getParam('气表类型')
+      },
+      usertypes () {
+        return this.$appdata.getParam('用户类型')
+      },
+      f_price_types () {
+        return this.$appdata.getParam('气价类型')
+      },
+      meterstyle () {
+        let ret = this.$GetSaleParam.getGasbrand()
+        let rs = new Array()
+        if(this.areamodel.f_meter_brand) {
+          ret.forEach((item, index) => {
+            if(this.areamodel.f_meter_brand == item.value.f_meter_brand) {
+              item.value.gasmodel.forEach((item1, index) =>{
+                rs.push({label: item1.label, value:item1.label})
+              })
+            }
+          })
+        }
+        return rs
+      },
+      pricenames () {
+        let rs = new Array()
+        if (this.areamodel.f_user_type && this.areamodel.f_gasproperties && this.areamodel.f_price_type) {
+          let params = {
+            f_user_type: this.areamodel.f_user_type,
+            f_gasproperties: this.areamodel.f_gasproperties,
+            f_price_type: this.areamodel.f_price_type,
+            filter: this.f_filialeids
+          }
+          let ret = this.$GetSaleParam.getPrice(params)
+          ret.forEach((item, index) => {
+            rs.push({label: item.label, value: item.value.f_price_name})
+          })
+        }
+        if (rs.length == 0) {
+          this.areamodel.f_price_name = ''
+        }
+        return rs
+      },
+      positions () {
+        return this.$appdata.getParam('安装位置')
+      },
+      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>
+<style>
+  .box {
+    width: 727px;
+    height: 175px;
+    border-radius: 2px;
+    background-color: #fafafa;
+    border: 1px solid #999999;
+    margin-top: 13px;
+  }
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 10px 30px 10px 30px;
+    border-radius:15px;
+  }
+</style>

package/src/filiale/zhoukou/AreaList.vue

@@ -0,0 +1,317 @@
+<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">
+              <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 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="rs/logic/exportfile"
+                            sql-name="address_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">城&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" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <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>
+
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <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}}{{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>
+            <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.f_residential_area_id" 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
+    self.search()
+  }
+  export default {
+
+    data () {
+      return {
+        criteriaShow: false,
+        model: new PagedList('rs/sql/address_getarealist',20),
+        addflag: false,
+        addtitle:'',
+        getfield: {},
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_district':'区/县',
+            '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('rs/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('rs/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]
+      }
+    },
+    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/zhoukou/AreaManage.vue

@@ -0,0 +1,100 @@
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':areaShow}">
+    <div :class="{'basic-main':!areaShow,'binary-left':areaShow}">
+      <area-list @select-changed="selected" v-ref:arealist   :style="style" :f_filialeids.sync="f_filialeids"></area-list>
+    </div>
+    <div v-show="areaShow" style="width: 60%" class="binary-right">
+      <div class="flex">
+        <add-area-msg v-ref:addareamsg :areatype="areatype" :operation="operation"
+                      :f_filialeids.sync="f_filialeids" :row="arearow"></add-area-msg>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '小区管理',
+    components:{
+    },
+    data () {
+      return {
+        //分公司id串
+        width:'100%',
+        f_filialeids: this.$login.f.f_orgids,
+        areaShow:false,
+        areatype:'小区',
+        arearow:{},
+        style:'col-sm-2 form-group'
+      }
+    },
+    ready(){
+
+    },
+    props:{
+
+    },
+    methods:{
+      selected(obj){
+        this.style='col-sm-3 form-group'
+        if(obj.val&&obj.val.id){
+          console.log('对比分公司', obj.val.f_filialeid, this.f_filialeids)
+          if (obj.val.f_filialeid != this.f_filialeids) {
+            this.refresh()
+            return
+          }
+          this.areaShow = true
+          this.$refs.addareamsg.cleardara()
+          this.$refs.addareamsg.operation='modify'
+          this.$refs.addareamsg.areatype='小区'
+          this.$refs.addareamsg.areamodel=Object.assign({},obj.val)
+          if (obj.val.f_slice_area) {
+            this.$refs.addareamsg.areamodel.slice_area = [{
+              name: this.$refs.addareamsg.areamodel.f_slice_area,
+              code: this.$refs.addareamsg.areamodel.f_area_code
+            }]
+          }
+          if (obj.val.f_meter_book != null && obj.val.f_meter_book != '' && obj.val.f_meter_book instanceof Array) {
+            this.$refs.addareamsg.areamodel.f_meter_book = parseInt(obj.val.f_meter_book[0])
+          }
+          if (obj.val.f_meter_book != null && obj.val.f_meter_book != '' && !(obj.val.f_meter_book instanceof Array)) {
+            this.$refs.addareamsg.areamodel.f_meter_book = parseInt(obj.val.f_meter_book)
+          }
+          if (obj.val.f_adjustable_id != null && obj.val.f_adjustable_id != '' && obj.val.f_adjustable_id instanceof Array) {
+            this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.val.f_adjustable_id[0])
+          }
+          if (obj.val.f_adjustable_id != null && obj.val.f_adjustable_id != '' && !(obj.val.f_adjustable_id instanceof Array)) {
+            this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.val.f_adjustable_id)
+          }
+          // this.$refs.addareamsg.initdata(obj.val)
+          // this.$refs.addareamsg.initrow(obj.val)
+        }
+      },
+      refresh() {
+        this.areaShow = false
+        this.$refs.arealist.$refs.paged.$refs.cri.search()
+      }
+    },
+    events:{
+      'add'(){
+        this.style='col-sm-3 form-group'
+        this.areaShow=true
+        this.$refs.addareamsg.cleardara()
+        this.$refs.addareamsg.operation='add'
+        this.$refs.addareamsg.areatype='小区'
+        this.$refs.addareamsg.initdata()
+      },
+      'confirm' () {
+        this.style='col-sm-2 form-group'
+        this.areaShow = false
+        this.$refs.arealist.$refs.paged.$refs.cri.search()
+      },
+      'cancel' () {
+        this.style='col-sm-2 form-group'
+        this.$refs.arealist.$refs.paged.$refs.cri.search()
+        this.areaShow = false
+      }
+    }
+  }
+</script>
+

package/src/filiale/zhoukou/sale.js

@@ -6,7 +6,15 @@ let specialComp = {
   //地址管理父组件
   'address-manage': (resolve) =>{ require(['./AddressManage'], resolve) },
   'user-address': (resolve) =>{ require(['./UserAddress'], resolve) },
-  'address-list': (resolve) =>{ require(['./AddressList'], resolve) }
+  'address-list': (resolve) =>{ require(['./AddressList'], resolve) },
+
+
+  //小区添加
+  'add-area-msg': (resolve) => { require(['./AddAreaMsg'], resolve) },
+  //小区列表
+  'area-list': (resolve) => { require(['./AreaList'], resolve) },
+  //小区管理（包含修改表具，小区的添加）
+  'area-manage': (resolve) => { require(['./AreaManage'], resolve) }
 }
 exports.specialComp = specialComp