address-client 3.2.5 → 3.2.9

package/src/components/AddressList.vue

@@ -222,11 +222,11 @@
             </v-select>
           </div>
           <div  class="col-sm-6 form-group " v-if="showModify"
-                :class="[$v.f_area_id.required ? 'has-error' : 'has-success']">
+                :class="[$v.f_residential_area_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">小区名称</label>
-            <input type="text" style="width:41%" v-show="false" v-model="areamodel.f_area_id"
+            <input type="text" style="width:41%" v-show="false" v-model="areamodel.f_residential_area_id"
                    v-validate:f_area_id='{required: true }'>
-            <v-select :value.sync="areamodel.f_area_id" :value-single="true"
+            <v-select :value.sync="areamodel.f_residential_area_id" :value-single="true"
                       :options='areaslist' placeholder='请选择'
                       @change=""
                       close-on-select search="true">
@@ -321,7 +321,7 @@
       readyGen(this)
       this.search()
       this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
-      this.initAreas(this.f_filialeids)
+      this.initareas(`f_filialeid = '${this.f_filialeids}'`)
       this.$refs.paged.$refs.grid.selectInit()
     },
     methods: {
@@ -429,7 +429,7 @@
         let modifyBatchData = {
           userInfos: this.userInfos,
           f_pcd_id: this.areamodel.f_pcd_id,
-          f_area_id: this.areamodel.f_area_id,
+          f_residential_area_id: this.areamodel.f_residential_area_id,
           f_street_id: this.areamodel.f_street_id,
           f_operator: this.$login.f.name,
           f_operatorid: this.$login.f.id,

package/src/components/AddressModel.vue

@@ -1,95 +1,95 @@
-<template>
-  <modal :show.sync="isshow" :width='width'  v-ref:modal backdrop="false">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="closeTree"><span>&times;</span></button>
-      <h4 class="modal-title">地址管理</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="from-group" style="height: 450px;overflow: auto;">
-        <address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
-        <!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect  :show="showType" :value="value"  @re-ref="selectclick"></address-select>-->
-      </div>
-    </article>
-    <footer slot="modal-footer">
-      <button  type="button" class="btn btn-success" @click='confirm'>确认</button>
-    </footer>
-  </modal>
-</template>
-
-<script>
-  export default {
-    name: "AddressModel",
-    title: '地址管理弹窗',
-    props: {
-      // 地址查询方式
-      isquery: {
-        type: Boolean,
-        default: true,
-      },
-      //位置信息
-      f_location: {
-        type: Object,
-        default: {
-          f_locationId: '1535',
-          f_locationType: 't_organization',
-        }
-      },
-      //是否显示
-      isshow: {
-        type: Boolean,
-        default : false,
-      },
-      // 是否选中
-      isselect: {
-        type: Boolean,
-        default: false,
-      },
-      // 默认显示地址
-      value:{
-        type: Object
-      },
-      // 下拉选择 || 树选择
-      showType: {
-        type: Boolean,
-        default: false
-      },
-      // 是否显示批量添加
-      isbasch: {
-        type: Boolean,
-        default: true,
-      }
-    },
-    data(){
-      return{
-        width: '90%'
-      }
-    },
-    methods:{
-      confirm(){
-        this.$emit('addressno')
-      },
-      // 关闭 弹窗
-      closeTree() {
-        this.isshow = false
-        this.$emit('addressno')
-      }
-      // 选中
-      // selectclick(newobj, address) {
-      //   this.$emit('re-ref', newobj, address)
-      // }
-    },
-    watch:{
-      //显示改变且为true
-      'isshow'(val){
-        if(val){
-          //刷新数据
-          this.$refs.addresstree.init()
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <modal :show.sync="isshow" :width='width'  v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeTree"><span>&times;</span></button>
+      <h4 class="modal-title">地址管理</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group" style="height: 450px;overflow: auto;">
+        <address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
+        <!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect  :show="showType" :value="value"  @re-ref="selectclick"></address-select>-->
+      </div>
+    </article>
+    <footer slot="modal-footer">
+      <button  type="button" class="btn btn-success" @click='confirm'>确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+  export default {
+    name: "AddressModel",
+    title: '地址管理弹窗',
+    props: {
+      // 地址查询方式
+      isquery: {
+        type: Boolean,
+        default: true,
+      },
+      //位置信息
+      f_location: {
+        type: Object,
+        default: {
+          f_locationId: '1535',
+          f_locationType: 't_organization',
+        }
+      },
+      //是否显示
+      isshow: {
+        type: Boolean,
+        default : false,
+      },
+      // 是否选中
+      isselect: {
+        type: Boolean,
+        default: false,
+      },
+      // 默认显示地址
+      value:{
+        type: Object
+      },
+      // 下拉选择 || 树选择
+      showType: {
+        type: Boolean,
+        default: false
+      },
+      // 是否显示批量添加
+      isbasch: {
+        type: Boolean,
+        default: true,
+      }
+    },
+    data(){
+      return{
+        width: '90%'
+      }
+    },
+    methods:{
+      confirm(){
+        this.$emit('addressno')
+      },
+      // 关闭 弹窗
+      closeTree() {
+        this.isshow = false
+        this.$emit('addressno')
+      }
+      // 选中
+      // selectclick(newobj, address) {
+      //   this.$emit('re-ref', newobj, address)
+      // }
+    },
+    watch:{
+      //显示改变且为true
+      'isshow'(val){
+        if(val){
+          //刷新数据
+          this.$refs.addresstree.init()
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/AreaManage.vue

@@ -1,100 +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>
-
+<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'(val){
+        this.style='col-sm-3 form-group'
+        this.areaShow=true
+        this.$refs.addareamsg.cleardara()
+        this.$refs.addareamsg.operation='add'
+        this.$refs.addareamsg.areatype=val
+        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/components/BuildingList.vue

@@ -0,0 +1,129 @@
+<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="col-sm-4 form-group">
+              <label class="font_normal_body">小区名称</label>
+              <v-select :value.sync="model.f_residential_area_id"
+                        class="select_list select"
+                        v-model="model.f_residential_area_id"
+                        style="width: 60%"
+                        multiple
+                        condition="f_residential_area_id in {}"
+                        :options='$parent.$parent.areaslist' placeholder='选择小区'
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body">楼栋</label>
+              <input style="width:60%" type="text" class="input_search" v-model="model.f_province" condition="f_building like '%{}%'" placeholder="楼栋"/>
+            </div>
+            <div class="col-sm-4 form-group button-range">
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+            </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 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_residential_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_building}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.addresnum}}</nobr></td>
+            <td style="text-align:center"><nobr>
+              <button v-if="row.addresnum === 0" 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 {
+        model: new PagedList('rs/sql/address_getbuildinglist',20),
+        addflag: false,
+        getfield: {},
+        f_orgid: ''
+      }
+    },
+    props:{
+      areaslist: {
+        type: Array
+      },
+      f_filialeids:{
+        type: String
+      }
+    },
+    ready(){
+      readyGen(this)
+      this.search()
+    },
+    methods: {
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async delete(row){
+        if(row.id >= 0 ){
+          let useraredss = await this.$resetpost('rs/logic/address_deletebuilding', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: null})
+          this.search()
+        }
+      },
+      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 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 p.f_filialeid = '${this.f_filialeids}'`}
+      }
+    }
+  }
+</script>

package/src/components/UserAddress.vue

@@ -78,7 +78,7 @@
             <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_area1='{required: true }'>
-            <v-select :value.sync="model.slice_area" v-model="model.slice_area" :value-single="true"
+            <v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"
                       :options='sliceArea' placeholder='片区/管理站' filer-key="name"
                       close-on-select v-ref:slice>
             </v-select>
@@ -212,7 +212,7 @@
             <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="model.slice_area" v-model="model.slice_area" :value-single="true"
+            <v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"
                       :options='sliceArea' placeholder='片区/管理站' filer-key="name"
                       close-on-select v-ref:slice>
             </v-select>
@@ -466,7 +466,6 @@
         this.model.f_address_state = '已通气'
         this.initAreas(this.f_filialeids)
         // 添加特殊地址选省市区
-
         this.initpcds(` f_orgid = '${this.f_filialeids}'`)
         this.initstreets(` f_orgid = '${this.f_filialeids}' `)
         this.initareas(` f_orgid = '${this.f_filialeids}'`)
@@ -480,7 +479,6 @@
             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
           })

package/src/filiale/WEINAN/AddAreaMsg.vue

@@ -235,7 +235,7 @@
         <button type="button" class="close" @click="close"><span>&times;</span></button>
         <h4 class="modal-title">附件上传</h4>
       </header>
-      <article slot="modal-body" class="modal-body">
+      <article slot="modal-body" class="modal-body" style="height: 900px">
         <div class="form-group">
           <upload :blodid="areamodel.id" isremark="true" fusetype="areamodel.f_area_address"></upload>
         </div>