address-client 1.5.19 → 1.5.23

package/src/components/StreetList.vue

@@ -1,146 +1,145 @@
-<template>
-  <div class="flex">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.search' 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">
-            <button class="btn btn-success width-80" @click="search()" >查询</button>
-            <button class="btn btn-success width-80" @click="$parent.$parent.add('省市区')">添加省市区</button>
-            <button 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><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_pcd}}-{{row.f_street}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_filiale}}</nobr></td>
-            <td style="text-align:center"><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_getstreetlist',20),
-        userid: this.$login.f.id,
-        source:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        addflag: false,
-        addtitle:''
-      }
-    },
-    title: '街道管理',
-    props:{
-      f_filialeids:{
-        type: String
-      }
-    },
-    ready(){
-
-    },
-    methods: {
-      async delete(row){
-        if(row.id){
-          var id = row.id
-          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
-            {data: {
-                items: 'f_street_id',
-                tablename: 't_area',
-                condition: `f_street_id='${id}'`}
-            },
-            {resolveMsg: null, rejectMsg: null})
-          if(useraredss.data.length>0){
-            this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
-          }else{
-            this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
-        }
-      },
-      add(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('add',val)
-      },
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      search (args) {
-        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.search' 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">
+            <button class="btn btn-success width-80" @click="search()" >查询</button>
+            <button class="btn btn-success width-80" @click="$parent.$parent.add('省市区')">添加省市区</button>
+            <button 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><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_pcd}}-{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_filiale}}</nobr></td>
+            <td style="text-align:center">
+              <button type="button" name="button" class="btn btn-danger" style="padding: 5px 12px"
+                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
+            </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_getstreetlist',20),
+        userid: this.$login.f.id,
+        jurisdiction: this.$login.r,
+        source:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+        addflag: false,
+        addtitle:''
+      }
+    },
+    title: '街道管理',
+    props:{
+      f_filialeids:{
+        type: String
+      }
+    },
+    ready(){
+
+    },
+    methods: {
+      async delete(row){
+        if(row.id){
+          var id = row.id
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
+            {data: {
+                items: 'f_street_id',
+                tablename: 't_area',
+                condition: `f_street_id='${id}'`}
+            },
+            {resolveMsg: null, rejectMsg: null})
+          if(useraredss.data.length>0){
+            this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
+          }else{
+            this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      add(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add',val)
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      search (args) {
+        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>

package/src/components/UserAddress.vue

@@ -439,18 +439,19 @@
       //街道变化
       streetChange(val){
         console.log("街道变化",val)
-        if(val&&this.operation=='add'){
-          if(this.model.f_pcd_id.length==0){
-            this.model.f_pcd_id=this.findbyid(this.streetslist,this.model.f_street_id).f_pcd_id
-          }
+        console.log("街道变化",this.operation)
+        if(val&&this.operation=='add' || this.operation=='modify'){
+          // if(this.model.f_pcd_id.length==0){
+          //   this.model.f_pcd_id=this.findbyid(this.streetslist,this.model.f_street_id).f_pcd_id
+          // }
           //那就把[小区]重新组织一下
           this.initareas(` f_filialeids = '${this.f_filialeids}' and f_street_id ='${val}' `)
-          if(this.model.f_residential_area_id){
-            let street_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_street_id
-            if(street_id!=val){
-              this.model.f_residential_area_id=''
-            }
-          }
+          // if(this.model.f_residential_area_id){
+          //   let street_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_street_id
+          //   if(street_id!=val){
+          //     this.model.f_residential_area_id=''
+          //   }
+          // }
         }
         this.$resetValidation()
       },
@@ -517,7 +518,7 @@
         if(this.onedata=='one'){
           this.saveonedata()
         }
-        this.cleardara()
+        // this.cleardara()
         this.$dispatch('confirm')
       },
       //保存一户信息
@@ -543,7 +544,10 @@
           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_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
 
         }
         let result = this.$resetpost('rs/logic/address_updateuseraddress', this.model)
@@ -554,7 +558,7 @@
       },
       cleardara(){
         this.model= {
-          f_pcd_id: '',
+          // f_pcd_id: '',
           f_street_id: '',
           f_residential_area_id: '',
           f_pcd: '',

package/src/main.js

@@ -1,21 +1,19 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import { sale } from 'sale-client'
-import address from './address'
-
-Vue.config.silent = true
-
-/** **************************通用组件******************************/
-all()
-address()
-system(false)
-sale()
-require('./bootstrap/less/bootstrap.less')
-
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import address from './address'
+
+Vue.config.silent = true
+
+/** **************************通用组件******************************/
+all()
+address()
+system(false)
+require('./bootstrap/less/bootstrap.less')
+
+
+new Vue({
+  el: 'body',
+  components: { App }
+})