address-client 3.2.28 → 3.2.29

package/src/components/CityManage.vue

@@ -1,76 +1,76 @@
-<template>
-  <div id="unit" class="flex-row " :class="{'binary':areaShow}">
-    <div :class="{'basic-main':!areaShow,'binary-left':areaShow}">
-      <street-list @select-changed="selected" :f_filialeids.sync="f_filialeids" v-ref:arealist></street-list>
-    </div>
-    <div v-show="areaShow" class="binary-right">
-       <add-street-pcd v-ref:addstreetpcd :areatype.sync="areatype" :operation='operation' :f_filialeids.sync="f_filialeids" :row="row"></add-street-pcd>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '街道管理',
-    components:{
-    },
-    data () {
-      return {
-        //分公司id串
-        f_filialeids: this.$login.f.orgid,
-        areaShow:false,
-        areatype:'街道'
-
-      }
-    },
-    props:{
-
-    },
-    methods:{
-      selected(obj){
-        if(obj.val&&obj.val.id){
-          if (obj.val.f_filialeid != this.f_filialeids) {
-            this.refresh()
-            return
-          }
-          this.$refs.addstreetpcd.cleardara()
-          this.areatype = '街道'
-          this.areaShow=true
-          this.$refs.addstreetpcd.operation='modify'
-          this.$refs.addstreetpcd.streetmodel=Object.assign({},obj.val)
-          this.$refs.addstreetpcd.initdata()
-        }
-      },
-      async refresh () {
-    this.areaShow = false
-    await this.$refs.arealist.$refs.paged.$refs.cri.search()
-  }
-  },
-  events:{
-    'add'(areatype){
-      this.style='col-sm-3 '
-      this.areaShow=true
-      this.$refs.addstreetpcd.cleardara()
-      this.$refs.addstreetpcd.operation='add'
-      this.$refs.addstreetpcd.areatype=areatype
-      this.$refs.addstreetpcd.initdata()
-    },
-    'modify'(area){
-      this.style='col-sm-2 '
-    },
-    'confirm' () {
-      this.style='col-sm-2 '
-
-      this.refresh()
-    },
-    'cancel' () {
-      this.style='col-sm-2 '
-
-      this.areaShow = false
-      this.$refs.arealist.$refs.paged.$refs.cri.search()
-    },
-  }
-  }
-</script>
-
-
+<template>
+  <div id="unit" class="flex-row " :class="{'binary':areaShow}">
+    <div :class="{'basic-main':!areaShow,'binary-left':areaShow}">
+      <street-list @select-changed="selected" :f_filialeids.sync="f_filialeids" v-ref:arealist></street-list>
+    </div>
+    <div v-show="areaShow" class="binary-right">
+       <add-street-pcd v-ref:addstreetpcd :areatype.sync="areatype" :operation='operation' :f_filialeids.sync="f_filialeids" :row="row"></add-street-pcd>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '街道管理',
+    components:{
+    },
+    data () {
+      return {
+        //分公司id串
+        f_filialeids: this.$login.f.orgid,
+        areaShow:false,
+        areatype:'街道'
+
+      }
+    },
+    props:{
+
+    },
+    methods:{
+      selected(obj){
+        if(obj.val&&obj.val.id){
+          if (obj.val.f_filialeid != this.f_filialeids) {
+            this.refresh()
+            return
+          }
+          this.$refs.addstreetpcd.cleardara()
+          this.areatype = '街道'
+          this.areaShow=true
+          this.$refs.addstreetpcd.operation='modify'
+          this.$refs.addstreetpcd.streetmodel=Object.assign({},obj.val)
+          this.$refs.addstreetpcd.initdata()
+        }
+      },
+      async refresh () {
+    this.areaShow = false
+    await this.$refs.arealist.$refs.paged.$refs.cri.search()
+  }
+  },
+  events:{
+    'add'(areatype){
+      this.style='col-sm-3 '
+      this.areaShow=true
+      this.$refs.addstreetpcd.cleardara()
+      this.$refs.addstreetpcd.operation='add'
+      this.$refs.addstreetpcd.areatype=areatype
+      this.$refs.addstreetpcd.initdata()
+    },
+    'modify'(area){
+      this.style='col-sm-2 '
+    },
+    'confirm' () {
+      this.style='col-sm-2 '
+
+      this.refresh()
+    },
+    'cancel' () {
+      this.style='col-sm-2 '
+
+      this.areaShow = false
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+    },
+  }
+  }
+</script>
+
+

package/src/filiale/macheng/AddressList.vue

@@ -41,6 +41,12 @@
               <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>
               <button class="button_export button_spacing"  @click="$parent.$parent.importAddress">导入地址</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/exportfile"
+                            sql-name="addressGetAddress"
+                            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>
@@ -175,6 +181,9 @@
 <script>
   import { PagedList } from 'vue-client'
 
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+  }
   export default {
     data () {
       return {
@@ -183,6 +192,29 @@
         addflag: false,
         addtitle:'',
 
+        other: [],
+        footer: [],
+        getfield: {},
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_user_name':'用户姓名',
+            'f_userinfo_code':'用户编号',
+            'id':'地址ID',
+            'f_pcd':'区/县',
+            'f_slice_area':'片区',
+            'f_street':'街道',
+            'f_residential_area':'小区',
+            'f_building':'楼号',
+            'f_unit':'单元',
+            'f_floor':'楼层',
+            'f_room':'门牌号',
+            'f_address':'详细地址',
+            'f_address_state':'地址状态',
+            'f_create_date':'时间',
+            'f_state':'状态'
+          },
+        },
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
@@ -203,9 +235,29 @@
       }
     },
     ready(){
+      readyGen(this)
       this.search()
+      this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
+      this.initareas(`f_filialeid = '${this.f_filialeids}'`)
     },
     methods: {
+      getotherfooter() {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other = [];
+        this.footer = [];
+        // let exportdata = this.getCondition;
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData = [], exportfield = this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
@@ -299,6 +351,10 @@
       //地址状态下拉框
       getaddresstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
+      },
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + `and a.f_filialeid = '${this.f_filialeids}'`}
       }
     }