address-client 4.0.17 → 4.0.19

package/package.json

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

package/src/filiale/meihekou/AreaList.vue

@@ -127,7 +127,7 @@
           <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>抄表员</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>房屋类型</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>安装位置</nobr></th>
-          <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>片区/管理站 </nobr></th>
+          <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>维修片区</nobr></th>
           <th><nobr>操作人</nobr></th>
           <th><nobr>操作日期</nobr></th>
           <th title="该小区下现有的地址数"><nobr>地址数</nobr></th>
@@ -254,7 +254,7 @@ export default {
           'f_inputtor':'抄表员',
           'f_house_type':'房屋类型',
           'f_position':'安装位置',
-          'f_slice_area':'片区/管理站',
+          'f_slice_area':'维修片区',
           'f_operator':'操作人',
           'f_operate_date':'操作日期',
           'addressnum':'地址数'

package/src/filiale/tongchuan/AddressList.vue

@@ -107,9 +107,14 @@
             </div>
             <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
               <label class="font_normal_body">街&emsp;&emsp;道</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"/>
+              <v-select
+                :value.sync="$parent.$parent.selectedStreets"
+                multiple
+                :options="$parent.$parent.streetslist"
+                placeholder="请选择"
+                close-on-select
+                search="true">
+              </v-select>
             </div>
             <div :class="$parent.$parent.style" >
               <label class="font_normal_body">地址状态</label>
@@ -246,6 +251,9 @@
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
+        // 街道下拉
+        streetslist: [],
+        selectedStreets: [],
         getstate:[{label:'全部',value:''},{label:'有效',value:" = '有效' or a.f_state is null"},{label:'作废',value:" = '作废'"}],
         //文件上传弹框
         showFile: false,
@@ -264,6 +272,10 @@
     },
     ready(){
       readyGen(this)
+      // 初始化组织并加载街道
+      this.f_orgid = this.$login.convertToIn(this.curorgid)
+      this.f_filialeids = this.curorgid[0]
+      this.initstreets(` f_filialeid in ${this.f_orgid} `)
       this.search()
     },
     methods: {
@@ -328,21 +340,62 @@
       search () {
         this.$refs.paged.$refs.cri.search()
       },
+      // 初始化街道下拉
+      async initstreets (condition) {
+        try {
+          this.streetslist = []
+          const req = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+            data: {
+              items: '*',
+              tablename: 't_street',
+              orderitem: 'id',
+              condition
+            }
+          }, { resolveMsg: null, rejectMsg: '获取街道失败!' })
+          if (req && req.data) {
+            const seen = new Set()
+            this.streetslist = req.data.reduce((acc, row) => {
+              const key = row.f_street
+              if (key && !seen.has(key)) {
+                seen.add(key)
+                acc.push({
+                  label: row.f_street,
+                  value: row.f_street
+                })
+              }
+              return acc
+            }, [])
+          }
+        } catch (e) {
+          // ignore errors
+        }
+      },
       selfSearch (args) {
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
         args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+        if (Array.isArray(this.selectedStreets) && this.selectedStreets.length > 0) {
+          const streetConds = this.selectedStreets
+            .filter(s => !!s)
+            .map(s => `a.f_street = '${s.replace(/'/g, "''")}'`)
+            .join(' or ')
+          if (streetConds) {
+            args.condition = `${args.condition} and (${streetConds})`
+          }
+        }
         this.model.search(args.condition, args.model)
       },
 
       //清空
       clear(){
         this.$refs.paged.$refs.cri.model = {}
+        this.selectedStreets = []
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeids = val[0]
+        this.initstreets(` f_filialeid in ${this.f_orgid} `)
       }
     },
     events: {

package/src/filiale/tongchuan/AreaList.vue

@@ -35,8 +35,14 @@
             </div>
             <div :class="$parent.$parent.style" v-if="!$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="街道/乡镇"/>
+              <v-select
+                :value.sync="$parent.$parent.selectedStreets"
+                multiple
+                :options="$parent.$parent.streetslist"
+                placeholder="请选择"
+                close-on-select
+                search="true">
+              </v-select>
             </div>
             <div class="col-sm-4 form-group button-range">
               <button class="button_search button_spacing" @click="search()" >查询</button>
@@ -67,9 +73,14 @@
             </div>
             <div :class="$parent.$parent.style" v-if="$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="街道/乡镇"
-                      :size="model.f_street ? model.f_street.length*2 : 6"/>
+              <v-select
+                :value.sync="$parent.$parent.selectedStreets"
+                multiple
+                :options="$parent.$parent.streetslist"
+                placeholder="请选择"
+                close-on-select
+                search="true">
+              </v-select>
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">小区名称</label>
@@ -179,6 +190,10 @@
         addflag: false,
         addtitle:'',
         getfield: {},
+        // 下拉：街道选项
+        streetslist: [],
+        // 已选街道（多选）
+        selectedStreets: [],
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
@@ -218,6 +233,9 @@
     },
     ready(){
       readyGen(this)
+      // 初始化组织 IN 条件，并加载默认街道
+      this.f_orgid = this.$login.convertToIn([this.$login.f.orgid])
+      this.initstreets(` f_orgid in ${this.f_orgid} `)
 
     },
     methods: {
@@ -227,6 +245,36 @@
       search() {
         this.$refs.paged.$refs.cri.search()
       },
+      // 初始化街道下拉数据
+      async initstreets (pconditon) {
+        try {
+          this.streetslist = []
+          const req = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+            data: {
+              items: '*',
+              tablename: 't_street',
+              orderitem: 'id',
+              condition: pconditon
+            }
+          }, { resolveMsg: null, rejectMsg: '获取街道失败!' })
+          if (req && req.data) {
+            const seen = new Set()
+            this.streetslist = req.data.reduce((acc, row) => {
+              const key = row.f_street
+              if (key && !seen.has(key)) {
+                seen.add(key)
+                acc.push({
+                  label: row.f_street,
+                  value: row.f_street
+                })
+              }
+              return acc
+            }, [])
+          }
+        } catch (e) {
+          // 忽略异常，保持为空列表
+        }
+      },
 
       async delete(row){
         if(row.id >= 0){
@@ -269,15 +317,28 @@
         }else{
           args.condition =  `${args.condition} and s.f_filialeid = ${this.f_orgid}`
         }
+        // 街道多选条件
+        if (Array.isArray(this.selectedStreets) && this.selectedStreets.length > 0) {
+          const streetConds = this.selectedStreets
+            .filter(s => !!s)
+            .map(s => `s.f_street = '${s.replace(/'/g, "''")}'`)
+            .join(' or ')
+          if (streetConds) {
+            args.condition = `${args.condition} and (${streetConds})`
+          }
+        }
         this.model.search(args.condition, args.model)
       },
       //清空
       clear(){
         this.$refs.paged.$refs.cri.model = {}
+        this.selectedStreets = []
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeids = val[0]
+        // 根据分公司刷新街道下拉
+        this.initstreets(` f_orgid in ${this.f_orgid} `)
       }
     },
     watch:{

package/src/filiale/tongchuan/StreetList.vue

@@ -13,8 +13,15 @@
             </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="街道名称"/>
+              <input type="text" v-show="false" v-model="model.f_street" condition="f_street like '%{}%'" />
+              <v-select
+                :value.sync="$parent.$parent.selectedStreets"
+                multiple
+                :options="$parent.$parent.streetslist"
+                placeholder="请选择"
+                close-on-select
+                search="true">
+              </v-select>
             </div>
             <div  class="col-sm-4 form-group button-range">
               <button class="button_search button_spacing" @click="search()" >查询</button>
@@ -119,6 +126,10 @@
         model: new PagedList('api/af-revenue/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
         addflag: false,
         getfield: {},
+        // 下拉：街道选项
+        streetslist: [],
+        // 已选街道（多选）
+        selectedStreets: [],
         addtitle:'',
         // 公司下拉
         curorgid: [this.$login.f.orgid],
@@ -147,6 +158,9 @@
     },
     ready(){
       readyGen(this)
+      // 初始化组织 IN 条件，并加载默认街道
+      this.f_orgid = this.$login.convertToIn([this.$login.f.orgid])
+      this.initstreets(` f_orgid in ${this.f_orgid} `)
       this.search()
     },
     methods: {
@@ -156,6 +170,40 @@
       search () {
         this.$refs.paged.$refs.cri.search()
       },
+      // 初始化街道下拉数据
+      async initstreets (pconditon) {
+        try {
+          this.streetslist = []
+          const req = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+            data: {
+              items: '*',
+              tablename: 't_street',
+              orderitem: 'id',
+              condition: pconditon
+            }
+          }, { resolveMsg: null, rejectMsg: '获取街道失败!' })
+          if (req && req.data) {
+            const seen = new Set()
+            this.streetslist = req.data.reduce((acc, row) => {
+              const key = row.f_street
+              if (key && !seen.has(key)) {
+                seen.add(key)
+                acc.push({
+                  label: row.f_street,
+                  value: row.f_street
+                })
+              }
+              return acc
+            }, [])
+            // 若父容器使用其 streetslist，则同步去重后的结果
+            if (this.$parent && this.$parent.$parent && Array.isArray(this.$parent.$parent.streetslist)) {
+              this.$parent.$parent.streetslist = this.streetslist
+            }
+          }
+        } catch (e) {
+          // 忽略异常，保持为空列表
+        }
+      },
       async delete(row){
         if(row.id >= 0 ){
           var id = row.id
@@ -191,22 +239,36 @@
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
+        // 分公司多选条件
         args.condition = `${args.condition} and s.f_filialeid  in ${this.f_orgid}`
+        // 街道多选条件
+        if (Array.isArray(this.selectedStreets) && this.selectedStreets.length > 0) {
+          const streetConds = this.selectedStreets
+            .filter(s => !!s)
+            .map(s => `s.f_street = '${s.replace(/'/g, "''")}'`)
+            .join(' or ')
+          if (streetConds) {
+            args.condition = `${args.condition} and (${streetConds})`
+          }
+        }
         this.model.search(args.condition, args.model)
       },
       //清空
       clear(){
         this.$refs.paged.$refs.cri.model = {}
+        this.selectedStreets = []
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
+        this.f_filialeids = Array.isArray(val) && val.length ? val[0] : ''
+        // 根据分公司（多选）刷新街道下拉
+        this.initstreets(` f_orgid in ${this.f_orgid} `)
       }
     },
     computed: {
       getCondition() {
         return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`,
+          condition: `${this.$refs.paged.$refs.cri.condition}` + ` and s.f_filialeid in ${this.f_orgid}`,
           orderitem: this.orderitem ? `${this.orderitem}` : " id desc"
         }
       }