address-client 3.2.85 → 3.2.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.85",
+  "version": "3.2.86",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/components/AddStreetManageMsg.vue

@@ -24,7 +24,7 @@
                      class="input_search" style="width:60%" placeholder="街道办名称"
                      v-validate:f_street_manage_name='{required: true }'>
             </div>
-            <div class="col-sm-6 form-group " v-if="config.hasnumber"
+            <div class="col-sm-6 form-group"
                  :class="[$v.f_street_manage_number.required ? 'has-error' : 'has-success']">
               <label class="font_normal_body">街道办编号</label>
               <input type="text" v-model="streetmanagemodel.f_street_manage_number"
@@ -64,13 +64,13 @@
 <script>
 import {HttpResetClass} from 'vue-client'
 
-let getAreaConfig = async function (self) {
-  // 获取气价里面的配置
-  await self.$getConfig(self, 'StreetManage')
-  console.log('原地址配置', self.config)
-  console.log('获取地址配置', self.config)
-  Object.assign(self.model, self.config)
-}
+// let getAreaConfig = async function (self) {
+//   // 获取气价里面的配置
+//   await self.$getConfig(self, 'StreetManage')
+//   console.log('原地址配置', self.config)
+//   console.log('获取地址配置', self.config)
+//   Object.assign(self.model, self.config)
+// }
 export default {
   title: '街道办信息添加',
   data() {
@@ -96,28 +96,23 @@ export default {
   props: ['f_filialeids', 'businesstype'],
   ready() {
     this.initdata()
-    getAreaConfig(this)
+    // getAreaConfig(this)
   },
   methods: {
     async streetyanzheng() {
       console.log(this.streetmanagemodel.f_street_manage_number.length)
-      if (this.streetmanagemodel.f_street_manage_number.length != 2) {
-        this.$showAlert('请输入正确的位数', 'warning', 2000)
-        this.streetmanagemodel.f_street_manage_number = ''
-      } else {
-        let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+      let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_street_manage',
             orderitem: 'id',
-            condition: `f_street_manage_number = '${this.streetmanagemodel.f_street_manage_number}' and f_orgid = '${this.$login.f.orgid}'`
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        if (res.data.length > 0) {
-          if (res.data[0].id != this.streetmanagemodel.id) {
-            this.$showAlert('当前编号已存在', 'warning', 2000)
-            this.streetmanagemodel.f_street_manage_number = ''
+            condition: `f_street_manage_number = '${this.streetmanagemodel.f_street_manage_number}'`
           }
+      }, {resolveMsg: null, rejectMsg: null})
+      if (res.data.length > 0) {
+        if (res.data[0].id != this.streetmanagemodel.id) {
+          this.$showAlert('当前编号已存在', 'warning', 2000)
+          this.streetmanagemodel.f_street_manage_number = ''
         }
       }
     },

package/src/components/AddStreetOrPcd.vue

@@ -237,7 +237,7 @@
               items: '*',
               tablename: 't_street_manage',
               orderitem: 'id',
-              condition: pconditon
+              condition: '1=1'
             }
           }, {resolveMsg: null, rejectMsg: null}).then((req) => {
             let redata = []

package/src/components/StreetList.vue

@@ -1,243 +1,243 @@
-<template>
-  <div class="flex" @keyup.enter="search">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' @sort="sort()" v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">组织机构</label>
-              <res-select restype='organization'
-                          @res-select="$parent.$parent.getorg"
-                          :initresid='$parent.$parent.curorgid'>
-              </res-select>
-            </div>
-            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">街道名称</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道名称"/>
-            </div>
-            <div  class="col-sm-4 form-group button-range">
-              <button class="button_search button_spacing" @click="search()" >查询</button>
-              <button class="button_new button_spacing" style="width: max-content;"  @click="$parent.$parent.add('省市区')">省市区管理</button>
-              <button 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>
-              <export-excel :data="$parent.$parent.getCondition"
-                            :field="$parent.$parent.getfield"
-                            sqlurl="rs/logic/exportfile"
-                            sql-name="manage_getstreetlist"
-                            template-name='街道信息查询导出'
-                            :choose-col="true"></export-excel>
-              <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-            </div>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">省&emsp;&emsp;份</label>
-              <input  type="text"    style="width:60%" class="input_search" v-model="model.f_province"
-                      condition="f_province like '%{}%'" placeholder="省份"
-                      :size="model.f_province ? model.f_province.length*2 : 6"/>
-            </div>
-            <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">城&emsp;&emsp;市</label>
-              <input  type="text" style="width:60%" class="input_search" v-model="model.f_city"
-                      condition="f_city like '%{}%'" placeholder="城市"
-                      :size="model.f_city ? model.f_city.length*2 : 6"/>
-            </div>
-            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">省&emsp;&emsp;份</label>
-              <input  type="text"    style="width:60%" class="input_search" v-model="model.f_province"
-                condition="f_province like '%{}%'" placeholder="省份"
-                :size="model.f_province ? model.f_province.length*2 : 6"/>
-            </div>
-            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">城&emsp;&emsp;市</label>
-              <input  type="text" style="width:60%" class="input_search" v-model="model.f_city"
-                condition="f_city like '%{}%'" placeholder="城市"
-                :size="model.f_city ? model.f_city.length*2 : 6"/>
-            </div>
-            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">区&emsp;&emsp;县</label>
-              <input  type="text" style="width:60%" class="input_search"  v-model="model.f_district"
-                      condition="f_district like '%{}%'" placeholder="区县"
-                      :size="model.f_district ? model.f_district.length*2 : 6"/>
-            </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><data-order field="f_iscity" name="地区类型"
-                            :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
-            <th><nobr>街道/乡镇</nobr></th>
-            <th><nobr>街道编号</nobr></th>
-            <th><data-order field="f_address" name="地址"
-                            :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
-            <th><nobr>分公司</nobr></th>
-            <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>
-            <th><nobr>操作</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr @click="$parent.$parent.changestyle()">
-            <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_manage_name}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_street_number}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.streenum}}</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 v-if="!row.streetid" type="button" name="button" class="btn btn-danger"
-                      style="padding: 5px 12px"
-                      @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'
-  let readyGen = async function (self) {
-    self.getfield = self.config.excelHeaders
-  }
-  export default {
-    data () {
-      return {
-        criteriaShow: false,
-        model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
-        addflag: false,
-        getfield: {},
-        //排序
-        orderitem:'f_city,f_district,f_iscity,f_street desc',
-        addtitle:'',
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        f_orgid: '',
-        config: {
-          // 导出列要和查询列相同
-          excelHeaders: {
-            'f_province':'省份',
-            'f_city':'城市',
-            'f_district':'区/县',
-            'f_street_manage_name':'街道办',
-            'f_street':'街道名称',
-            'f_org_name':'分公司',
-            'streenum':'小区数量'
-          }
-        },
-        orderFields: {
-          f_operate_date: 'no'
-        },
-      }
-    },
-    title: '街道管理',
-    props:{
-      f_filialeids:{
-        type: String
-      }
-    },
-    ready(){
-      readyGen(this)
-      this.search()
-    },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-      async delete(row){
-        if(row.id >= 0 ){
-          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){
-        if (this.f_filialeids) {
-          this.$refs.paged.$refs.grid.selectStore.selected = null
-          this.$dispatch('add',val)
-        } 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])
-        }
-        args.condition = `${args.condition} and s.f_filialeid  in ${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]
-      }
-    },
-    computed: {
-      getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`,
-          orderitem: this.orderitem?`${this.orderitem}`: " id desc"
-        }
-      }
-    },
-    events:{
-      'sort' (field, rule) {
-        // 将所有排序方式设为不排序，实现相互排斥
-        console.log("field",field, rule)
-        for (let key in this.orderFields) {
-          if (key === field) {
-            this.orderFields[key] = rule
-          } else {
-            this.orderFields[key] = 'no'
-          }
-        }
-        // 如果新规则不排序，还原为默认排序
-        if (rule === 'no') {
-          this.model.paramSource.orderitem = `'${this.orderitem}'`
-        } else {
-          this.model.paramSource.orderitem = `'${field} ${rule}'`
-        }
-
-        this.search()
-      },
-    },
-  }
-</script>
+<template>
+  <div class="flex" @keyup.enter="search">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' @sort="sort()" v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">组织机构</label>
+              <res-select restype='organization'
+                          @res-select="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.curorgid'>
+              </res-select>
+            </div>
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">街道名称</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
+                      condition="f_street like '%{}%'" placeholder="街道名称"/>
+            </div>
+            <div  class="col-sm-4 form-group button-range">
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_new button_spacing" style="width: max-content;"  @click="$parent.$parent.add('省市区')">省市区管理</button>
+              <button 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>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/exportfile"
+                            sql-name="manage_getstreetlist"
+                            template-name='街道信息查询导出'
+                            :choose-col="true"></export-excel>
+              <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">省&emsp;&emsp;份</label>
+              <input  type="text"    style="width:60%" class="input_search" v-model="model.f_province"
+                      condition="f_province like '%{}%'" placeholder="省份"
+                      :size="model.f_province ? model.f_province.length*2 : 6"/>
+            </div>
+            <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <input  type="text" style="width:60%" class="input_search" v-model="model.f_city"
+                      condition="f_city like '%{}%'" placeholder="城市"
+                      :size="model.f_city ? model.f_city.length*2 : 6"/>
+            </div>
+            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">省&emsp;&emsp;份</label>
+              <input  type="text"    style="width:60%" class="input_search" v-model="model.f_province"
+                condition="f_province like '%{}%'" placeholder="省份"
+                :size="model.f_province ? model.f_province.length*2 : 6"/>
+            </div>
+            <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <input  type="text" style="width:60%" class="input_search" v-model="model.f_city"
+                condition="f_city like '%{}%'" placeholder="城市"
+                :size="model.f_city ? model.f_city.length*2 : 6"/>
+            </div>
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">区&emsp;&emsp;县</label>
+              <input  type="text" style="width:60%" class="input_search"  v-model="model.f_district"
+                      condition="f_district like '%{}%'" placeholder="区县"
+                      :size="model.f_district ? model.f_district.length*2 : 6"/>
+            </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><data-order field="f_iscity" name="地区类型"
+                            :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
+            <th><nobr>街道/乡镇</nobr></th>
+            <th><nobr>街道编号</nobr></th>
+            <th><data-order field="f_address" name="地址"
+                            :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
+            <th><nobr>分公司</nobr></th>
+            <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>
+            <th><nobr>操作</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr @click="$parent.$parent.changestyle()">
+            <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_manage_name}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street_number}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.streenum}}</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 v-if="!row.streetid" type="button" name="button" class="btn btn-danger"
+                      style="padding: 5px 12px"
+                      @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'
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+  }
+  export default {
+    data () {
+      return {
+        criteriaShow: false,
+        model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
+        addflag: false,
+        getfield: {},
+        //排序
+        orderitem:'f_city,f_district,f_iscity,f_street desc',
+        addtitle:'',
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_province':'省份',
+            'f_city':'城市',
+            'f_district':'区/县',
+            'f_street_manage_name':'街道办',
+            'f_street':'街道名称',
+            'f_org_name':'分公司',
+            'streenum':'小区数量'
+          }
+        },
+        orderFields: {
+          f_operate_date: 'no'
+        },
+      }
+    },
+    title: '街道管理',
+    props:{
+      f_filialeids:{
+        type: String
+      }
+    },
+    ready(){
+      readyGen(this)
+      this.search()
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async delete(row){
+        if(row.id >= 0 ){
+          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){
+        if (this.f_filialeids) {
+          this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add',val)
+        } 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])
+        }
+        args.condition = `${args.condition} and s.f_filialeid  in ${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]
+      }
+    },
+    computed: {
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`,
+          orderitem: this.orderitem?`${this.orderitem}`: " id desc"
+        }
+      }
+    },
+    events:{
+      'sort' (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        console.log("field",field, rule)
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
+    },
+  }
+</script>

package/src/components/StreetManageList.vue

@@ -13,8 +13,13 @@
             </div>
             <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
               <label class="font_normal_body">街道办名称</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street_manage_name like '%{}%'" placeholder="街道名称"/>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street_manage_name"
+                      condition="f_street_manage_name like '%{}%'" placeholder="街道办名称"/>
+            </div>
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">街道办编号</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street_manage_number"
+                      condition="f_street_manage_number = '{}'" placeholder="街道办编号"/>
             </div>
             <div  class="col-sm-4 form-group button-range">
               <button class="button_search button_spacing" @click="search()" >查询</button>
@@ -23,7 +28,7 @@
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
                             sqlurl="rs/logic/exportfile"
-                            sql-name="manage_getstreetlist"
+                            sql-name="manage_getStreetManageList"
                             template-name='街道办信息查询导出'
                             :choose-col="true"></export-excel>
               <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
@@ -133,11 +138,6 @@
       }
     },
     title: '街道办管理',
-    props:{
-      f_filialeids:{
-        type: String
-      }
-    },
     ready(){
       readyGen(this)
       this.search()
@@ -180,7 +180,7 @@
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
-        args.condition = `${args.condition} and sm.f_filialeid  in ${this.f_orgid}`
+        args.condition = `${args.condition}`
         this.model.search(args.condition, args.model)
       },
       //清空
@@ -195,7 +195,7 @@
     computed: {
       getCondition() {
         return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and sm.f_filialeid = '${this.f_filialeids}'`,
+          condition: `${this.$refs.paged.$refs.cri.condition}`,
           orderitem: this.orderitem ? `${this.orderitem}` : " id desc"
         }
       }