address-client 3.0.24-78 → 3.0.24-aode

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,13 +46,14 @@
     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) {
             this.refresh()
             return
           }
-          this.areaShow = true
+          this.areaShow=true
           this.$refs.addareamsg.cleardara()
           this.$refs.addareamsg.operation='modify'
           this.$refs.addareamsg.areatype='小区'
@@ -54,23 +64,11 @@
               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)
+          this.$refs.addareamsg.initdata(obj.val)
         }
       },
       refresh() {
+        this.usershow =false
         this.areaShow = false
         this.$refs.arealist.$refs.paged.$refs.cri.search()
       }
@@ -79,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='小区'
@@ -87,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
       }
     }
   }

package/src/components/CityManage.vue

@@ -11,7 +11,7 @@
 
 <script>
   export default {
-    title: '街道管理',
+    title: '城市管理',
     components:{
     },
     data () {

package/src/components/NewAddressInfo.vue

@@ -11,7 +11,7 @@
                 <div class="col-sm-3 average" :class="[$v.type.required ? 'select-error' : '']">
                   <input type="text" v-show="false" v-model="$refs.type.selectedItems" v-validate:type='{required: true }'>
                   <v-select :value.sync="model.f_user_type" v-model="model.f_user_type" :value-single="true"
-                            :options='usertypes' placeholder='客户类型' close-on-select v-ref:type></v-select>
+                            :options='usertypes' placeholder='用户类型' close-on-select v-ref:type></v-select>
                 </div>
                 <div class="col-sm-3 average" :class="[$v.nature.required ? 'select-error' : '']">
                   <input type="text" v-show="false" v-model="$refs.nature.selectedItems" v-validate:nature='{required: true }'>

package/src/components/StreetList.vue

@@ -12,21 +12,27 @@
               </res-select>
             </div>
             <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">街道名称</label>
+              <label class="font_normal_body">街&emsp;&emsp;道</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道名称"/>
+                      condition="f_street like '%{}%'" placeholder="街道"/>
+            </div>
+            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">省&emsp;&emsp;份</label>
+              <input  type="text"    style="width:60%" class="input_search" v-model="model.f_province"
+                      condition="f_province like '%{}%'" placeholder="省份"
+                      :size="model.f_province ? model.f_province.length*2 : 6"/>
+            </div>
+            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <input  type="text" style="width:60%" class="input_search" v-model="model.f_city"
+                      condition="f_city like '%{}%'" placeholder="城市"
+                      :size="model.f_city ? model.f_city.length*2 : 6"/>
             </div>
             <div  class="col-sm-4 form-group button-range">
               <button class="button_search button_spacing" @click="search()" >查询</button>
-              <button class="button_new button_spacing" style="width: max-content;"  @click="$parent.$parent.add('省市区')">省市区管理</button>
+              <button class="button_new button_spacing" style="width: max-content;"  @click="$parent.$parent.add('省市区')">添加省市区</button>
               <button class="button_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_getstreetlist"
-                            template-name='街道信息查询导出'
-                            :choose-col="true"></export-excel>
               <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
             </div>
           </div>
@@ -43,18 +49,6 @@
                       condition="f_city like '%{}%'" placeholder="城市"
                       :size="model.f_city ? model.f_city.length*2 : 6"/>
             </div>
-            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">省&emsp;&emsp;份</label>
-              <input  type="text"    style="width:60%" class="input_search" v-model="model.f_province"
-                condition="f_province like '%{}%'" placeholder="省份"
-                :size="model.f_province ? model.f_province.length*2 : 6"/>
-            </div>
-            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">城&emsp;&emsp;市</label>
-              <input  type="text" style="width:60%" class="input_search" v-model="model.f_city"
-                condition="f_city like '%{}%'" placeholder="城市"
-                :size="model.f_city ? model.f_city.length*2 : 6"/>
-            </div>
             <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
               <label class="font_normal_body">区&emsp;&emsp;县</label>
               <input  type="text" style="width:60%" class="input_search"  v-model="model.f_district"
@@ -72,10 +66,8 @@
             <th><nobr>城市</nobr></th>
             <th><nobr>区/县</nobr></th>
             <th><nobr>街道名称</nobr></th>
-            <th><nobr>街道编号</nobr></th>
             <th><nobr>详细地址</nobr></th>
             <th><nobr>分公司</nobr></th>
-            <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>
             <th><nobr>操作</nobr></th>
           </tr>
         </template>
@@ -86,15 +78,12 @@
             <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_street_number}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_pcd}}-{{row.f_street}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
             <td style="text-align:center"><nobr>
             <!--  <button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
-              <button v-if="!row.streetid" type="button" name="button" class="btn btn-danger"
-                      style="padding: 5px 12px"
+              <button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
             </nobr></td>
           </tr>
@@ -107,31 +96,19 @@
 
 <script>
   import { PagedList } from 'vue-client'
-  let readyGen = async function (self) {
-    self.getfield = self.config.excelHeaders
-  }
+
   export default {
     data () {
       return {
         criteriaShow: false,
         model: new PagedList('rs/sql/address_getstreetlist',20),
         addflag: false,
-        getfield: {},
         addtitle:'',
+
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
-        config: {
-          // 导出列要和查询列相同
-          excelHeaders: {
-            'f_province':'省份',
-            'f_city':'城市',
-            'f_district':'区/县',
-            'f_street':'街道名称',
-            'f_org_name':'分公司',
-            'streenum':'小区数量'
-          }
-        }
+
       }
     },
     title: '街道管理',
@@ -141,7 +118,6 @@
       }
     },
     ready(){
-      readyGen(this)
       this.search()
     },
     methods: {
@@ -151,8 +127,9 @@
       search () {
         this.$refs.paged.$refs.cri.search()
       },
+
       async delete(row){
-        if(row.id >= 0 ){
+        if(row.id){
           var id = row.id
           let useraredss = await this.$resetpost('rs/sql/address_singleTable',
             {data: {
@@ -177,6 +154,7 @@
         } else {
           this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
         }
+
       },
       modify(val){
         this.$refs.paged.$refs.grid.selectStore.selected = null
@@ -198,11 +176,9 @@
         this.f_filialeids = val[0]
       }
     },
-    computed: {
-      getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`}
-      }
+    watch:{
+
     }
+
   }
 </script>