address-client 3.2.42 → 3.2.43-1

package/src/components/UserAddress.vue

@@ -134,7 +134,7 @@
             <label class="font_normal_body">经&ensp;纬&ensp;度</label>
             <input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
             <input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
-            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
+<!--            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>-->
           </div>
 
           <div v-if="usertype" class="col-sm-12 form-group "
@@ -147,7 +147,7 @@
             <label class="font_normal_body">经&ensp;纬&ensp;度</label>
             <input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
             <input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
-            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
+<!--            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>-->
           </div>
           <div class="col-sm-6 form-group " v-if="config.hasnumber"
                :class="[$v.f_standard_number.required ? 'has-error' : 'has-success']">
@@ -317,17 +317,17 @@
       </div>
     </validator>
 
-    <modal v-if="isshow" :show.sync="isshow"  large backdrop="false" :width="900">
-      <header slot="modal-header" class="modal-header">
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <amap-location :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button v-show="isshow" type="button" class="button_search button_spacing" @click='confirmLocation'>确认</button>
-        <button v-show="isshow" type="button" class="button_clear button_spacing" @click='closeModal'>取消</button>
-      </footer>
-    </modal>
+<!--    <modal v-if="isshow" :show.sync="isshow"  large backdrop="false" :width="900">-->
+<!--      <header slot="modal-header" class="modal-header">-->
+<!--      </header>-->
+<!--      <article slot="modal-body" class="modal-body">-->
+<!--        <amap-location :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>-->
+<!--      </article>-->
+<!--      <footer slot="modal-footer" class="modal-footer">-->
+<!--        <button v-show="isshow" type="button" class="button_search button_spacing" @click='confirmLocation'>确认</button>-->
+<!--        <button v-show="isshow" type="button" class="button_clear button_spacing" @click='closeModal'>取消</button>-->
+<!--      </footer>-->
+<!--    </modal>-->
 
   </div>
 </template>

package/src/filiale/WEINAN/AddAreaMsg.vue

@@ -56,6 +56,17 @@
                    class="form-control" placeholder="小区名称"
                    v-validate:f_residential_area='{required: true }'>
           </div>
+          <div class="col-sm-6 form-group"
+               :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">安检片区</label>
+            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_check_book_id"
+                   v-validate:f_street_id='{required: true }'>
+            <v-select
+              :value.sync="areamodel.f_check_book_id" :value-single="true"
+              :options='safeCheckArea' placeholder='请选择'
+              close-on-select search="true">
+            </v-select>
+          </div>
           <div v-if="!f_special"
                class="col-sm-12 form-group">
             <label class="font_normal_body">小区地址</label>
@@ -289,7 +300,7 @@
         meterbrands: [],
         adjustables: [],
         sliceArea: [],
-
+        safeCheckArea: [],
         gasproperties: [],
         meterbooks:[{label: '全部',value: ''}],
         housetypeoptions:[{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
@@ -335,6 +346,7 @@
       async initParams() {
         await this.$LoadParams.loadParam(this.f_filialeids)
         this.initBrands()
+        this.initSafeCheckArea()
        // this.initAdjustables()
       },
 
@@ -346,6 +358,19 @@
         })
         this.meterbrands = rs
       },
+      async initSafeCheckArea () {
+        this.safeCheckArea = []
+        let data = {
+          items: 'id,f_check_book_name',
+          tablename: 't_check_book',
+          orderitem: 'id',
+          condition: `f_orgid=${this.$login.f.orgid}`
+        }
+        let ret = await this.$resetpost('rs/sql/address_singleTableOrderBy',{data: data},{resolveMsg: null, rejectMsg: null})
+        ret.data.forEach(item => {
+          this.safeCheckArea.push({label: item.f_check_book_name, value: item.id})
+        })
+      },
 /*
       initAdjustables () {
         let filter = this.$login.f.orgid

package/src/filiale/WEINAN/AreaManage.vue

@@ -0,0 +1,109 @@
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':areaShow == 0}">
+    <div :class="{'basic-main':areaShow == 0,'binary-left':areaShow != 0}">
+      <area-list @child-dblclick="selected" v-ref:arealist :style="style" :f_filialeids.sync="f_filialeids"></area-list>
+    </div>
+    <div v-show="areaShow == 1" 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 v-show="areaShow == 2" style="width: 60%" class="binary-right">
+      <div class="flex">
+        <area-user-list v-if="areaid" :areaid="areaid"></area-user-list>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '小区管理',
+  components: {},
+  data () {
+    return {
+      // 分公司id串
+      width: '100%',
+      f_filialeids: this.$login.f.f_orgids,
+      areaShow: 0,
+      areatype: '小区',
+      arearow: {},
+      style: 'col-sm-2 form-group',
+      areaid: null
+    }
+  },
+  ready () {
+
+  },
+  props: {},
+  methods: {
+    selected (obj) {
+      console.log('======', obj)
+      this.style = 'col-sm-3 form-group'
+      if (obj && obj.id) {
+        console.log('对比分公司', obj.f_filialeid, this.f_filialeids)
+        if (obj.f_filialeid != this.f_filialeids) {
+          this.refresh()
+          return
+        }
+        this.areaShow = 1
+        this.$refs.addareamsg.cleardara()
+        this.$refs.addareamsg.operation = 'modify'
+        this.$refs.addareamsg.areatype = '小区'
+        this.$refs.addareamsg.areamodel = Object.assign({}, obj)
+        if (obj.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
+          }]
+        }
+        if (obj.f_meter_book != null && obj.f_meter_book != '' && obj.f_meter_book instanceof Array) {
+          this.$refs.addareamsg.areamodel.f_meter_book = parseInt(obj.f_meter_book[0])
+        }
+        if (obj.f_meter_book != null && obj.f_meter_book != '' && !(obj.f_meter_book instanceof Array)) {
+          this.$refs.addareamsg.areamodel.f_meter_book = parseInt(obj.f_meter_book)
+        }
+        if (obj.f_adjustable_id != null && obj.f_adjustable_id != '' && obj.f_adjustable_id instanceof Array) {
+          this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.f_adjustable_id[0])
+        }
+        if (obj.f_adjustable_id != null && obj.f_adjustable_id != '' && !(obj.f_adjustable_id instanceof Array)) {
+          this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.f_adjustable_id)
+        }
+        // this.$refs.addareamsg.initdata(obj)
+        // this.$refs.addareamsg.initrow(obj)
+      }
+    },
+    refresh () {
+      this.areaShow = false
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+    }
+  },
+  events: {
+    'shouAreaAllUser' (row) {
+      this.style = 'col-sm-3 form-group'
+      this.areaShow = 2
+      this.areaid = row.id
+    },
+    'add'(val) {
+      this.style = 'col-sm-3 form-group'
+      this.areaShow = 1
+      this.$refs.addareamsg.cleardara()
+      this.$refs.addareamsg.operation = 'add'
+      this.$refs.addareamsg.areatype = val
+      this.$refs.addareamsg.initdata()
+    },
+    'confirm'() {
+      this.style = 'col-sm-2 form-group'
+      this.areaShow = 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 = 0
+    }
+  }
+}
+</script>
+

package/src/filiale/WEINAN/AreaUserList.vue

@@ -0,0 +1,226 @@
+<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_userinfo_code"
+                     condition="f_userinfo_code = '{}'" placeholder="客户编号"/>
+            </div>
+            <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_user_name"
+                     condition="f_user_name like '%{}%'" placeholder="客户名称"/>
+            </div>
+            <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_building"
+                     condition="f_building = '{}'" placeholder="楼栋"/>
+            </div>
+            <div class="col-sm-4 form-group button-range">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <button class="button_search button_spacing" v-if="$parent.$parent.permission"
+                      @click="$parent.$parent.batchUpdateArea()">批量变更用户小区</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.cancel()">返回</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' style="overflow: auto" :optional="true" class="list_area table_sy"
+                 v-ref:grid>
+        <template partial='head'>
+          <th>
+            <nobr>客户编号</nobr>
+          </th>
+          <th>
+            <nobr>客户姓名</nobr>
+          </th>
+          <th>
+            <nobr>详细地址</nobr>
+          </th>
+        </template>
+        <template partial='body'>
+          <td style="text-align:center">
+            <nobr>{{ row.f_userinfo_code }}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{ row.f_user_name }}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{ row.f_address }}</nobr>
+          </td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="batchUpdateAreaShow" v-ref:batchUpdateAreaShow
+           backdrop="false" class="batchUpdateAreaShow" @modal-close="batchUpdateAreaColse">
+      <header slot="modal-header" class="modal-header" style="text-align: center">
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-horizontal select-overspread container-fluid auto">
+          <validator name='v'>
+            <div class="col-sm-12 form-group" :class="[$v.f_area_id.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body col-sm-3">小区</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="updateModel.f_area_id"
+                     v-validate:f_area_id='{required: true }'>
+              <v-select
+                :value.sync="updateModel.f_area_id" :value-single="true"
+                :options='areaslist' placeholder='请选择'
+                close-on-select search="true">
+              </v-select>
+            </div>
+          </validator>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" :disabled="!$v.valid"
+                  @click='updateArea()'>确定
+          </button>
+          <button type="button" class="btn btn-default" @click='batchUpdateAreaColse'>取消</button>
+        </div>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+
+export default {
+  data() {
+    return {
+      criteriaShow: false,
+      batchUpdateAreaShow: false,
+      batchRowList: [],
+      selectRowLen: 0,
+      updateModel: {
+        f_area_id: '',
+        f_area: ''
+      },
+      areaslist: [],
+      model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy', 20, {
+        tablename: `'t_user_address ua left join t_userinfo ui on ua.f_userinfo_id = ui.f_userinfo_id'`,
+        items: `'f_userinfo_code,f_user_name,f_address,ua.id,f_building'`,
+        orderitem: `'f_address desc'`
+      })
+    }
+  },
+  title: '地址列表',
+  props: ['areaid'],
+  ready() {
+    this.search()
+    this.initareas()
+  },
+  methods: {
+    batchUpdateAreaColse () {
+      this.batchUpdateAreaShow = false
+    },
+  //初始化小区添加小区
+    async initareas(){
+      this.areaslist = []
+      let HttpReset = new HttpResetClass()
+      let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+        data: {
+          items: '*',
+          tablename: 't_area',
+          orderitem: 'id',
+          condition: '1=1'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      let redata = []
+      req.data.forEach((row) => {
+        redata.push({
+          label: row.f_residential_area,
+          value: row.id,
+          data: row,
+          id: row.id
+        })
+      })
+      this.areaslist=redata
+    },
+    //根据名字找数据
+    findbyid(list,name){
+      var result
+      list.forEach((row, n) => {
+        if(name==row.id){
+          result= row.data
+        }
+      })
+      return result
+    },
+    batchUpdateArea() {
+      if (this.$refs.paged.$refs.grid.getRowData().length > 0) {
+        this.batchRowList = this.$refs.paged.$refs.grid.getRowData()
+        this.selectRowLen = this.batchRowList.length
+        this.batchUpdateAreaShow = true
+      } else {
+        this.$showAlert('请至少选择一项！', 'warning', 2000)
+      }
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    cancel() {
+      this.$dispatch('cancel')
+    },
+    updateArea() {
+      let msg = {
+        resolveMsg: '批量修改用户小区成功！！！',
+        rejectMsg: '批量修改用户小区失败！！！'
+      }
+      let old_area = this.findbyid(this.areaslist,this.areaid).f_residential_area
+      this.updateModel.f_area = this.findbyid(this.areaslist,this.updateModel.f_area_id).f_residential_area
+      if (this.areaid == this.updateModel.f_area_id) {
+        this.$showAlert('您选择的小区与所勾选用户小区一致，请重新选择！！！', 'warning', 3000)
+      }else {
+        this.$showMessage(`您确定要将选中的${this.selectRowLen}位用户由${old_area}小区变更到${this.updateModel.f_area}小区吗?`, ['confirm', 'cancel']).then(async (res) => {
+          if (res === 'confirm') {
+            console.log('所选中的用户信息:=======' + JSON.stringify(this.batchRowList))
+            let data = {
+              selectRow: this.batchRowList,
+              f_operator: this.$login.f.name,
+              f_operatorid: this.$login.f.id,
+              f_orgid: this.$login.f.orgid,
+              f_orgname: this.$login.f.orgs,
+              f_depid: this.$login.f.depids,
+              f_depname: this.$login.f.deps,
+              model: this.updateModel
+            }
+            this.batchUpdateAreaShow = false
+            await this.$resetpost('api/af-revenue/logic/address_batchUpdateUserArea', {data: data}, msg)
+            this.$refs.paged.$refs.grid.selectInit()
+            this.search()
+          }
+        })
+      }
+    },
+    search() {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch(args) {
+      args.condition = args.condition + `and f_residential_area_id = '${this.areaid}'`
+      this.model.search(args.condition, args.model)
+    }
+  },
+  events: {},
+  computed: {
+    permission () {
+      if (this.$login.r.find(value => value == '批量变更用户小区')) {
+        return true
+      }
+      return false
+    },
+  },
+  watch: {
+    'areaid'(val) {
+      if (val) {
+        this.search()
+      }
+    }
+  }
+}
+</script>