address-client 3.0.24-78 → 3.0.24-aode

package/src/components/AddAreaMsg.vue

@@ -10,20 +10,12 @@
             <span v-if="operation=='modify'&&f_special">修改【{{areamodel.f_residential_area}}】单位</span>
           </div>
           <!--基本小区(单位)信息-->
-          <div class="col-sm-6 form-group" v-if="!config.hasnumber">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">小区编号</label>
             <input type="text" class="input_search" style="width:60%" v-model="areamodel.f_area_id"
                    @blur="areaidChange" placeholder="小区编号">
           </div>
 
-          <div class="col-sm-6 form-group" v-if="config.hasnumber"
-               :class="[$v.f_area_id.required ? 'has-error' : 'has-success']">
-            <label class="font_normal_body">小区编号</label>
-            <input type="number" class="input_search" style="width:60%" v-model="areamodel.f_area_id"
-                   v-validate:f_area_id='{required: true }'
-                   @change="areaidChangeHasnumber" placeholder="小区编号">
-          </div>
-
           <div class="col-sm-6 form-group"
                :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">省&ensp;市&ensp;区</label>
@@ -115,125 +107,96 @@
           <div v-if="!f_special" class="row">
             <div class="col-sm-6 form-group">
               <label class="font_normal_body">用户类型</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_user_type">
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_user_type"
+              >
               <v-select
                 :value.sync="areamodel.f_user_type" :value-single="true"
                 :options='usertypes' placeholder='用户类型' @change="userTypeChange"
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group">
+            <div class="col-sm-6 form-group"
+            >
               <label class="font_normal_body">用气性质</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_gasproperties">
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_gasproperties"
+              >
               <v-select
                 :value.sync="areamodel.f_gasproperties" :value-single="true"
                 :options='gasproperties' placeholder='用气性质'
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group">
+            <div class="col-sm-6 form-group"
+            >
               <label class="font_normal_body">气价类型</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_type">
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_type"
+              >
               <v-select
                 :value.sync="areamodel.f_price_type" :value-single="true"
                 :options='f_price_types' placeholder='气价类型'
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group">
+            <div class="col-sm-6 form-group"
+            >
               <label class="font_normal_body">气价名称</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_name">
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_name"
+              >
               <v-select
                 :value.sync="areamodel.f_price_name" :value-single="true"
                 :options='pricenames' placeholder='气价名称'
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group">
+            <div class="col-sm-6 form-group"
+            >
               <label class="font_normal_body">气表品牌</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_brand">
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_brand"
+              >
               <v-select
                 :value.sync="areamodel.f_meter_brand" :value-single="true"
                 :options='meterbrands' placeholder='气表品牌'
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group">
+            <div class="col-sm-6 form-group"
+            >
               <label class="font_normal_body">气表型号</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_style">
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_style"
+              >
               <v-select
                 :value.sync="areamodel.f_meter_style" :value-single="true"
                 :options='meterstyle' placeholder='气表型号'
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group" :class="[$v.f_meter_type.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">气表类型</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false"
-                     v-model="areamodel.f_meter_type">
-              <v-select :value.sync="areamodel.f_meter_type" :value-single="true"
-                        :options='metertypes' placeholder='请选择'
-                        close-on-select></v-select>
-            </div>
-            <div class="col-sm-6 form-group" v-if="isMachine">
-              <label class="font_normal_body">抄&ensp;表&ensp;册</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false"
-                     v-model="areamodel.f_meter_book">
-              <v-select
-                :value.sync="areamodel.f_meter_book" :value-single="true"
-                :options='meterbooks' placeholder='抄表册'
-                close-on-select >
-              </v-select>
-            </div>
-            <div class="col-sm-6 form-group" v-if="!isMachine" :class="[$v.f_meter_book.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">抄&ensp;表&ensp;册</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false"
-                     v-model="areamodel.f_meter_book">
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">安装位置</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_position">
               <v-select
-                :value.sync="areamodel.f_meter_book" :value-single="true"
-                :options='meterbooks' placeholder='抄表册'
+                :value.sync="areamodel.f_position" :value-single="true"
+                :options='positions' placeholder='安装位置'
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group" :class="[$v.f_inputtor.required ? 'has-error' : 'has-success']">
+            <div class="col-sm-6 form-group">
               <label class="font_normal_body">抄&ensp;表&ensp;员</label>
-              <input type="text" style="width:60%" class="input_search"
-                     v-show="false" v-model="areamodel.f_inputtor">
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_inputtor">
               <v-select
                 :value.sync="areamodel.f_inputtor" :value-single="true"
                 :options='inputtores' placeholder='抄表员'
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group" :class="[$v.f_adjustable_id.required ? 'has-error' : 'has-success']">
+            <div class="col-sm-6 form-group">
               <label class="font_normal_body">调&ensp;压&ensp;箱</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false"
-                     v-model="areamodel.f_adjustable_id">
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_adjustable_id">
               <v-select
                 :value.sync="areamodel.f_adjustable_id" :value-single="true"
                 :options='adjustables' placeholder='调压箱'
                 close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-6 form-group" :class="[$v.f_house_type.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">房屋类型</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false"
-                     v-model="areamodel.f_house_type" >
-              <v-select
-                :value.sync="areamodel.f_house_type" :value-single="true"
-                :options='housetypeoptions' placeholder='房屋类型'
-                close-on-select >
-              </v-select>
-            </div>
-            <div class="col-sm-6 form-group" :class="[$v.f_position.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">安装位置</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false"  v-model="areamodel.f_position" >
-              <v-select
-                :value.sync="areamodel.f_position" :value-single="true"
-                :options='positions' placeholder='安装位置'
-                close-on-select >
-              </v-select>
-            </div>
           </div>
           <div v-if="f_special" class="col-sm-6 form-group">
             <br/>
@@ -251,22 +214,15 @@
 <script>
   import {HttpResetClass} from 'vue-client'
 
+
   let initGen = async function (self) {
-    await self.$getConfig(self, 'UserArea')
-    console.log('原地址配置',self.config)
-    console.log('获取地址配置',self.config)
-    Object.assign(self.model, self.config)
     await self.initdata()
-    await self.$LoadParams.loadMeterBook(self.f_filialeids)
-    await self.loadMeterBooks();
   }
+
   export default {
     title: '小区添加',
     data () {
       return {
-        config:{
-          hasnumber:false,
-        },
         //初始化省市区数据
         pcdslist:[],
         //初始化街道数据
@@ -289,16 +245,14 @@
           f_price_type:'',
           f_meter_style:'',
           f_position:'',
-          f_comments:'',
-          f_meter_type: ''
+          f_comments:''
         },
+
         meterbrands: [],
         adjustables: [],
         sliceArea: [],
-        gasproperties: [],
-        meterbooks:[{label: '全部',value: ''}],
-        housetypeoptions:[{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
-        isMachine: true
+
+        gasproperties: []
       }
     },
     props: ['f_filialeids','f_special', 'areatype','row','operation'],
@@ -306,22 +260,17 @@
       initGen(this)
     },
     methods: {
-      loadMeterBooks(){
-        this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
-      },
+
       //初始化数据
       async initdata(){
         // 初始化参数
         await this.initParams()
-
         // 初始化片区
         await this.initSlice(this.f_filialeids)
         await this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
+        // await this.initstreets(` f_filialeid = '${this.f_filialeids}'`)
       },
-      initrow(val){
-        this.areamodel.f_meter_book = val.f_meter_book;
-        this.areamodel.f_adjustable_id = val.f_adjustable_id;
-      },
+
       async initParams() {
         await this.$LoadParams.loadParam(this.f_filialeids)
         this.initBrands()
@@ -349,18 +298,22 @@
 
       async initSlice (val) {
         if (val) {
-          let getAllArea = await this.$resetpost('/rs/search', {
-            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-            userid: this.$login.f.id
+          this.sliceArea = [];
+          let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
+            data:{
+              items: '*',
+              tablename: 't_zone',
+              orderitem: 'id',
+              condition: ` parentid = ${val}`
+            }
           }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
 
-          let arr = getAllArea.data.filter((res) => {
-            return res.parentid == val
-          })
-          this.sliceArea = []
-          arr.forEach((res) => {
-            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-          })
+          if(getAllArea.data){
+            getAllArea.data.forEach((res) => {
+              this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+            })
+          }
+
         }
       },
 
@@ -411,28 +364,7 @@
         })
         this.streetslist=redata
       },
-      async areaidChangeHasnumber(){
-        console.log(this.areamodel.f_area_id.length)
-        if (this.areamodel.f_area_id.length != 2){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
-          this.areamodel.f_area_id = ''
-        }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
-            data: {
-              items: '*',
-              tablename: 't_area',
-              orderitem: 'id',
-              condition: `f_area_id = '${this.areamodel.f_area_id}' and f_orgid = '${this.$login.f.orgid}'`
-            }
-          }, {resolveMsg: null, rejectMsg: null})
-          if (res.data.length>0){
-            if (res.data[0].id != this.areamodel.id) {
-              this.$showAlert('当前编号已存在', 'warning', 2000)
-              this.areamodel.f_area_id = ''
-            }
-          }
-        }
-      },
+
       async areaidChange () {
         // 验证小区编号是否已存在
 
@@ -491,11 +423,13 @@
       //街道变化
       streetChange(val){
         if(val&&this.operation=='add'){
-          // if(this.areamodel.f_pcd_id.length==0){
-          if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
-            this.areamodel.f_pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
-          }
-          // }
+         // if(this.areamodel.f_pcd_id.length==0){
+            if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
+              console.log("aa",this.findbyid(this.streetslist,this.areamodel.f_street_id))
+              console.log("bbb",this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id)
+              this.areamodel.f_pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
+            }
+         // }
         }
         this.$resetValidation()
       },
@@ -546,8 +480,7 @@
           f_price_type:'',
           f_meter_style:'',
           f_position:'',
-          f_comments:'',
-          f_meter_type: ''
+          f_comments:''
         }
       },
       cancel(){
@@ -556,26 +489,26 @@
       },
     },
     watch: {
-      'areamodel.f_meter_type' (val) {
-        if (val === '机表')
-          this.isMachine = false
-      },
       '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
+        // if (!this.areamodel.f_area_address) {
+          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'(){
-        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
+        // if (!this.areamodel.f_area_address) {
+          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'(){
         if (this.areamodel.f_filialeid) {
@@ -588,9 +521,6 @@
       }
     },
     computed: {
-      metertypes() {
-        return this.$appdata.getParam('气表类型')
-      },
       usertypes () {
         return this.$appdata.getParam('用户类型')
       },
@@ -646,8 +576,8 @@
           }
         }
         return rs
-      }
-    }
+      },
+    },
   }
 </script>
 <style>

package/src/components/AddStreetOrPcd.vue

@@ -29,14 +29,6 @@
                        class="input_search" style="width:60%" placeholder="区/县"
                        v-validate:f_district='{required: true }'>
             </div>
-            <div class="col-sm-6 form-group " v-if="config.hasnumber"
-                 :class="[$v.f_pcd_number.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">区域编码</label>
-              <input type="number"  v-model="pcdmodel.f_pcd_number"
-                     class="input_search" style="width:60%" placeholder="区/县"
-                     @change="numberyanzheng"
-                     v-validate:f_pcd_number='{required: true }'>
-            </div>
             <div class="col-sm-12 form-group">
               <label  class="font_normal_body " style="">备&emsp;&emsp;注</label>
               <textarea class="input_textarea" rows="3" style="margin-top:25px;width:80%;height: auto;" v-model="pcdmodel.f_comments"></textarea>
@@ -62,14 +54,6 @@
                        class="input_search" style="width:60%" placeholder="街道名称"
                        v-validate:f_street='{required: true }'>
             </div>
-            <div class="col-sm-6 form-group " v-if="config.hasnumber"
-                 :class="[$v.f_street_number.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">街道编号</label>
-              <input type="text"  v-model="streetmodel.f_street_number"
-                     @change="streetyanzheng"
-                     class="input_search" style="width:60%" placeholder="街道编号"
-                     v-validate:f_street_number='{required: true }'>
-            </div>
             <div class="col-sm-12 form-group">
               <label  class="font_normal_body " style="">备&emsp;&emsp;注</label>
               <textarea class="input_textarea" rows="3" style="margin-top:25px;width:80%;height: auto;" v-model="streetmodel.f_comments"></textarea>
@@ -81,9 +65,6 @@
             <button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
             <button class="button_clear button_spacing" @click="cancel()">取消</button>
           </div>
-            <div v-if="areatype=='省市区'" class="row" style="margin-top:40px;height: 580px;">
-            <city-list v-ref:addpcd @select-changed="selected" :f_filialeids.sync="f_filialeids"></city-list>
-            </div>
           </div>
         </div>
     </validator>
@@ -92,30 +73,18 @@
 
 <script>
   import {HttpResetClass} from 'vue-client'
-
-  let getAreaConfig = async function (self) {
-    // 获取气价里面的配置
-    await self.$getConfig(self, 'UserPcd')
-    console.log('原地址配置',self.config)
-    console.log('获取地址配置',self.config)
-    Object.assign(self.model, self.config)
-  }
   export default {
     title: '区域地址添加',
     data () {
       return {
         //初始化省市区数据
-        config:{
-          hasnumber: false
-        },
         pcdslist:[],
         //省市区
         pcdmodel: {
           f_province:'',
           f_city:'',
           f_district:'',
-          f_comments:'',
-          f_pcd_number: ''
+          f_comments:''
         },
         //街道
         streetmodel: {
@@ -125,61 +94,15 @@
           f_slice_area: null,
           f_adjustable_id: null,
           f_street:'',
-          f_comments:'',
-          f_street_number:''
+          f_comments:''
         }
       }
     },
     props: ['f_filialeids', 'areatype','row','operation'],
     ready(){
       this.initdata()
-      getAreaConfig(this)
     },
     methods: {
-      async streetyanzheng(){
-        console.log(this.streetmodel.f_street_number.length)
-        if (this.streetmodel.f_street_number.length != 2){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
-          this.streetmodel.f_street_number = ''
-        }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
-            data: {
-              items: '*',
-              tablename: 't_street',
-              orderitem: 'id',
-              condition: `f_street_number = '${this.streetmodel.f_street_number}' and f_orgid = '${this.$login.f.orgid}'`
-            }
-          }, {resolveMsg: null, rejectMsg: null})
-          if (res.data.length>0){
-            if (res.data[0].id != this.streetmodel.id) {
-              this.$showAlert('当前编号已存在', 'warning', 2000)
-              this.streetmodel.f_street_number = ''
-            }
-          }
-        }
-      },
-      async numberyanzheng(){
-        console.log(this.pcdmodel.f_pcd_number.length)
-        if (this.pcdmodel.f_pcd_number.length != 3){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
-          this.pcdmodel.f_pcd_number = ''
-        }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
-            data: {
-              items: '*',
-              tablename: 't_pcd',
-              orderitem: 'id',
-              condition: `f_pcd_number = '${this.pcdmodel.f_pcd_number}' and f_orgid = '${this.$login.f.orgid}'`
-            }
-          }, {resolveMsg: null, rejectMsg: null})
-          if (res.data.length>0){
-            if (res.data[0].id != this.pcdmodel.id) {
-              this.$showAlert('当前编号已存在', 'warning', 2000)
-              this.pcdmodel.f_pcd_number = ''
-            }
-          }
-        }
-      },
       //初始化省市区,添加街道
       initpcds(pconditon){
         console.log("省市区准备")