address-client 3.2.111 → 3.2.112-qianneng

package/package.json

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

package/src/components/AddressManage.vue

@@ -91,7 +91,7 @@
         this.$refs.useraddressmsg.pcdslist=[]
         this.$refs.useraddressmsg.streetslist=[]
         this.$refs.useraddressmsg.areaslist=[]
-        this.$refs.useraddressmsg.initdata()
+        // this.$refs.useraddressmsg.initdata()
       },
       'confirm' () {
         this.style='col-sm-2 form-group'

package/src/components/BuildingList.vue

@@ -79,7 +79,7 @@
     },
     ready(){
       readyGen(this)
-      this.search()
+      // this.search()
     },
     methods: {
       search () {

package/src/filiale/qianneng/AreaManage.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+
+          <div class="row">
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body">小区名称</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_area_id"
+                      condition="f_residential_area_id like '%{}%'" placeholder="小区名称" v-show="false"
+                      @keyup.enter.stop="search()"
+                      :size="model.f_residential_area ? model.f_residential_area.length*2 : 8"/>
+              <v-select :value.sync="model.f_residential_area_id" :value-single="true"
+                        :options='$parent.$parent.areaslist' placeholder='请选择'
+                        close-on-select search="true">
+              </v-select>
+            </div>
+            <div class="col-sm-4 form-group button-range" >
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' style="overflow: auto" class="list_area table_sy"  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <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>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <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_residential_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_building}}</nobr></td>
+            <td v-show = 'false' style="text-align:center"><nobr>{{row.id}}</nobr></td>
+            <td v-show = 'false' style="text-align:center"><nobr>{{row.f_building_id}}</nobr></td>
+            <td style="text-align:center">
+              <button type="button" name="button" class="button_export"
+                      @click.stop="$parent.$parent.$parent.confirmaddress(row)">确认选择</button>
+            </td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="showFile" v-ref:modal backdrop="true">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+      <h4 class="modal-title">选择文件</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer"></footer>
+  </modal>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      areaslist:[],
+      criteriaShow: false,
+      model: new PagedList('rs/sql/address_singleTableOrderBy', 20, {}),
+      addflag: false,
+      addtitle: '',
+
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
+
+      // 文件上传弹框
+      showFile: false
+    }
+  },
+  title: '地址列表',
+  props: {
+    f_filialeids: {
+      type: String
+    },
+    company: {
+      type: String,
+      default: ''
+    }
+  },
+  ready () {
+    this.search()
+    this.initareas(` f_orgid = '${this.f_filialeids}'`)
+  },
+  methods: {
+    //初始化小区添加小区
+    async initareas(pconditon){
+      // if(this.usertype){
+      //   pconditon=pconditon+` and  f_special='1' `
+      // }
+      this.areaslist = []
+      let HttpReset = new HttpResetClass()
+      let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+        data: {
+          items: 'f_street,f_residential_area,f_pcd_id,f_street_id,id,f_slice_area',
+          tablename: 't_area',
+          orderitem: 'id',
+          condition: pconditon
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+      let redata = []
+      if (req.data.length === 0){
+        redata.push({
+          label: '无',
+          value: '',
+          data: '',
+          id: ''
+        })
+      }
+      console.log("=================")
+      console.log(req.data)
+      req.data.forEach((row) => {
+        redata.push({
+          label: '['+row.f_street+']'+row.f_residential_area,
+          value: row.id,
+          data: row,
+          id: row.id
+        })
+      })
+      this.areaslist=redata
+      console.log("=========111111========")
+      console.log(this.areaslist)
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    // 添加方法
+    add (val) {
+      if (this.f_filialeids) {
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add', val)
+      } else {
+        this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+      }
+    },
+    // 修改
+    modify (val) {
+      this.$refs.paged.$refs.grid.selectStore.selected = null
+      this.$dispatch('modify', val)
+    },
+    confirmaddress (row) {
+      // this.$refs.paged.$refs.cri.search()
+      this.$dispatch('confirmaddress', row)
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      this.$refs.paged.model.params.items = 'f_street,f_residential_area,f_pcd_id,f_street_id,f_slice_area,f_district,f_iscity,a.id,f_building,f_building_id'
+      this.$refs.paged.model.params.tablename = 't_area a left join (select id,f_district from t_pcd)p on p.id = a.f_pcd_id left join (select id,f_iscity from t_street)s on s.id = a.f_street_id left join (select f_residential_area_id,f_building,id f_building_id from t_building)b on b.f_residential_area_id = a.id'
+      this.$refs.paged.model.params.orderitem = 'id'
+      args.condition = `${args.condition} and f_orgid = '${this.f_filialeids}'`
+      this.model.search(args.condition, args.model)
+    },
+
+    // 清空
+    clear () {
+      this.$refs.paged.$refs.cri.model = {}
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+    }
+  },
+  watch: {
+    'company' (val) {
+      this.f_orgid = val
+      this.f_filialeids = val
+    }
+  }
+
+}
+</script>