address-client 3.0.25 → 3.0.27-aode

package/src/components/AreaList.vue

@@ -38,6 +38,16 @@
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
                       condition="f_street like '%{}%'" placeholder="街道"/>
             </div>
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">
+              <label class="font_normal_body">户数大于</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.areacount"
+                      condition="isnull(resi.areacount,0) >= '{}'" 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.areacount_end"
+                      condition="isnull(resi.areacount,0) <='{}'" 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>
@@ -97,6 +107,8 @@
             <th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
             <!--非民用单位信息结束-->
             <th><nobr>片区/管理站 </nobr></th>
+            <th><nobr>使用人数 </nobr></th>
+            <th><nobr>关联地址 </nobr></th>
             <th><nobr>操作人</nobr></th>
             <th><nobr>操作日期</nobr></th>
             <th><nobr>操作</nobr></th>
@@ -118,12 +130,14 @@
             <td  v-if="$parent.$parent.$parent.f_special"  style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
             <!--非民用单位信息结束-->
             <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
+            <td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.id,row.f_residential_area)" class="btn btn-link">{{row.areacount}}</button></td>
+            <td style="text-align:center"><nobr>{{row.addresscount}}</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><nobr>
               <!--<button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
-              <button type="button" name="button" class="btn btn-link"
+              <button type="button" name="button" class="btn btn-link" v-if="row.areacount===0"
                       @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
             </nobr></td>
           </tr>
@@ -168,6 +182,12 @@
       this.search()
     },
     methods: {
+      operate (f_residential_area_id,f_residential_area) {
+        this.$parent.areaShow = false;
+        this.$parent.usershow=true
+        this.$parent.f_residential_area_id=f_residential_area_id
+        this.$parent.f_residential_area=f_residential_area
+      },
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
@@ -207,7 +227,8 @@
         this.$dispatch('modify',val)
       },
       selfSearch (args) {
-
+        this.$parent.usershow = false;
+        this.$parent.areaShow = false;
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }

package/src/components/AreaManage.vue

@@ -1,8 +1,13 @@
 <template>
   <div id="unit" class="flex-row" :class="{'binary':areaShow}">
-    <div :class="{'basic-main':!areaShow,'binary-left':areaShow}">
+    <div :class="{'basic-main':!areaShow && !usershow,'binary-left':areaShow|| usershow}">
       <area-list @select-changed="selected" v-ref:arealist   :style="style" :f_filialeids.sync="f_filialeids"></area-list>
     </div>
+    <div class="binary-right" v-if="usershow" style="width: 60%">
+      <div class="flex">
+        <area-user :f_residential_area_id="f_residential_area_id" :f_filialeid="f_filialeids" :f_residential_area="f_residential_area"></area-user>
+      </div>
+    </div>
     <div v-show="areaShow" style="width: 60%" class="binary-right">
       <div class="flex">
         <add-area-msg v-ref:addareamsg :areatype="areatype" :operation="operation"
@@ -21,10 +26,14 @@
       return {
         //分公司id串
         width:'100%',
-        f_filialeids: this.$login.f.f_orgids,
+        f_filialeids: this.$login.f.orgid,
         areaShow:false,
         areatype:'小区',
+        f_filialeid:this.$login.f.orgid,
         arearow:{},
+        usershow:false,
+        f_residential_area_id:'',
+        f_residential_area:'',
         style:'col-sm-2 form-group'
       }
     },
@@ -37,6 +46,7 @@
     methods:{
       selected(obj){
         this.style='col-sm-3 form-group'
+        this.usershow =false
         if(obj.val&&obj.val.id){
           console.log('对比分公司', obj.val.f_filialeid, this.f_filialeids)
           if (obj.val.f_filialeid != this.f_filialeids) {
@@ -58,6 +68,7 @@
         }
       },
       refresh() {
+        this.usershow =false
         this.areaShow = false
         this.$refs.arealist.$refs.paged.$refs.cri.search()
       }
@@ -66,6 +77,7 @@
       'add'(){
         this.style='col-sm-3 form-group'
         this.areaShow=true
+        this.usershow =false
         this.$refs.addareamsg.cleardara()
         this.$refs.addareamsg.operation='add'
         this.$refs.addareamsg.areatype='小区'
@@ -74,12 +86,14 @@
       'confirm' () {
         this.style='col-sm-2 form-group'
         this.areaShow = false
+        this.usershow =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
+        this.usershow =false
       }
     }
   }