address-client 3.2.105 → 3.2.106-shimen

package/src/components/AreaManage.vue

@@ -66,10 +66,6 @@
           if (obj.val.f_adjustable_id != null && obj.val.f_adjustable_id != '' && !(obj.val.f_adjustable_id instanceof Array)) {
             this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.val.f_adjustable_id)
           }
-          if(this.$refs.addareamsg.filtName()){
-            this.$refs.addareamsg.areamodel.selladd='0'}else {
-            this.$refs.addareamsg.areamodel.selladd='1'
-          }
           // this.$refs.addareamsg.initdata(obj.val)
           // this.$refs.addareamsg.initrow(obj.val)
         }

package/src/components/UserAddress.vue

@@ -165,13 +165,9 @@
                    class="input_search" style="width:60%" placeholder="合同顺序号"
                    v-validate:f_contracts_number='{required: true }'>
           </div>
-          <div class="col-sm-12 form-group" style="margin-bottom: 12px;margin-top: 12px;">
-            <label class="font_normal_body">小区备注</label>
-            <textarea class="input_textarea" rows="3" style="width:80%; height:auto;" v-model="model.f_comments1"></textarea>
-          </div>
-          <div class="col-sm-12 form-group" style="margin-top: 12px; margin-bottom: 12px;">
-            <label class="font_normal_body">备&emsp;&emsp;注</label>
-            <textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%; height:auto;" v-model="model.f_comments"></textarea>
+          <div class="col-sm-12 form-group">
+            <label  class="font_normal_body " >备&emsp;&emsp;注</label>
+            <textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%;height: auto;" v-model="model.f_comments"></textarea>
           </div>
           <div style="text-align:right;margin-top:40px;margin-right:50px;" class="col-sm-12">
             <button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
@@ -374,7 +370,6 @@
         model: {
           f_pcd_id: '',
           f_street_id: '',
-          f_comments1:'',
           f_comments:'',
           f_residential_area_id: '',
           f_pcd: '',
@@ -559,13 +554,12 @@
         }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
         let redata = []
         req.data.forEach((row) => {
-            if(!row.f_residential_area.includes('L')) {
           redata.push({
             label: row.f_residential_area,
             value: row.id,
             data: row,
             id: row.id
-          })}
+          })
         })
         this.areaslist=redata
         this.areaChange(this.model.f_residential_area_id)
@@ -768,6 +762,10 @@
           this.model.f_residential_area = this.findbyid(this.areaslist,this.model.f_residential_area_id) ? this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area : ''
         } else {
           //民用
+          this.model.f_building_suffix='-'
+          this.model.f_unit_suffix='-'
+          this.model.f_floor_suffix=''
+          this.model.f_room_suffix=''
           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
@@ -786,7 +784,6 @@
           f_iscity:'市区',
           f_residential_area_id: '',
           f_pcd: '',
-          f_comment1:'',
           f_comments:'',
           f_street: '',
           f_residential_area: '',

package/src/filiale/yangchun/AddAreaMsg.vue

@@ -348,11 +348,6 @@ export default {
     initGen(this)
   },
   methods: {
-    filtName(){
-      console.log("小区名称",this.areamodel.f_residential_area)
-      console.log('权限限制',this.areamodel.f_residential_area.includes('L'))
-      return this.areamodel.f_residential_area.includes('L')
-    },
     loadMeterBooks(){
       this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
     },
@@ -602,8 +597,6 @@ export default {
       if(this.f_special){
         this.areamodel.f_special='1'
       }
-      if(this.areamodel.selladd==='0'){
-        this.areamodel.f_residential_area=this.areamodel.f_residential_area+'(L)'}
       this.areamodel.f_filialeid = this.f_filialeids
       this.areamodel.f_operator = this.$login.f.name
       this.areamodel.f_operatorid = this.$login.f.id
@@ -641,8 +634,7 @@ export default {
         f_meter_style:'',
         f_position:'',
         f_comments:'',
-        f_meter_type: '',
-        selladd:''
+        f_meter_type: ''
       }
     },
     cancel(){

package/.npmignore

@@ -1,10 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-