address-client 1.6.76 → 1.6.79

package/package.json

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

package/src/components/AddAreaMsg.vue

@@ -24,13 +24,21 @@
             </v-select>
           </div>
           <div class="col-sm-6 form-group form-input-group ">
-            <label class="font_normal_body _zoom4">街道名称</label>
+            <label class="font_normal_body _zoom4">所属街办</label>
             <v-select
               :value.sync="areamodel.f_street_id" :value-single="true"
               :options='streetslist' placeholder='请选择'
               close-on-select search="true" @change="streetChange">
             </v-select>
           </div>
+          <div class="col-sm-6 form-group form-input-group ">
+            <label class="font_normal_body _zoom4">街道名称</label>
+            <v-select
+              :value.sync="areamodel.f_block" :value-single="true"
+              :options='blockslist' placeholder='请选择'
+              close-on-select search="true">
+            </v-select>
+          </div>
           <div class="col-sm-6 form-group form-input-group "
           >
             <label class="font_normal_body _zoom4">片区</label>
@@ -391,7 +399,7 @@
                      :value.sync="areamodel.is_close_one"
                      v-model="areamodel.is_close_one" placeholder='第一次关阀天数'
                      v-validate:is_close_one='{required: true }'
-              ></input>
+              />
             </div>
             <div class="col-sm-6 form-group form-input-group "
                  :class="[$v.is_close_two.required ? 'has-error' : '']">
@@ -402,7 +410,7 @@
                      :value.sync="areamodel.is_close_two"
                      v-validate:is_close_two='{required: true }'
                      v-model="areamodel.is_close_two" placeholder='第二次关阀天数'
-              ></input>
+              />
             </div>
             <div class="col-sm-6 form-group form-input-group "
                  :class="[$v.is_tablelimit.required ? 'has-error' : '']">
@@ -428,7 +436,7 @@
                      :value.sync="areamodel.is_tablelimit_gas"
                      v-validate:is_tablelimit_gas='{required: true }'
                      v-model="areamodel.is_tablelimit_gas" placeholder='上限金额'
-              ></input>
+              />
             </div>
             <div class="col-sm-6 form-group form-input-group "
                  :class="[$v.price_type.required ? 'has-error' : '']">
@@ -452,7 +460,7 @@
                      v-validate:anjianyear='{required: true }'
                      style="width: 60%"
                      v-model="areamodel.anjianyear" placeholder='安检年数'
-              ></input>
+              />
             </div>
             <div class="col-sm-6 form-group form-input-group "
                  :class="[$v.baofeiyear.required ? 'has-error' : '']">
@@ -461,7 +469,7 @@
                      v-validate:baofeiyear='{required: true }'
                      style="width: 60%"
                      v-model="areamodel.baofeiyear" placeholder='报废年数'
-              ></input>
+              />
             </div>
             <div class="col-sm-6 form-group form-input-group "
                  :class="[$v.onealarm.required ? 'has-error' : '']">
@@ -472,7 +480,7 @@
                      :value.sync="areamodel.onealarm"
                      v-validate:onealarm='{required: true }'
                      v-model="areamodel.onealarm" placeholder='第一档报警气量'
-              ></input>
+              />
             </div>
             <div class="col-sm-6 form-group form-input-group "
                  :class="[$v.twoalarm.required ? 'has-error' : '']">
@@ -483,7 +491,7 @@
                      :value.sync="areamodel.twoalarm"
                      v-validate:twoalarm='{required: true }'
                      v-model="areamodel.twoalarm" placeholder='第二档报警气量'
-              ></input>
+              />
             </div>
           </div>
           <div v-if="f_special" class="col-sm-6">
@@ -513,12 +521,14 @@ export default {
       devicetypes: this.$appdata.getParam('设备类型'),
       distinct: this.$appdata.getParam('行政区域'),
       opera_area: this.$appdata.getParam('运营区域'),
+      repair_point: this.$appdata.getParam('维修站点'),
       residential_properties: this.$appdata.getParam('小区性质'),
       heating_style: this.$appdata.getParam('供暖方式'),
-      repair_point: [{label: '航天站', value: '航天站'},
-        {label: '韦曲站', value: '韦曲站'}, {label: '郭杜站', value: '郭杜站'},
-        {label: '沣东站', value: '沣东站'},
-        {label: '中心站', value: '中心站'}],
+      blockslist:  this.$appdata.getParam('所属街办'),
+      // repair_point: [{label: '航天站', value: '航天站'},
+      //   {label: '韦曲站', value: '韦曲站'}, {label: '郭杜站', value: '郭杜站'},
+      //   {label: '沣东站', value: '沣东站'},
+      //   {label: '中心站', value: '中心站'}],
       is_order: [{label: '开户', value: '开户'},
         {label: '未开户', value: '未开户'}],
       //初始化省市区数据
@@ -535,6 +545,7 @@ export default {
         default_devices: [],
         f_repair_point: '',
         f_pcd_id: '',
+        f_block: '',
         f_is_order: '',
         oldid: '',
         f_linkname: '',
@@ -742,7 +753,6 @@ export default {
       } else {
         this.areamodel.f_street = ''
       }
-      console.log(JSON.stringify(this.areamodel))
       let result = this.$resetpost('rs/logic/address_updatearea', this.areamodel)
     },
     cleardara() {
@@ -750,6 +760,7 @@ export default {
         default_devices: [],
         f_pcd_id: '',
         oldid: '',
+        f_block: '',
         f_linkname: '',
         f_linkphone: '',
         f_street_id: '',