address-client 3.2.27 → 3.2.29

package/build/dev-server.js

@@ -10,7 +10,7 @@ var proxy = httpProxy.createProxyServer()
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var str = 'http://127.0.0.1:8090', str2= 'http://192.168.50.4:8400'
+var str = 'http://119.36.179.19:8000', str2= 'http://119.36.179.19:8000'
 var proxyTable = {
 
   '/rs/logic/getLogin': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.27",
+  "version": "3.2.29",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

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}'`}
       }
     }
 

package/src/filiale/macheng/AreaList.vue

@@ -43,6 +43,12 @@
               <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.f_special"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="manage_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>
@@ -161,6 +167,10 @@
 <script>
   import { PagedList } from 'vue-client'
 
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+    self.search()
+  }
   export default {
 
     data () {
@@ -170,6 +180,24 @@
         addflag: false,
         addtitle:'',
 
+        getfield: {},
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_district':'区/县',
+            'f_street':'街道名称',
+            'f_residential_area':'小区名称',
+            'f_area_address':'小区地址',
+            'f_comments':'小区备注',
+            'f_inputtor':'抄表员',
+            'f_house_type':'房屋类型',
+            'f_position':'安装位置',
+            'f_slice_area':'片区/管理站',
+            'f_operator':'操作人',
+            'f_operate_date':'操作日期',
+            'addressnum':'地址数'
+          }
+        },
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
@@ -192,7 +220,7 @@
       }
     },
     ready(){
-      this.search()
+      readyGen(this)
     },
     methods: {
       hidden() {
@@ -259,6 +287,17 @@
 
     },
     computed:{
+      getCondition() {
+        var condition=''
+        if(this.f_special){
+          condition =  `${this.$refs.paged.$refs.cri.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
+        }else{
+          condition =  `${this.$refs.paged.$refs.cri.condition} and s.f_filialeid = ${this.f_orgid}`
+        }
+        return {
+          condition: condition
+        }
+      },
       inputtores () {
         // 获取抄表员
         let rs = new Array()