address-client 1.6.74 → 1.6.77

package/package.json

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

package/src/components/AddAreaMsg.vue

@@ -31,6 +31,14 @@
               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>
@@ -47,6 +55,7 @@
             <label class="font_normal_body _zoom4">小区ID</label>
             <input type="text"
                    style="width: 60%"
+                   @blur="areaidCheck"
                    v-model="areamodel.oldid" :disabled="operation=='modify'"
                    class="form-control" placeholder="小区ID"
                    v-validate:oldid='{required: true }'>
@@ -136,6 +145,7 @@
             <label class="font_normal_body _zoom4">单位ID</label>
             <input type="text"
                    style="width: 60%"
+                   @blur="areaidCheck"
                    v-model="areamodel.oldid"
                    class="form-control" placeholder="单位ID"
                    v-validate:oldid='{required: true }'>
@@ -389,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' : '']">
@@ -400,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' : '']">
@@ -426,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' : '']">
@@ -450,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' : '']">
@@ -459,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' : '']">
@@ -470,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' : '']">
@@ -481,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">
@@ -511,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: '未开户'}],
       //初始化省市区数据
@@ -740,7 +752,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() {
@@ -748,6 +759,7 @@ export default {
         default_devices: [],
         f_pcd_id: '',
         oldid: '',
+        f_block: '',
         f_linkname: '',
         f_linkphone: '',
         f_street_id: '',
@@ -787,6 +799,22 @@ export default {
         card_size: null,
       }
     },
+    areaidCheck(){
+      let HttpReset = new HttpResetClass()
+      HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        data: {
+          items: 'id',
+          tablename: 't_area',
+          orderitem: 'id desc',
+          condition: ` oldid = '${this.areamodel.oldid}' `
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'}).then((req) => {
+        if (req.data.length > 0) {
+          this.areamodel.oldid = ''
+          this.$showAlert('ID重复，请检查ID是否正确!','warning',1000)
+        }
+      })
+    },
     cancel() {
       this.cleardara()
       this.$dispatch('cancel')

package/src/components/AreaManage.vue

@@ -34,8 +34,11 @@ export default {
         this.$refs.addareamsg.cleardara()
         this.$refs.addareamsg.operation = 'modify'
         this.$refs.addareamsg.areatype = '小区'
-        obj.val.default_devices = obj.val.default_devices ? obj.val.default_devices : []
-        this.$refs.addareamsg.areamodel = Object.assign({}, obj.val)
+        try {
+          obj.val.default_devices = obj.val.default_devices ? JSON.parse(obj.val.default_devices) : []
+        }catch (e){
+          console.log("设备赋值错误")
+        }        this.$refs.addareamsg.areamodel = Object.assign({}, obj.val)
         this.$refs.addareamsg.oldsize = obj.val.card_size
         this.$refs.addareamsg.initdata()
       }

package/src/components/UseGasAreaList.vue

@@ -1,110 +1,110 @@
-<template>
-  <div class="flex">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
-        <div novalidate class="form-inline auto" partial>
-          <div class="form-group form-input-group">
-            <button class="btn btn-success width-80" @click="search()" >查询</button>
-            <button class="btn btn-success width-80" @click="$parent.$parent.add('民用')">添加用气区域</button>
-            <button class="btn btn-success width-80" @click="$parent.$parent.clear()">清空</button>
-          </div>
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th><nobr>id</nobr></th>
-            <th><nobr>区/县</nobr></th>
-            <th><nobr>片区</nobr></th>
-            <th><nobr>街道</nobr></th>
-            <th><nobr>用气区域</nobr></th>
-            <th><nobr>时间</nobr></th>
-            <th><nobr>操作人</nobr></th>
-            <th><nobr>操作</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td style="text-align:center"><nobr>{{row.id}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_usegas_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
-            <td style="text-align:center">
-             <!-- <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
-              <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
-            </td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-
-  export default {
-    data () {
-      return {
-        model: new PagedList('rs/sql/address_getusegasarealist',20),        userid: this.$login.f.id,
-        source:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-      }
-    },
-    title: '用气区域列表',
-    props:{
-    },
-    ready(){
-
-    },
-    methods: {
-      //添加方法
-      add(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('add',val)
-      },
-      //修改
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      async delete(row){
-        if(row.id){
-          var id = row.id
-          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
-            {data: {
-                items: 'f_usegas_area_id',
-                tablename: 't_user_address',
-                condition: `f_usegas_area_id='${id}'`}
-            },
-            {resolveMsg: null, rejectMsg: null})
-          if(useraredss.data.length>0){
-            this.$showAlert('该用气区域下已有地址信息,无法删除!','warning',1000)
-          }else{
-            this.$resetdelete('rs/entity/t_usegas_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
-        }
-      },
-      search (args) {
-        this.model.search(args.condition, args.model)
-      },
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-    },
-    watch:{
-
-    },
-    events: {
-    }
-
-  }
-</script>
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div novalidate class="form-inline auto" partial>
+          <div class="form-group form-input-group">
+            <button class="btn btn-success width-80" @click="search()" >查询</button>
+            <button class="btn btn-success width-80" @click="$parent.$parent.add('民用')">添加用气区域</button>
+            <button class="btn btn-success width-80" @click="$parent.$parent.clear()">清空</button>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th><nobr>id</nobr></th>
+            <th><nobr>区/县</nobr></th>
+            <th><nobr>片区</nobr></th>
+            <th><nobr>街道</nobr></th>
+            <th><nobr>用气区域</nobr></th>
+            <th><nobr>时间</nobr></th>
+            <th><nobr>操作人</nobr></th>
+            <th><nobr>操作</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center"><nobr>{{row.id}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_usegas_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
+            <td style="text-align:center">
+             <!-- <button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
+              <button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
+            </td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    data () {
+      return {
+        model: new PagedList('rs/sql/address_getusegasarealist',20),        userid: this.$login.f.id,
+        source:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+      }
+    },
+    title: '用气区域列表',
+    props:{
+    },
+    ready(){
+
+    },
+    methods: {
+      //添加方法
+      add(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add',val)
+      },
+      //修改
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      async delete(row){
+        if(row.id){
+          var id = row.id
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
+            {data: {
+                items: 'f_usegas_area_id',
+                tablename: 't_user_address',
+                condition: `f_usegas_area_id='${id}'`}
+            },
+            {resolveMsg: null, rejectMsg: null})
+          if(useraredss.data.length>0){
+`            this.$showAlert('该用气区域下已有地址信息,无法删除!','warning',1000)
+`          }else{
+            this.$resetdelete('rs/entity/t_usegas_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      search (args) {
+        this.model.search(args.condition, args.model)
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+    },
+    watch:{
+
+    },
+    events: {
+    }
+
+  }
+</script>