address-client 1.3.55 → 1.3.57-2

package/src/components/AreaList.vue

@@ -1,180 +1,189 @@
-<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-inline auto" partial>
-          <div class="form-group form-input-group">
-            <right-tree
-              :userid.sync='$parent.$parent.userid'
-              :source.sync='$parent.$parent.source'
-              @re-res="$parent.$parent.getRes"></right-tree>
-          </div>
-          <div class="form-group form-input-group">
-            <input  type="text" class="form-control" v-model="model.f_province"
-                    condition="f_province like '%{}%'" placeholder="省份"
-                    :size="model.f_province ? model.f_province.length*2 : 2"/>
-          </div>
-          <div class="form-group form-input-group">
-            <input  type="text" class="form-control" v-model="model.f_city"
-                    condition="f_city like '%{}%'" placeholder="城市"
-                    :size="model.f_city ? model.f_city.length*2 : 2"/>
-          </div>
-          <div class="form-group form-input-group">
-            <input  type="text" class="form-control" v-model="model.f_district"
-                    condition="f_district like '%{}%'" placeholder="区县"
-                    :size="model.f_district ? model.f_district.length*2 : 2"/>
-          </div>
-          <div class="form-group form-input-group">
-            <input  type="text" class="form-control" v-model="model.f_street"
-                    condition="f_street like '%{}%'" placeholder="街道"
-                    :size="model.f_street ? model.f_street.length*2 : 2"/>
-          </div>
-          <div class="form-group form-input-group">
-            <input  type="text" class="form-control" v-model="model.f_residential_area"
-                    condition="f_residential_area like '%{}%'" placeholder="小区"
-                    :size="model.f_residential_area ? model.f_residential_area.length*2 : 2"/>
-          </div>
-          <div class="form-group form-input-group">
-            <button class="btn btn-success width-80" @click="search()" >查询</button>
-            <button v-if="!$parent.$parent.f_special" class="btn btn-success width-80" @click="$parent.$parent.add('小区')">添加小区</button>
-            <button v-if="$parent.$parent.f_special"class="btn btn-success width-80" @click="$parent.$parent.add('单位')">添加单位</button>
-            <button class="btn btn-success width-80" @click="$parent.$parent.clear()">清空</button>
-          </div>
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th><nobr>id</nobr></th>
-            <th><nobr>省份</nobr></th>
-            <th><nobr>城市</nobr></th>
-            <th><nobr>区/县</nobr></th>
-            <th><nobr>街道名称</nobr></th>
-            <!--民用小区信息开始-->
-            <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
-            <th v-if="!$parent.$parent.$parent.f_special"><nobr>详细地址</nobr></th>
-            <!--民用小区信息结束-->
-            <!--非民用单位信息开始-->
-            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位名称</nobr></th>
-            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位地址</nobr></th>
-            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系人</nobr></th>
-            <th v-if="$parent.$parent.$parent.f_special"><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.id}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
-            <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_area_address}}{{row.f_residential_area}}</nobr></td>
-            <!--非民用单位信息开始-->
-            <td  v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkname}}</nobr></td>
-            <td  v-if="$parent.$parent.$parent.f_special"  style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
-            <!--非民用单位信息结束-->
-            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_outlets}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
-            <td><nobr>
-              <!--<button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
-              <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
-            </nobr></td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-
-  export default {
-    data () {
-      return {
-        model: new PagedList('rs/sql/address_getarealist',20),
-        userid: this.$login.f.id,
-        source:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        addflag: false,
-        addtitle:''
-      }
-    },
-    title: '小区管理',
-    props:{
-      f_filialeids:{
-        type: String
-      },
-      f_special:{
-        type: String
-      }
-    },
-    ready(){
-      this.search()
-    },
-    methods: {
-      search() {
-        this.$refs.paged.$refs.cri.search()
-      },
-      async delete(row){
-        if(row.id){
-          var id = row.id
-          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
-            {data: {
-              items: 'f_residential_area_id',
-                tablename: 't_user_address',
-                condition: `f_residential_area_id='${id}'`}
-                },
-            {resolveMsg: null, rejectMsg: null})
-          if(useraredss.data.length>0){
-            this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
-          }else{
-            this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
-        }
-      },
-      add(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('add')
-      },
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      selfSearch (args) {
-        if(this.f_special){
-          args.condition =  `${args.condition} and s.f_special='1' and s.f_filialeids = '${this.f_filialeids}'`
-        }else{
-          args.condition =  `${args.condition} and s.f_filialeids = '${this.f_filialeids}'`
-        }
-        this.model.search(args.condition, args.model)
-      },
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      getRes (obj) {
-        console.log(obj,'选择到公司')
-        this.f_filialeids = obj.resids
-      },
-    },
-    watch:{
-
-    }
-
-  }
-</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-inline auto" partial>
+          <div class="form-group form-input-group">
+            <right-tree
+              :userid.sync='$parent.$parent.userid'
+              :source.sync='$parent.$parent.source'
+              @re-res="$parent.$parent.getRes"></right-tree>
+          </div>
+          <div class="form-group form-input-group">
+            <input  type="text" class="form-control" v-model="model.f_province"
+                    condition="f_province like '%{}%'" placeholder="省份"
+                    :size="model.f_province ? model.f_province.length*2 : 2"/>
+          </div>
+          <div class="form-group form-input-group">
+            <input  type="text" class="form-control" v-model="model.f_city"
+                    condition="f_city like '%{}%'" placeholder="城市"
+                    :size="model.f_city ? model.f_city.length*2 : 2"/>
+          </div>
+          <div class="form-group form-input-group">
+            <input  type="text" class="form-control" v-model="model.f_district"
+                    condition="f_district like '%{}%'" placeholder="区县"
+                    :size="model.f_district ? model.f_district.length*2 : 2"/>
+          </div>
+          <div class="form-group form-input-group">
+            <input  type="text" class="form-control" v-model="model.f_street"
+                    condition="f_street like '%{}%'" placeholder="街道"
+                    :size="model.f_street ? model.f_street.length*2 : 2"/>
+          </div>
+          <div class="form-group form-input-group">
+            <input  type="text" class="form-control" v-model="model.f_residential_area"
+                    condition="f_residential_area like '%{}%'" placeholder="小区"
+                    :size="model.f_residential_area ? model.f_residential_area.length*2 : 2"/>
+          </div>
+          <div class="form-group form-input-group">
+            <button class="btn btn-success width-80" @click="search()" >查询</button>
+            <button v-if="!$parent.$parent.f_special" class="btn btn-success width-80" @click="$parent.$parent.add('小区')">添加小区</button>
+            <button v-if="$parent.$parent.f_special"class="btn btn-success width-80" @click="$parent.$parent.add('单位')">添加单位</button>
+            <button class="btn btn-success width-80" @click="$parent.$parent.clear()">清空</button>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <!--<th><nobr>id</nobr></th>-->
+            <!--<th><nobr>省市区</nobr></th>-->
+            <!--<th><nobr>城市</nobr></th>-->
+            <!--<th><nobr>区/县</nobr></th>-->
+            <th><nobr>街道名称</nobr></th>
+            <!--民用小区信息开始-->
+            <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
+            <th v-if="!$parent.$parent.$parent.f_special"><nobr>详细地址</nobr></th>
+            <th v-if="!$parent.$parent.$parent.f_special"><nobr>客户数量</nobr></th>
+            <!--民用小区信息结束-->
+            <!--非民用单位信息开始-->
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位名称</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位地址</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系人</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><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.id}}</nobr></td>-->
+            <!--<td style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>-->
+            <!--<td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>-->
+            <!--<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_area_address}}{{row.f_residential_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.usercount}}</nobr></td>
+            <!--非民用单位信息开始-->
+            <td  v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkname}}</nobr></td>
+            <td  v-if="$parent.$parent.$parent.f_special"  style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
+            <!--非民用单位信息结束-->
+            <!--<td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>-->
+            <!--<td style="text-align:center"><nobr>{{row.f_outlets}}</nobr></td>-->
+            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
+            <td><nobr>
+              <!--<button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
+              <button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
+            </nobr></td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    data () {
+      return {
+        model: new PagedList('rs/sql/address_getarealist',20),
+        userid: this.$login.f.id,
+        source:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+        addflag: false,
+        addtitle:''
+      }
+    },
+    title: '小区管理',
+    props:{
+      f_filialeids:{
+        type: String
+      },
+      f_special:{
+        type: String
+      }
+    },
+    ready(){
+      this.init().then(()=>{
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      async init(){
+        await this.$refs.paged.$refs.cri.search()
+      },
+      async delete(row){
+        if(row.id){
+          var id = row.id
+          var usercount = row.usercount
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
+            {data: {
+                items: 'f_residential_area_id',
+                tablename: 't_user_address',
+                condition: `f_residential_area_id='${id}'`}
+                },
+            {resolveMsg: null, rejectMsg: null})
+          if(useraredss.data.length>0 || usercount>0 ){
+            this.$showAlert('该小区下已有地址或档案信息,无法删除!','warning',1000)
+          }else{
+            this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      add(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add')
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      selfSearch (args) {
+        if(this.f_special){
+          args.condition =  `${args.condition} and s.f_special='1' and s.f_filialeids = '${this.f_filialeids}'`
+        }else{
+          args.condition =  `${args.condition} and s.f_filialeids = '${this.f_filialeids}'`
+        }
+        this.model.search(args.condition, args.model)
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getRes (obj) {
+        console.log(obj,'选择到公司')
+        this.f_filialeids = obj.resids
+      },
+    },
+    watch:{
+      'f_filialeids'(){
+        this.init()
+      }
+    }
+
+  }
+</script>

package/src/components/AreaManage.vue

@@ -1,75 +1,75 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="flex" style="flex: 1; width:60%">
-      <area-list @select-changed="selected" v-ref:arealist :f_filialeids.sync="f_filialeids"></area-list>
-    </div>
-    <div v-show="areaShow" style="width: 40%">
-      <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>
-</template>
-
-<script>
-  export default {
-    title: '小区管理',
-    components:{
-    },
-    data () {
-      return {
-        //分公司id串
-        f_filialeids: this.$login.f.f_orgids,
-        areaShow:false,
-        areatype:'小区',
-        arearow:{},
-      }
-    },
-    ready(){
-      this.loadParam()
-    },
-    props:{
-
-    },
-    methods:{
-      selected(obj){
-        if(obj.val&&obj.val.id){
-          this.areaShow=true
-          this.$refs.addareamsg.cleardara()
-          this.$refs.addareamsg.operation='modify'
-          this.$refs.addareamsg.areatype='小区'
-          this.$refs.addareamsg.areamodel=Object.assign({},obj.val)
-          this.$refs.addareamsg.initdata()
-        }
-      },
-
-      async search() {
-        this.areaShow = false
-        await this.$refs.arealist.$refs.paged.$refs.cri.search()
-      },
-
-      async loadParam () {
-        await this.$LoadParams.loadParam()
-      }
-    },
-    events:{
-      'add'(){
-        this.areaShow=true
-        this.$refs.addareamsg.cleardara()
-        this.$refs.addareamsg.operation='add'
-        this.$refs.addareamsg.areatype='小区'
-        this.$refs.addareamsg.initdata()
-      },
-      'confirm' () {
-        console.log('小区变更成')
-        this.search()
-      },
-      'cancel' () {
-        this.$refs.arealist.$refs.paged.$refs.cri.search()
-        this.areaShow = false
-      },
-    }
-  }
-</script>
-
+<template>
+  <div id="unit" class="flex-row">
+    <div class="flex" style="flex: 1; width:60%">
+      <area-list @select-changed="selected" v-ref:arealist :f_filialeids.sync="f_filialeids"></area-list>
+    </div>
+    <div v-show="areaShow" style="width: 40%">
+      <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>
+</template>
+
+<script>
+  export default {
+    title: '小区管理',
+    components:{
+    },
+    data () {
+      return {
+        //分公司id串
+        f_filialeids: this.$login.f.f_orgids,
+        areaShow:false,
+        areatype:'小区',
+        arearow:{},
+      }
+    },
+    ready(){
+      this.loadParam()
+    },
+    props:{
+
+    },
+    methods:{
+      selected(obj){
+        if(obj.val&&obj.val.id){
+          this.areaShow=true
+          this.$refs.addareamsg.cleardara()
+          this.$refs.addareamsg.operation='modify'
+          this.$refs.addareamsg.areatype='小区'
+          this.$refs.addareamsg.areamodel=Object.assign({},obj.val)
+          this.$refs.addareamsg.initdata()
+        }
+      },
+
+      async search() {
+        this.areaShow = false
+        await this.$refs.arealist.$refs.paged.$refs.cri.search()
+      },
+
+      async loadParam () {
+        await this.$LoadParams.loadParam()
+      }
+    },
+    events:{
+      'add'(){
+        this.areaShow=true
+        this.$refs.addareamsg.cleardara()
+        this.$refs.addareamsg.operation='add'
+        this.$refs.addareamsg.areatype='小区'
+        this.$refs.addareamsg.initdata()
+      },
+      'confirm' () {
+        console.log('小区变更成')
+        this.search()
+      },
+      'cancel' () {
+        this.$refs.arealist.$refs.paged.$refs.cri.search()
+        this.areaShow = false
+      },
+    }
+  }
+</script>
+