address-client 4.0.10 → 4.0.12-kelai

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "4.0.10",
+  "version": "4.0.12-kelai",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -80,9 +80,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "ldap-clients": "3.0.48",
-    "system-clients": "3.2.95",
+    "system-clients": "3.3.2",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.150",
+    "vue-client": "1.24.162",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/AddressList.vue

@@ -34,6 +34,7 @@
             </div>
             <div class="col-sm-4 form-group button-range" >
               <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_search button_spacing" v-show="this.$login.r.includes('清空安检')" @click="$parent.$parent.clearPlanId()">清空安检id</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_new button_spacing" style="width: max-content" v-show="this.$login.r.includes('批量修改')" @click="$parent.$parent.modifyBatch()">批量修改</button>
@@ -315,7 +316,9 @@
         //初始化街道数据
         areaslist:[],
         // 要修改的用户信息
-        userInfos:  []
+        userInfos:  [],
+        // 要清空f_plan_id的数据集
+        ids: []
       }
     },
     title: '地址列表',
@@ -331,6 +334,7 @@
     ready(){
       readyGen(this)
       this.search()
+      console.log(this.$login.r)
       this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
       this.initareas(`f_filialeid = '${this.f_filialeids}'`)
       //this.$refs.paged.$refs.grid.selectInit()
@@ -469,6 +473,24 @@
         this.$refs.paged.$refs.grid.selectInit()
         this.$refs.paged.$refs.cri.search()
       },
+      clearPlanId(){
+        this.ids=[]
+        if (this.$refs.paged.$refs.grid.getRowData().length != 0){
+          this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
+            console.log("看看数据",row)
+            this.ids[n] = row.id
+          })
+          console.log("看看id数据",this.ids)
+          let data = {
+            ids:this.ids
+          }
+          this.$resetpost('api/af-revenue/logic/clearPlanId',data)
+          this.$refs.paged.$refs.grid.selectInit()
+        }else {
+          this.$showAlert('请至少选择一项！', 'warning', 2000)
+        }
+
+      },
       cancelModify() {
         this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
         this.showModify = false

package/src/components/UserAddress.vue

@@ -107,9 +107,9 @@
           <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;层</label>
             <input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
-                   placeholder="楼层" />
+                   placeholder="楼层" disabled />
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
-            />
+                   disabled />
           </div>
           <div v-if="!usertype" class="col-sm-6 form-group "
                :class="[$v.f_room.required ? 'has-error' : 'has-success']">
@@ -210,15 +210,15 @@
                       close-on-select search="true">
             </v-select>
           </div>
-<!--          <div class="col-sm-6 form-group " :class="[$v.slice.required ? 'has-error' : 'has-success']">-->
-<!--            <label class="font_normal_body">片&emsp;&emsp;区</label>-->
-<!--            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"-->
-<!--                  >-->
-<!--            <v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"-->
-<!--                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"-->
-<!--                      close-on-select v-ref:slice>-->
-<!--            </v-select>-->
-<!--          </div>-->
+          <!--          <div class="col-sm-6 form-group " :class="[$v.slice.required ? 'has-error' : 'has-success']">-->
+          <!--            <label class="font_normal_body">片&emsp;&emsp;区</label>-->
+          <!--            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"-->
+          <!--                  >-->
+          <!--            <v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"-->
+          <!--                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"-->
+          <!--                      close-on-select v-ref:slice>-->
+          <!--            </v-select>-->
+          <!--          </div>-->
 
           <div class="col-sm-6 form-group "
                :class="[$v.f_building_start.integernum || $v.f_building_start.dctest ?'has-error' : 'has-success']">
@@ -416,10 +416,11 @@
 
         f_orgid: '',
 
-        sliceArea: []
+        sliceArea: [],
+        disableFloor: false
       }
     },
-    props: ['f_filialeids', 'row','operation','usertype'],
+    props: ['f_filialeids', 'row','operation','usertype', 'disableFloor'],
     ready(){
       this.initdata()
       getAreaConfig(this)
@@ -427,6 +428,25 @@
       this.model.f_unit_suffix=this.config.f_unit_suffix
       this.model.f_floor_suffix=this.config.f_floor_suffix
       this.model.f_room_suffix=this.config.f_room_suffix
+
+      // 处理传入的 row 数据
+      if(this.row) {
+        // 复制原有数据到 model
+        Object.assign(this.model, this.row)
+
+        // 初始化省市区、街道、小区数据
+        this.initpcds(` f_orgid = '${this.$login.f.orgid}'`)
+        this.initstreets(` f_orgid = '${this.$login.f.orgid}' `)
+        this.initareas(` f_orgid = '${this.$login.f.orgid}'`)
+
+        // 设置选中值
+        this.$nextTick(() => {
+          this.model.f_pcd_id = this.row.f_pcd_id
+          this.model.f_street_id = this.row.f_street_id
+          this.model.f_residential_area_id = this.row.f_residential_area_id
+          this.model.f_slice_area = this.row.f_slice_area
+        })
+      }
     },
     methods: {
       async changecity(){
@@ -772,7 +792,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_floor = ''
+          this.model.f_floor_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_room + this.model.f_room_suffix
         }
         await this.$resetpost('api/af-revenue/logic/address_updateuseraddress', this.model)
       },

package/src/filiale/yangchun/AddAreaMsg.vue

@@ -413,7 +413,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       this.sliceArea = []
       req.data.forEach((row) => {
-        this.sliceArea.push({label: row, value: {name: row.name, code:row.number}})
+        this.sliceArea.push({label: row.name, value: {name: row.name, code:row.number}})
       })
     },
     //初始化小区添加小区
@@ -602,12 +602,12 @@ export default {
       this.$refs.buildinglist.search()
     },
     //保存小区
-    async savearea(){
-      if(this.f_special){
-        this.areamodel.f_special='1'
+    async savearea() {
+      if (this.f_special) {
+        this.areamodel.f_special = '1'
       }
-      if(this.areamodel.f_sell_add==='0'){
-        this.areamodel.f_residential_area=this.areamodel.f_residential_area+'(L)'
+      if (this.areamodel.f_sell_add === '0') {
+        this.areamodel.f_residential_area = this.areamodel.f_residential_area + '(L)'
       } else {
         this.areamodel.f_residential_area = this.areamodel.f_residential_area.replace(/\(L\)/g, '')
       }
@@ -624,62 +624,62 @@ export default {
           this.areamodel.f_area_code = this.areamodel.slice_area[0].code
         }
       }
-      this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
-      this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
+      this.areamodel.f_pcd = this.findbyid(this.pcdslist, this.areamodel.f_pcd_id).f_pcd
+      this.areamodel.f_street = this.findbyid(this.streetslist, this.areamodel.f_street_id).f_street
 
       await this.$resetpost('api/af-revenue/logic/address_updatearea', this.areamodel)
     },
-    cleardara(){
-      this.areamodel= {
+    cleardara() {
+      this.areamodel = {
         f_area_id: '',
-        f_pcd_id:'',
-        f_street_id:'',
-        f_slice_area:'',
-        f_linkname:'',
-        f_linkphone:'',
-        f_adjustable_id:'',
-        f_residential_area:'',
-        f_user_type:'',
-        f_gasproperties:'',
-        f_area_address:'',
-        f_meter_brand:'',
-        f_price_name:'',
-        f_price_type:'',
-        f_meter_style:'',
-        f_position:'',
-        f_comments:'',
+        f_pcd_id: '',
+        f_street_id: '',
+        f_slice_area: '',
+        f_linkname: '',
+        f_linkphone: '',
+        f_adjustable_id: '',
+        f_residential_area: '',
+        f_user_type: '',
+        f_gasproperties: '',
+        f_area_address: '',
+        f_meter_brand: '',
+        f_price_name: '',
+        f_price_type: '',
+        f_meter_style: '',
+        f_position: '',
+        f_comments: '',
         f_meter_type: '',
-        f_sell_add:''
+        f_sell_add: ''
       }
     },
-    cancel(){
+    cancel() {
       this.cleardara()
       this.$dispatch('cancel')
     },
   },
   watch: {
-    'areamodel.f_meter_type' (val) {
+    'areamodel.f_meter_type'(val) {
       if (val === '机表')
         this.isMachine = false
     },
-    'areatype'(){
+    'areatype'() {
       this.initdata()
     },
-    'areamodel.f_pcd_id'(){
-      if(this.areamodel.f_pcd_id&&this.areamodel.f_street_id){
-        if (this.findbyid(this.pcdslist,this.areamodel.f_pcd_id) && this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
-          this.areamodel.f_area_address = this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
+    'areamodel.f_pcd_id'() {
+      if (this.areamodel.f_pcd_id && this.areamodel.f_street_id) {
+        if (this.findbyid(this.pcdslist, this.areamodel.f_pcd_id) && this.findbyid(this.streetslist, this.areamodel.f_street_id)) {
+          this.areamodel.f_area_address = this.findbyid(this.pcdslist, this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist, this.areamodel.f_street_id).f_street
         }
       }
     },
-    'areamodel.f_street_id'(){
+    'areamodel.f_street_id'() {
       if (this.areamodel.f_pcd_id && this.areamodel.f_street_id) {
         if (this.findbyid(this.pcdslist, this.areamodel.f_pcd_id) && this.findbyid(this.streetslist, this.areamodel.f_street_id)) {
           this.areamodel.f_area_address = this.findbyid(this.pcdslist, this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist, this.areamodel.f_street_id).f_street
         }
       }
     },
-    'f_filialeids'(){
+    'f_filialeids'() {
       if (this.areamodel.f_filialeid) {
         if (this.areamodel.f_filialeid != this.f_filialeids) {
           this.$dispatch('cancel')
@@ -693,27 +693,27 @@ export default {
     metertypes() {
       return this.$appdata.getParam('气表类型')
     },
-    usertypes () {
+    usertypes() {
       return this.$appdata.getParam('用户类型')
     },
-    f_price_types () {
+    f_price_types() {
       return this.$appdata.getParam('气价类型')
     },
-    meterstyle () {
+    meterstyle() {
       let ret = this.$GetSaleParam.getGasbrand()
       let rs = new Array()
-      if(this.areamodel.f_meter_brand) {
+      if (this.areamodel.f_meter_brand) {
         ret.forEach((item, index) => {
-          if(this.areamodel.f_meter_brand == item.value.f_meter_brand) {
-            item.value.gasmodel.forEach((item1, index) =>{
-              rs.push({label: item1.label, value:item1.label})
+          if (this.areamodel.f_meter_brand == item.value.f_meter_brand) {
+            item.value.gasmodel.forEach((item1, index) => {
+              rs.push({label: item1.label, value: item1.label})
             })
           }
         })
       }
       return rs
     },
-    pricenames () {
+    pricenames() {
       let rs = new Array()
       if (this.areamodel.f_user_type && this.areamodel.f_gasproperties && this.areamodel.f_price_type) {
         let params = {
@@ -732,10 +732,10 @@ export default {
       }
       return rs
     },
-    positions () {
+    positions() {
       return this.$appdata.getParam('安装位置')
     },
-    inputtores () {
+    inputtores() {
       // 获取抄表员
       let rs = new Array()
       if (this.$login.f.f_gasman.length > 0) {
@@ -761,11 +761,12 @@ export default {
   border: 1px solid #999999;
   margin-top: 13px;
 }
+
 .datapanel {
   color: #333;
   background-color: white;
-  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
   padding: 10px 30px 10px 30px;
-  border-radius:15px;
+  border-radius: 15px;
 }
 </style>