address-client 1.6.72 → 1.6.76

package/package.json

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

package/src/components/AddAreaMsg.vue

@@ -47,6 +47,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 }'>
@@ -102,6 +103,18 @@
               close-on-select></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_is_order"
+              :value-single="true"
+              v-model="areamodel.f_is_order"
+              :options='is_order' placeholder='预约开户'
+              close-on-select>
+
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group form-input-group "
           >
             <label class="font_normal_body _zoom4">维修站点</label>
             <v-select
@@ -124,6 +137,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 }'>
@@ -182,10 +196,10 @@
             </div>
             <div class="col-sm-6 form-group form-input-group "
             >
-              <label v-if="areamodel.card_size>0" class="font_normal_body _zoom4" style="text-align: center">剩余<br/>卡号数量</label>
-              <label v-if="areamodel.card_size<=0" class="font_normal_body _zoom4">卡号数量</label>
+              <label v-if="oldsize>0" class="font_normal_body _zoom4" style="text-align: center">剩余<br/>卡号数量</label>
+              <label v-if="oldsize<=0" class="font_normal_body _zoom4">卡号数量</label>
               <input type="number" v-model="areamodel.card_size"
-                     style="width: 60%" :readonly="areamodel.card_size>0"
+                     style="width: 60%" :readonly="oldsize>0 && operation=='modify'"
                      class="form-control" placeholder="卡号数量">
             </div>
             <div class="col-sm-6 form-group form-input-group "
@@ -505,6 +519,8 @@ export default {
         {label: '韦曲站', value: '韦曲站'}, {label: '郭杜站', value: '郭杜站'},
         {label: '沣东站', value: '沣东站'},
         {label: '中心站', value: '中心站'}],
+      is_order: [{label: '开户', value: '开户'},
+        {label: '未开户', value: '未开户'}],
       //初始化省市区数据
       pcdslist: [],
       //初始化街道数据
@@ -519,6 +535,7 @@ export default {
         default_devices: [],
         f_repair_point: '',
         f_pcd_id: '',
+        f_is_order: '',
         oldid: '',
         f_linkname: '',
         f_linkphone: '',
@@ -560,7 +577,7 @@ export default {
       },
     }
   },
-  props: ['f_special', 'areatype', 'row', 'operation'],
+  props: ['f_special', 'areatype', 'row', 'operation', 'oldsize'],
   ready() {
     this.initdata()
   },
@@ -630,7 +647,7 @@ export default {
     },
     //初始化数据
     initdata() {
-      console.log('areatype是....', this.areatype)
+      console.log('areatype是....', this.areatype, this.row)
       this.initpcds(` 1=1 `)
       this.initstreets(` 1=1 `)
     },
@@ -668,7 +685,7 @@ export default {
     },
     //获取当前小区档案中的最大卡号区间
     getCard() {
-      if (this.areamodel.card_size > 0) {
+      if (this.oldsize > 0 && this.operation == 'modify') {
         this.$showAlert('剩余卡号大于0，不能获取，避免浪费卡号', 'warning', 2000)
         return
       }
@@ -687,13 +704,13 @@ export default {
             //前面不够 补0
             this.areamodel.card_start = this.pad(card + "", 10)
             this.areamodel.card_now = this.areamodel.card_start
-            this.areamodel.card_end = this.pad((Number(card) + Number(this.areamodel.card_size)) + "", 10)
+            this.areamodel.card_end = this.pad((Number(card) + Number(this.areamodel.card_size) - 1) + "", 10)
           } else {
             //默认卡号为03980000001
             let card = Number(this.$appdata.getSingleValue('启始卡号')) + 1
             this.areamodel.card_start = this.pad(card + "", 10)
             this.areamodel.card_now = this.areamodel.card_start
-            this.areamodel.card_end = this.pad((Number(card) + Number(this.areamodel.card_size)) + "", 10)
+            this.areamodel.card_end = this.pad((Number(card) + Number(this.areamodel.card_size) - 1) + "", 10)
           }
         })
       } catch (error) {
@@ -718,6 +735,7 @@ export default {
       this.areamodel.op_id = this.$login.f.op_id
       this.areamodel.op_spot = this.$login.f.op_spot
       this.areamodel.f_orgstr = this.$login.f.orgpathstr
+      this.areamodel.f_is_order = this.areamodel.f_is_order === '开户' ? this.areamodel.f_is_order : null
       this.areamodel.f_pcd = this.findbyid(this.pcdslist, this.areamodel.f_pcd_id).f_pcd
       if (this.areamodel.f_street_id) {
         this.areamodel.f_street = this.findbyid(this.streetslist, this.areamodel.f_street_id).f_street
@@ -771,6 +789,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

@@ -1,71 +1,73 @@
 <template>
   <div id="unit" class="flex-row">
     <div class="flex" style="flex: 1; width:60%">
-      <area-list @select-changed="selected" v-ref:arealist ></area-list>
+      <area-list @select-changed="selected" v-ref:arealist></area-list>
     </div>
     <div v-show="areaShow" class="datapanel" style="margin-left: 10px;width: 40%">
       <div class="flex">
         <add-area-msg v-ref:addareamsg :areatype="areatype" :operation="operation"
-                       :row="arearow"></add-area-msg>
+                      :row="arearow"></add-area-msg>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-  export default {
-    title: '小区管理',
-    components:{
-    },
-    data () {
-      return {
-        //分公司id串
-        areaShow:false,
-        areatype:'小区',
-        arearow:{},
+export default {
+  title: '小区管理',
+  components: {},
+  data() {
+    return {
+      //分公司id串
+      areaShow: false,
+      areatype: '小区',
+      arearow: {},
+    }
+  },
+  ready() {
+  },
+  props: {},
+  methods: {
+    selected(obj) {
+      if (obj.val && obj.val.id) {
+        this.areaShow = true
+        this.$refs.addareamsg.cleardara()
+        this.$refs.addareamsg.operation = 'modify'
+        this.$refs.addareamsg.areatype = '小区'
+        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()
       }
+    }
+  },
+  events: {
+    'add'() {
+      this.areaShow = true
+      this.$refs.addareamsg.cleardara()
+      this.$refs.addareamsg.operation = 'add'
+      this.$refs.addareamsg.areatype = '小区'
+      this.$refs.addareamsg.oldsize = 0
+      this.$refs.addareamsg.initdata()
     },
-    ready(){
-    },
-    props:{
+    'modify'(area) {
 
     },
-    methods:{
-      selected(obj){
-        if(obj.val&&obj.val.id){
-          this.areaShow=true
-          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)
-          this.$refs.addareamsg.initdata()
-        }
-      }
+    'confirm'() {
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+      this.areaShow = false
+    },
+    'cancel'() {
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+      this.areaShow = false
+    },
+    'search'() {
+      this.areaShow = false
     },
-    events:{
-      'add'(){
-        this.areaShow=true
-        this.$refs.addareamsg.cleardara()
-        this.$refs.addareamsg.operation='add'
-        this.$refs.addareamsg.areatype='小区'
-        this.$refs.addareamsg.initdata()
-      },
-      'modify'(area){
-
-      },
-      'confirm' () {
-        this.$refs.arealist.$refs.paged.$refs.cri.search()
-        this.areaShow = false
-      },
-      'cancel' () {
-        this.$refs.arealist.$refs.paged.$refs.cri.search()
-        this.areaShow = false
-      },
-      'search' () {
-        this.areaShow = false
-      },
-    }
   }
+}
 </script>
 

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>