address-client 3.2.86 → 3.2.88-1

package/src/filiale/WEINAN/AreaManage.vue

@@ -1,109 +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>
-
+<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

@@ -1,98 +1,98 @@
-<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 button-range">
-              <button class="button_search button_spacing" @click="search()" >查询</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" 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>
-  </div>
-</template>
-
-<script>
-import {PagedList} from 'vue-client'
-
-export default {
-  data () {
-    return {
-      criteriaShow: false,
-      model: new PagedList('rs/sql/singleTable_OrderBy', 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'`,
-        orderitem: `'f_address desc'`
-      })
-    }
-  },
-  title: '地址列表',
-  props: ['areaid'],
-  ready () {
-    this.search()
-  },
-  methods: {
-    hidden () {
-      this.criteriaShow = !this.criteriaShow
-    },
-    cancel () {
-      this.areaid = null
-      this.$dispatch('cancel')
-    },
-    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: {},
-  watch: {
-    'areaid' (val) {
-      if (val) {
-        this.search()
-      }
-    }
-  }
-}
-</script>
+<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 button-range">
+              <button class="button_search button_spacing" @click="search()" >查询</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" 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>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      criteriaShow: false,
+      model: new PagedList('rs/sql/singleTable_OrderBy', 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'`,
+        orderitem: `'f_address desc'`
+      })
+    }
+  },
+  title: '地址列表',
+  props: ['areaid'],
+  ready () {
+    this.search()
+  },
+  methods: {
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    cancel () {
+      this.areaid = null
+      this.$dispatch('cancel')
+    },
+    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: {},
+  watch: {
+    'areaid' (val) {
+      if (val) {
+        this.search()
+      }
+    }
+  }
+}
+</script>

package/src/filiale/WEINAN/sale.js

@@ -1,18 +1,18 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-let specialComp = {
-  //地址管理父组件
-  'address-manage':(resolve) => { require(['./AddressManage'], resolve) },
-  'user-address': (resolve) =>{ require(['./UserAddress'], resolve) },
-  'add-area-msg': (resolve) =>{ require(['./AddAreaMsg'], resolve) },
-  'address-list': (resolve) =>{ require(['./AddressList'], resolve) },
-'area-list': (resolve) =>{ require(['./AreaList'], resolve) },
-  'area-user-list': (resolve) =>{ require(['./AreaUserList.vue'], resolve) },
-  'area-manage': (resolve) =>{ require(['./AreaManage'], resolve) }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+let specialComp = {
+  //地址管理父组件
+  'address-manage':(resolve) => { require(['./AddressManage'], resolve) },
+  'user-address': (resolve) =>{ require(['./UserAddress'], resolve) },
+  'add-area-msg': (resolve) =>{ require(['./AddAreaMsg'], resolve) },
+  'address-list': (resolve) =>{ require(['./AddressList'], resolve) },
+'area-list': (resolve) =>{ require(['./AreaList'], resolve) },
+  'area-user-list': (resolve) =>{ require(['./AreaUserList.vue'], resolve) },
+  'area-manage': (resolve) =>{ require(['./AreaManage'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/qianneng/UserAddress.vue

@@ -602,7 +602,7 @@
         let HttpReset = new HttpResetClass()
         let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
           data: {
-            items: '*',
+            items: 'id,f_street',
             tablename: 't_street',
             orderitem: 'id',
             condition: pconditon
@@ -628,7 +628,7 @@
         let HttpReset = new HttpResetClass()
         let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
           data: {
-            items: '*',
+            items: 'f_street,f_residential_area,f_pcd_id,f_street_id,id,f_slice_area',
             tablename: 't_area',
             orderitem: 'id',
             condition: pconditon
@@ -637,7 +637,7 @@
         let redata = []
         if (req.data.length === 0){
           redata.push({
-            label: '['+row.f_street+']'+'无',
+            label: '无',
             value: '',
             data: '',
             id: ''

package/src/filiale/rizhao/UserAddress.vue

@@ -622,7 +622,7 @@
           this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
           this.model.slice_area = selectArea.f_slice_area
           // 拼接地址
-          this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
+          this.model.f_address = `${selectArea.f_residential_area}`
         }
         this.$nextTick(() => {
           this.$resetValidation()
@@ -638,7 +638,7 @@
               street=item.label
             }
           })
-          this.model.f_address = street
+          // this.model.f_address = street
         }
         if(val){
           //那就把[小区]重新组织一下
@@ -774,7 +774,7 @@
           this.model.f_pcd=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
           this.model.f_street=this.findbyid(this.streetslist,this.model.f_street_id).f_street
           this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
-          this.model.f_address = this.model.f_street + this.model.f_residential_area +  (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
+          this.model.f_address = this.model.f_residential_area +  (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
         }
         await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
       },