address-client 3.0.17 → 3.0.19-wsd

package/src/components/AreaFiles.vue

@@ -1,67 +1,67 @@
-<template>
-  <div style="width: auto;">
-    <criteria-paged :model="model" v-ref:paged :pager="false">
-      <criteria partial='criteria' @condition-changed='$parent.selfsearch' v-ref:criteria >
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="col-sm-9  ">
-            <input type="text" class="input_search button_spacing" v-model="model.f_residential_area"
-                   condition="f_residential_area like '%{}%'" placeholder='小区名称'>
-          </div>
-          <div class="span" style="float:right;"id='filesArea'>
-            <button class="button_search button_spacing" @click="search()">查询</button>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" >
-        <template partial='head'>
-          <tr>
-            <th>序号</th>
-            <th>小区详细地址</th>
-            <th>操作</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td id = "1" style="text-align: center;">{{$index + 1}}</td>
-          <td>{{row.f_area_address}}-{{row.f_residential_area}}</td>
-          <td style="text-align: center;">
-            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$parent.foundFile(row)">建档</button>
-          </td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  export default {
-    title: '小区列表',
-    data () {
-      return {
-        model: new PagedList('rs/sql/address_getArea', 20)
-      }
-    },
-    props: ['f_filialeid'],
-    ready () {
-      this.search()
-    },
-    methods: {
-      foundFile (row) {
-        console.log('小区建档', row)
-        this.$emit('re-ref', row)
-      },
-      search () {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfsearch (datas) {
-        datas.condition += ` and a.f_filialeid = '${this.f_filialeid}'`
-        this.$refs.paged.$refs.grid.$el.scrollTop = 0
-        this.model.search(datas.condition, this.model)
-      },
-      // 主要提供外部组件调用，刷新数据
-      reflash () {
-        this.$refs.paged.$refs.criteria.search()
-      }
-    }
-  }
-</script>
+<template>
+  <div style="width: auto;">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.selfsearch' v-ref:criteria >
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="col-sm-9  ">
+            <input type="text" class="input_search button_spacing" v-model="model.f_residential_area"
+                   condition="f_residential_area like '%{}%'" placeholder='小区名称'>
+          </div>
+          <div class="span" style="float:right;"id='filesArea'>
+            <button class="button_search button_spacing" @click="search()">查询</button>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" >
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>小区详细地址</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td id = "1" style="text-align: center;">{{$index + 1}}</td>
+          <td>{{row.f_area_address}}-{{row.f_residential_area}}</td>
+          <td style="text-align: center;">
+            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.foundFile(row)">建档</button>
+          </td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  export default {
+    title: '小区列表',
+    data () {
+      return {
+        model: new PagedList('rs/sql/address_getArea', 20)
+      }
+    },
+    props: ['f_filialeid'],
+    ready () {
+      this.search()
+    },
+    methods: {
+      foundFile (row) {
+        console.log('小区建档', row)
+        this.$emit('re-ref', row)
+      },
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfsearch (datas) {
+        datas.condition += ` and a.f_filialeid = '${this.f_filialeid}'`
+        this.$refs.paged.$refs.grid.$el.scrollTop = 0
+        this.model.search(datas.condition, this.model)
+      },
+      // 主要提供外部组件调用，刷新数据
+      reflash () {
+        this.$refs.paged.$refs.criteria.search()
+      }
+    }
+  }
+</script>

package/src/components/AreaList.vue

@@ -1,210 +1,210 @@
-<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="$parent.$parent.style">
-                <label class="font_normal_body">组织机构</label>
-                  <res-select restype='organization'
-                              @res-select="$parent.$parent.getorg"
-                              is-mul="false"
-                              :initresid='$parent.$parent.curorgid'>
-                  </res-select>
-            </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;省份&nbsp;&nbsp;&nbsp;</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_province"
-                      condition="f_province like '%{}%'" placeholder="省份"
-                      :size="model.f_province ? model.f_province.length*2 : 6"/>
-            </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;城市&nbsp;&nbsp;&nbsp;</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_city"
-                      condition="f_city like '%{}%'" placeholder="城市"
-                      :size="model.f_city ? model.f_city.length*2 : 6"/>
-            </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;区县&nbsp;&nbsp;&nbsp;</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_district"
-                      condition="f_district like '%{}%'" placeholder="区县"
-                      :size="model.f_district ? model.f_district.length*2 : 6"/>
-            </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;街道&nbsp;&nbsp;&nbsp;</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道"
-                      :size="model.f_street ? model.f_street.length*2 : 6"/>
-            </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_area"
-                      condition="f_residential_area like '%{}%'" placeholder="小区"
-                      :size="model.f_residential_area ? model.f_residential_area.length*2 : 6"/>
-            </div>
-            <div style="float:right;">
-              <button class="button_search button_spacing" @click="search()" >查询</button>
-              <button v-if="!$parent.$parent.f_special" class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('小区')">添加小区</button>
-              <button v-if="$parent.$parent.f_special"class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('单位')">添加单位</button>
-              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-            </div>
-          </div>
-      </div>
-
-
-      </criteria>
-      <data-grid  :model="model" partial='list'  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 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>
-
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td style="text-align:center"><nobr>{{$index + 1}}</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_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 {
-        criteriaShow: false,
-        model: new PagedList('rs/sql/address_getarealist',20),
-        addflag: false,
-        addtitle:'',
-
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        f_orgid: ''
-      }
-    },
-    title: '小区管理',
-    props:{
-      f_filialeids:{
-        type: String
-      },
-      style: {
-        type: String,
-        default: 'col-sm-2'
-      },
-      f_special:{
-        type: String
-      }
-    },
-    ready(){
-      this.search()
-    },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      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){
-        if (this.f_filialeids) {
-          this.$refs.paged.$refs.grid.selectStore.selected = null
-          this.$dispatch('add')
-        } else {
-          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-        }
-      },
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      selfSearch (args) {
-
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
-        }
-        console.log('查询。。。', this.f_orgid)
-        if(this.f_special){
-          args.condition =  `${args.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
-        }else{
-          args.condition =  `${args.condition} and s.f_filialeid = ${this.f_orgid}`
-        }
-        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:{
-
-    }
-
-  }
-</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="$parent.$parent.style">
+                <label class="font_normal_body">组织机构</label>
+                  <res-select restype='organization'
+                              @res-select="$parent.$parent.getorg"
+                              is-mul="false"
+                              :initresid='$parent.$parent.curorgid'>
+                  </res-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;省份&nbsp;&nbsp;&nbsp;</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_province"
+                      condition="f_province like '%{}%'" placeholder="省份"
+                      :size="model.f_province ? model.f_province.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;城市&nbsp;&nbsp;&nbsp;</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_city"
+                      condition="f_city like '%{}%'" placeholder="城市"
+                      :size="model.f_city ? model.f_city.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;区县&nbsp;&nbsp;&nbsp;</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_district"
+                      condition="f_district like '%{}%'" placeholder="区县"
+                      :size="model.f_district ? model.f_district.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;街道&nbsp;&nbsp;&nbsp;</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
+                      condition="f_street like '%{}%'" placeholder="街道"
+                      :size="model.f_street ? model.f_street.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_area"
+                      condition="f_residential_area like '%{}%'" placeholder="小区"
+                      :size="model.f_residential_area ? model.f_residential_area.length*2 : 6"/>
+            </div>
+            <div style="float:right;">
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button v-if="!$parent.$parent.f_special" class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('小区')">添加小区</button>
+              <button v-if="$parent.$parent.f_special"class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('单位')">添加单位</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+            </div>
+          </div>
+      </div>
+
+
+      </criteria>
+      <data-grid  :model="model" partial='list'  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 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>
+
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center"><nobr>{{$index + 1}}</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_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 {
+        criteriaShow: false,
+        model: new PagedList('rs/sql/address_getarealist',20),
+        addflag: false,
+        addtitle:'',
+
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: ''
+      }
+    },
+    title: '小区管理',
+    props:{
+      f_filialeids:{
+        type: String
+      },
+      style: {
+        type: String,
+        default: 'col-sm-2'
+      },
+      f_special:{
+        type: String
+      }
+    },
+    ready(){
+      this.search()
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      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){
+        if (this.f_filialeids) {
+          this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add')
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      selfSearch (args) {
+
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        console.log('查询。。。', this.f_orgid)
+        if(this.f_special){
+          args.condition =  `${args.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
+        }else{
+          args.condition =  `${args.condition} and s.f_filialeid = ${this.f_orgid}`
+        }
+        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:{
+
+    }
+
+  }
+</script>