address-client 3.2.2 → 3.2.3-zk

package/src/components/AddressManage.vue

@@ -1,117 +1,110 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}">
-      <address-list @select-changed="selected" v-ref:addresslist :style="style"  :f_filialeids.sync="f_filialeids"></address-list>
-    </div>
-    <div v-show="useraddressShow"  class="binary-right">
-      <div class="flex">
-        <user-address v-ref:useraddressmsg
-                      :f_filialeids.sync="f_filialeids" :row="row"></user-address>
-
-        <user-address-change v-if="addressId" :address_id="addressId"></user-address-change>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '地址管理',
-    components:{
-    },
-    data () {
-      return {
-        //分公司id串
-        f_filialeids: this.$login.f.orgid,
-        area: [],
-        street: [],
-        residential: [],
-        row: {},
-        useraddressShow: false,
-        addressId: null,
-        style:'col-sm-2 form-group'
-      }
-    },
-    props:{
-
-    },
-    methods:{
-      selected(obj){
-        this.$refs.addresslist.showrightchange=false;
-        this.style='col-sm-3 form-group'
-        if(obj.val&&obj.val.id){
-          if (obj.val.f_filialeid != this.f_filialeids) {
-            this.refresh()
-            return
-          }
-          // 呼叫中心需要
-          this.$dispatch('re-ref', obj.val)
-          this.addressId=obj.val.id
-          this.useraddressShow=true
-          this.$refs.useraddressmsg.cleardara()
-          this.$refs.useraddressmsg.initdata()
-          this.$refs.useraddressmsg.usertype=obj.val.f_user_type
-          this.$refs.useraddressmsg.operation='modify'
-          this.$refs.useraddressmsg.onedata='one'
-          this.$refs.useraddressmsg.model=Object.assign({},this.$refs.useraddressmsg.model,obj.val)
-          if(obj.val.f_special=='1'){
-            this.$refs.useraddressmsg.usertype = true
-          }else{
-            this.$refs.useraddressmsg.usertype = false
-          }
-          if (obj.val.f_slice_area) {
-            this.$refs.useraddressmsg.model.slice_area = [{
-              name: this.$refs.useraddressmsg.model.f_slice_area,
-              code: this.$refs.useraddressmsg.model.f_area_code
-            }]
-          }
-        }
-      },
-      refresh () {
-        this.addressId=null
-        this.useraddressShow = false
-        this.$refs.addresslist.$refs.paged.$refs.cri.search()
-      }
-    },
-    events:{
-      'add'(val){
-        this.style='col-sm-3 form-group'
-        this.useraddressShow = true
-        this.$refs.useraddressmsg.cleardara()
-        this.addressId=null
-        //true为新增特殊地址
-        if (val!='民用') {
-          //非民用
-          this.$refs.useraddressmsg.usertype = true
-          this.$refs.useraddressmsg.onedata = 'one'
-        }else{
-          this.$refs.useraddressmsg.usertype = false
-        }
-        this.$refs.useraddressmsg.operation='add'
-        this.$refs.useraddressmsg.pcdslist=[]
-        this.$refs.useraddressmsg.streetslist=[]
-        this.$refs.useraddressmsg.areaslist=[]
-        this.$refs.useraddressmsg.initdata()
-      },
-      'confirm' () {
-        this.style='col-sm-2 form-group'
-        this.addressId=null
-        this.$refs.addresslist.$refs.paged.$refs.cri.search()
-        this.useraddressShow = false
-        this.$refs.addresslist.showrightchange=true;
-      },
-      'modify'(area){
-        this.style='col-sm-2 form-group'
-      },
-      'cancel' () {
-        this.style='col-sm-2 form-group'
-        this.addressId=null
-        this.$refs.addresslist.showrightchange=true;
-        this.$refs.addresslist.$refs.paged.$refs.cri.search()
-        this.useraddressShow = false
-      },
-    }
-  }
-</script>
-<style>
-</style>
+<template>
+  <div id="unit" class="flex-row">
+    <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}">
+      <address-list @select-changed="selected" v-ref:addresslist :style="style"
+                    :f_filialeids.sync="f_filialeids"></address-list>
+    </div>
+    <div v-show="useraddressShow" class="binary-right">
+      <div class="flex">
+        <user-address v-ref:useraddressmsg
+                      :f_filialeids.sync="f_filialeids" :row.sync="row"></user-address>
+
+        <user-address-change v-if="addressId" :address_id="addressId"></user-address-change>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '地址管理',
+  components: {},
+  data() {
+    return {
+      //分公司id串
+      f_filialeids: this.$login.f.orgid,
+      area: [],
+      street: [],
+      residential: [],
+      row: {},
+      useraddressShow: false,
+      addressId: null,
+      style: 'col-sm-2 form-group'
+    }
+  },
+  props: {},
+  methods: {
+    selected(obj) {
+      console.log(JSON.stringify(obj))
+      this.$refs.addresslist.showrightchange = false;
+      this.style = 'col-sm-3 form-group'
+      if (obj.val && obj.val.id) {
+        if (obj.val.f_filialeid != this.f_filialeids) {
+          this.refresh()
+          return
+        }
+        // 呼叫中心需要
+        this.$dispatch('re-ref', obj.val)
+        this.addressId = obj.val.id
+        this.$refs.useraddressmsg.cleardara()
+        this.$refs.useraddressmsg.initdata()
+        this.useraddressShow = true
+        this.$refs.useraddressmsg.operation = 'modify'
+        this.$refs.useraddressmsg.onedata = 'one'
+        // this.$refs.useraddressmsg.model.f_residential_area = obj.val.f_residential_area
+        this.$refs.useraddressmsg.model = Object.assign({}, this.$refs.useraddressmsg.model, obj.val)
+        this.$refs.useraddressmsg.usertype = obj.val.f_special === '1';
+        if (obj.val.f_slice_area) {
+          this.$refs.useraddressmsg.model.slice_area = this.$refs.useraddressmsg.model.f_slice_area
+        }
+      }
+    },
+    refresh() {
+      this.addressId = null
+      this.useraddressShow = false
+      this.$refs.addresslist.$refs.paged.$refs.cri.search()
+    }
+  },
+  events: {
+    'add'(val) {
+      this.style = 'col-sm-3 form-group'
+      this.useraddressShow = true
+      this.$refs.useraddressmsg.cleardara()
+      this.addressId = null
+      //true为新增特殊地址
+      if (val != '民用') {
+        //非民用
+        this.$refs.useraddressmsg.usertype = true
+        this.$refs.useraddressmsg.onedata = 'one'
+      } else {
+        this.$refs.useraddressmsg.usertype = false
+      }
+      this.$refs.useraddressmsg.operation = 'add'
+      this.$refs.useraddressmsg.pcdslist = []
+      this.$refs.useraddressmsg.streetslist = []
+      this.$refs.useraddressmsg.areaslist = []
+      this.$refs.useraddressmsg.initdata()
+    },
+    'confirm'() {
+      this.style = 'col-sm-2 form-group'
+      this.addressId = null
+      this.$refs.addresslist.$refs.paged.$refs.cri.search()
+      this.useraddressShow = false
+      this.$refs.addresslist.showrightchange = true;
+    },
+    'modify'(area) {
+      this.style = 'col-sm-2 form-group'
+    },
+    'cancel'() {
+      this.style = 'col-sm-2 form-group'
+      this.addressId = null
+      this.$refs.addresslist.showrightchange = true;
+      // 取消不需要重新查询
+      // this.$refs.addresslist.$refs.paged.$refs.cri.search()
+      this.useraddressShow = false
+    },
+  }
+}
+</script>
+<style>
+</style>

package/src/components/AreaList.vue

@@ -13,9 +13,9 @@
               </res-select>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">小区编号</label>
+              <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="小区编号"/>
+                      condition="f_area_id = '{}'" placeholder="单位编号"/>
             </div>
             <div :class="$parent.$parent.style" v-if="false">
               <label class="font_normal_body">省&emsp;&emsp;份</label>
@@ -46,7 +46,7 @@
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
                             sqlurl="rs/logic/exportfile"
-                            sql-name="manage_getarealist"
+                            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>
@@ -72,9 +72,9 @@
                       :size="model.f_street ? model.f_street.length*2 : 6"/>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">小区名称</label>
+              <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="小区"
+                      condition="f_residential_area like '%{}%'" placeholder="单位"
                       :size="model.f_residential_area ? model.f_residential_area.length*2 : 6"/>
             </div>
             <div :class="$parent.$parent.style">
@@ -109,7 +109,8 @@
             <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"><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>
             <!--民用小区信息结束-->
@@ -137,6 +138,7 @@
             <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_area_id}}</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>
@@ -167,151 +169,151 @@
 </template>
 
 <script>
-  import { PagedList } from 'vue-client'
-  let readyGen = async function (self) {
-    self.getfield = self.config.excelHeaders
-    self.search()
-  }
-  export default {
+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'
+  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':'地址数'
+        }
       },
-      f_special:{
-        type: String
-      }
+      housetype:[{label:'全部',value:''},{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
+      position:this.$appdata.getParam('安装位置')?[{label:'全部',value:''},...this.$appdata.getParam('安装位置')]:[{label:'全部',value:''}]
+    }
+  },
+  title: '小区管理',
+  props:{
+    f_filialeids:{
+      type: String
     },
-    ready(){
-      readyGen(this)
+    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()
     },
-    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)
+    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')
+          })
         }
-      },
-      modify(val){
+      }
+    },
+    add(val){
+      if (this.f_filialeids) {
         this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      selfSearch (args) {
+        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]
+      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 = {}
     },
-    watch:{
+    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
+      }
     },
-    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)
+    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
       }
+      return rs
     }
-
   }
+
+}
 </script>