address-client 3.0.33-aode → 3.0.34-aodeToV4

package/src/components/AreaFiles.vue

@@ -1,73 +1,73 @@
-<template>
-  <div style="width: auto;">
-    <criteria-paged :model="model" v-ref:paged :pager="false">
-      <criteria partial='criteria' @condition-changed='$parent.selfsearch' v-ref:criteria >
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="col-sm-9  ">
-            <input type="text" class="input_search button_spacing" v-model="model.f_residential_area"
-                   condition="f_residential_area like '%{}%'" placeholder='小区名称'>
-          </div>
-          <div class="span" style="float:right;"id='filesArea'>
-            <button class="button_search button_spacing" @click="search()">查询</button>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" >
-        <template partial='head'>
-          <tr>
-            <th>序号</th>
-            <th>小区详细地址</th>
-            <th>操作</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td id = "1" style="text-align: center;">{{$index + 1}}</td>
-          <td>{{row.f_area_address}}-{{row.f_residential_area}}-{{row.f_comments}}</td>
-          <td style="text-align: center;">
-            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.foundFile(row)">建档</button>
-          </td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  export default {
-    title: '小区列表',
-    data () {
-      return {
-        model: new PagedList('rs/sql/address_getArea', 20)
-      }
-    },
-    props: ['f_filialeid'],
-    // ready () {
-    //   this.search()
-    // },
-    watch: {
-      'f_filialeid' (val) {
-        this.search()
-      }
-    },
-    methods: {
-      foundFile (row) {
-        console.log('小区建档', row)
-        this.$emit('re-ref', row)
-      },
-      search () {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfsearch (datas) {
-        console.log('查询小区', this.f_filialeid)
-        datas.condition += ` and a.f_filialeid = '${this.f_filialeid}'`
-        this.$refs.paged.$refs.grid.$el.scrollTop = 0
-        this.model.search(datas.condition, this.model)
-      },
-      // 主要提供外部组件调用，刷新数据
-      reflash () {
-        this.$refs.paged.$refs.criteria.search()
-      }
-    }
-  }
-</script>
+<template>
+  <div style="width: auto;">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.selfsearch' v-ref:criteria >
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="col-sm-9  ">
+            <input type="text" class="input_search button_spacing" v-model="model.f_residential_area"
+                   condition="f_residential_area like '%{}%'" placeholder='小区名称'>
+          </div>
+          <div class="span" style="float:right;"id='filesArea'>
+            <button class="button_search button_spacing" @click="search()">查询</button>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" >
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>小区详细地址</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td id = "1" style="text-align: center;">{{$index + 1}}</td>
+          <td>{{row.f_area_address}}-{{row.f_residential_area}}-{{row.f_comments}}</td>
+          <td style="text-align: center;">
+            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.foundFile(row)">建档</button>
+          </td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  export default {
+    title: '小区列表',
+    data () {
+      return {
+        model: new PagedList('api/af-revenue/sql/address_getArea', 20)
+      }
+    },
+    props: ['f_filialeid'],
+    // ready () {
+    //   this.search()
+    // },
+    watch: {
+      'f_filialeid' (val) {
+        this.search()
+      }
+    },
+    methods: {
+      foundFile (row) {
+        console.log('小区建档', row)
+        this.$emit('re-ref', row)
+      },
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfsearch (datas) {
+        console.log('查询小区', this.f_filialeid)
+        datas.condition += ` and a.f_filialeid = '${this.f_filialeid}'`
+        this.$refs.paged.$refs.grid.$el.scrollTop = 0
+        this.model.search(datas.condition, this.model)
+      },
+      // 主要提供外部组件调用，刷新数据
+      reflash () {
+        this.$refs.paged.$refs.criteria.search()
+      }
+    }
+  }
+</script>

package/src/components/AreaList.vue

@@ -54,6 +54,10 @@
               <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.checkitem.length>=1" class="button_clear button_spacing" @click="$parent.$parent.deleteall()">批量删除</button>
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.getfield"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="api/af-revenue/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>
@@ -116,6 +120,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><nobr>操作日期</nobr></th>
@@ -149,6 +155,8 @@
             <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.open_date}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.yeardiff}}</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>
@@ -175,10 +183,10 @@
         checkall:false,
         checkitem:[],
         criteriaShow: false,
-        model: new PagedList('rs/sql/address_getarealist',50),
+        model: new PagedList('api/af-revenue/sql/address_getarealist',50),
         addflag: false,
         addtitle:'',
-
+        condition:'',
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: ''
@@ -186,6 +194,20 @@
     },
     title: '小区管理',
     computed:{
+      getCondition() {
+        return {condition: this.condition}
+      },
+      getfield() {
+        let filed =[]
+        if(this.f_special){
+         filed = {'f_district': '区/县', 'f_street': '街道名称','f_residential_area':'小区名称','f_area_address': '详细地址','f_comments': '小区备注', 'f_slice_area': '片区/管理站','areacount':'使用人数',
+           'open_date': '首次通气时间','yeardiff': '通气年限','f_operator': '操作人','f_operate_date': '操作日期'}
+        }else {
+          filed = {'f_district': '区/县', 'f_street': '街道名称','f_residential_area':'单位名称','f_area_address': '单位地址','f_comments': '小区备注','f_linkname':'联系人', 'f_linkphone':'联系电话','f_slice_area': '片区/管理站','areacount':'使用人数',
+            'open_date': '首次通气时间','yeardiff': '通气年限','f_operator': '操作人','f_operate_date': '操作日期'}
+        }
+        return filed
+      },
       ischeckall(){
         let arr =[]
         for(let i=0;i<this.model.rows.length;i++){
@@ -261,7 +283,7 @@
       async delete(row){
         if(row.id){
           var id = row.id
-          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
+          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
             {data: {
               items: 'f_residential_area_id',
                 tablename: 't_user_address',
@@ -271,17 +293,24 @@
           if(useraredss.data.length>0){
             this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
           }else{
-            this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('api/af-revenue/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
               this.$dispatch('cancel')
             })
           }
         }
       },
       deleteall(){
-        this.$resetpost('rs/logic/deleteAreaAll',{data:{arr:this.checkitem}}).then((res)=>{
-          this.search()
+        let msg =`共计删除${this.checkitem.length}个小区，请确认删除操作`
+        this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            //发出事件,用于建档或修正档案
+            this.$resetpost('api/af-revenue/logic/deleteAreaAll',{data:{arr:this.checkitem}}).then((res)=>{
+              this.search()
+            })
+          }
         })
 
+
       },
       add(val){
         if (this.f_filialeids) {
@@ -308,6 +337,7 @@
         }else{
           args.condition =  `${args.condition} and s.f_filialeid = ${this.f_orgid}`
         }
+        this.condition = args.condition
         this.model.search(args.condition, args.model)
       },
       //清空

package/src/components/AreaManage.vue

@@ -1,101 +1,101 @@
-<template>
-  <div id="unit" class="flex-row" :class="{'binary':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"
-                      :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.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'
-      }
-    },
-    ready(){
-
-    },
-    props:{
-
-    },
-    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.$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
-            }]
-          }
-          this.$refs.addareamsg.initdata(obj.val)
-        }
-      },
-      refresh() {
-        this.usershow =false
-        this.areaShow = false
-        this.$refs.arealist.$refs.paged.$refs.cri.search()
-      }
-    },
-    events:{
-      '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='小区'
-        this.$refs.addareamsg.initdata()
-      },
-      '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
-      }
-    }
-  }
-</script>
-
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':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"
+                      :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.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'
+      }
+    },
+    ready(){
+
+    },
+    props:{
+
+    },
+    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.$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
+            }]
+          }
+          this.$refs.addareamsg.initdata(obj.val)
+        }
+      },
+      refresh() {
+        this.usershow =false
+        this.areaShow = false
+        this.$refs.arealist.$refs.paged.$refs.cri.search()
+      }
+    },
+    events:{
+      '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='小区'
+        this.$refs.addareamsg.initdata()
+      },
+      '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
+      }
+    }
+  }
+</script>
+