address-client 1.3.55 → 1.3.57-2

package/src/components/AddressManage.vue

@@ -1,92 +1,113 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="flex" style="flex: 1; width:60%">
-      <address-list @select-changed="selected" v-ref:addresslist :f_filialeids.sync="f_filialeids"></address-list>
-    </div>
-    <div v-show="useraddressShow" style="width: 40%">
-      <div class="flex">
-        <user-address v-ref:useraddressmsg
-                      :f_filialeids.sync="f_filialeids" :row="row"></user-address>
-
-        <user-address-change v-if="addressId" :address_id="addressId"></user-address-change>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '地址管理',
-    components:{
-    },
-    data () {
-      return {
-        //分公司id串
-        f_filialeids: this.$login.f.f_orgids,
-        area: [],
-        street: [],
-        residential: [],
-        row: {},
-        useraddressShow: false,
-        addressId: null
-      }
-    },
-    props:{
-
-    },
-    methods:{
-      selected(obj){
-        if(obj.val&&obj.val.id){
-          // 呼叫中心需要
-          this.$dispatch('re-ref', obj.val)
-          this.addressId=obj.val.id
-          this.useraddressShow=true
-          this.$refs.useraddressmsg.cleardara()
-          this.$refs.useraddressmsg.usertype=obj.val.f_user_type
-          this.$refs.useraddressmsg.operation='modify'
-          this.$refs.useraddressmsg.onedata='one'
-          this.$refs.useraddressmsg.model=Object.assign({},obj.val)
-          if(obj.val.f_special=='1'){
-            this.$refs.useraddressmsg.usertype = true
-          }else{
-            this.$refs.useraddressmsg.usertype = false
-          }
-          this.$refs.useraddressmsg.initdata()
-        }
-      }
-    },
-    events:{
-      'add'(val){
-        this.useraddressShow = true
-        this.$refs.useraddressmsg.cleardara()
-        this.addressId=null
-        //true为新增特殊地址
-        if (val!='民用') {
-          //非民用
-          this.$refs.useraddressmsg.usertype = true
-          this.$refs.useraddressmsg.onedata = 'one'
-        }else{
-          this.$refs.useraddressmsg.usertype = false
-        }
-        this.$refs.useraddressmsg.operation='add'
-        this.$refs.useraddressmsg.initdata()
-      },
-      'confirm' () {
-        console.log('地址管理变更。。')
-        this.addressId=null
-        this.$refs.addresslist.$refs.paged.$refs.cri.search()
-        this.useraddressShow = false
-      },
-      'modify'(area){
-
-      },
-      'cancel' () {
-        this.addressId=null
-        this.$refs.addresslist.$refs.paged.$refs.cri.search()
-        this.useraddressShow = false
-      },
-    }
-  }
-</script>
-<style>
-</style>
+<template>
+  <div id="unit" class="flex-row">
+    <div class="flex" style="flex: 1; width:60%">
+      <address-list @select-changed="selected" v-ref:addresslist :f_filialeids.sync="f_filialeids"></address-list>
+    </div>
+    <div v-show="useraddressShow" style="width: 40%">
+      <div class="flex">
+        <user-address v-ref:useraddressmsg
+                      :f_filialeids.sync="f_filialeids" :row="row"></user-address>
+
+        <user-address-change v-if="addressId" :address_id="addressId"></user-address-change>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '地址管理',
+    components:{
+    },
+    data () {
+      return {
+        //分公司id串
+        f_filialeids: this.$login.f.f_orgids,
+        area: [],
+        street: [],
+        residential: [],
+        row: {},
+        useraddressShow: false,
+        addressId: null
+      }
+    },
+    props:{
+      ishujiao:{
+        type: Boolean,
+        default: false
+      }
+    },
+    methods:{
+      selected(obj){
+        if(obj.val&&obj.val.id){
+          // 呼叫中心需要
+          this.row = obj.val
+          this.$refs.useraddressmsg.revise = true
+          // this.$dispatch('re-ref', obj.val)
+          this.addressId=obj.val.id
+          this.useraddressShow=true
+          this.$refs.useraddressmsg.cleardara()
+          this.$refs.useraddressmsg.usertype=obj.val.f_user_type
+          this.$refs.useraddressmsg.operation='modify'
+          this.$refs.useraddressmsg.onedata='one'
+          this.$refs.useraddressmsg.model=Object.assign({},obj.val)
+          if(obj.val.f_special=='1'){
+            this.$refs.useraddressmsg.usertype = true
+          }else{
+            this.$refs.useraddressmsg.usertype = false
+          }
+          this.$refs.useraddressmsg.initdata()
+        }
+      }
+    },
+    events:{
+      'add'(val){
+        this.useraddressShow = true
+        this.$refs.useraddressmsg.cleardara()
+        this.addressId=null
+        //true为新增特殊地址
+        if (val!='民用') {
+          //非民用
+          this.$refs.useraddressmsg.usertype = true
+          this.$refs.useraddressmsg.onedata = 'one'
+        }else{
+          this.$refs.useraddressmsg.usertype = false
+        }
+        this.$refs.useraddressmsg.operation='add'
+        this.$refs.useraddressmsg.initdata()
+      },
+      'confirm' () {
+        console.log('地址管理变更。。')
+        this.addressId=null
+        this.$refs.addresslist.$refs.paged.$refs.cri.search()
+        this.useraddressShow = false
+      },
+      'modify'(area){
+
+      },
+
+      'address_select'(){
+        console.log("我背选中了",JSON.stringify(this.row) )
+
+        if(this.$refs.useraddressmsg.revise){
+          //看看地址是否上传工单
+          this.$resetpost('rs/sql/address_singleTable',{data: {items: 'id',tablename: 't_service',condition: `f_addressid='${this.row.id}'`}}, {resolveMsg: null, rejectMsg: null}).then((rs)=>{
+            if(rs.data.length>0){
+              this.$showAlert('该地址已下发通气单','warning',900)
+            }else{
+              this.$dispatch('re-ref',this.row)
+              console.log("返回事件",this.row)
+            }
+          })
+        }
+      },
+      'cancel' () {
+        this.addressId=null
+        this.$refs.addresslist.$refs.paged.$refs.cri.search()
+        this.useraddressShow = false
+      },
+    }
+  }
+</script>
+<style>
+</style>

package/src/components/AreaFiles.vue

@@ -1,80 +1,80 @@
-<template>
-  <div style="width: auto;">
-    <partial-view v-ref:pv @condition-changed="selfSearch">
-      <criteria-paged :model="model" v-ref:paged :pager="false">
-        <criteria partial='criteria' v-ref:criteria>
-          <div novalidate class="flex-row auto" partial>
-            <div class="form-group" style="flex: 1;">
-              <input type="text" class="form-control" v-model="model.f_residential_area"
-                     condition="f_residential_area like '%{}%'" placeholder='小区名称'>
-            </div>
-            <div class="form-group" style="margin-right: 0px;" id='filesArea'>
-              <button class="btn btn-success width-100" @click="search()">查询</button>
-            </div>
-          </div>
-        </criteria>
-        <data-grid :model="model" partial='list' v-ref:grid >
-          <template partial='head'>
-            <tr>
-              <th>序号</th>
-              <th>小区详细地址</th>
-              <th>操作</th>
-            </tr>
-          </template>
-          <template partial='body'>
-            <td id = "1" style="text-align: center;">{{$index + 1}}</td>
-            <td>{{row.f_area_address}}-{{row.f_residential_area}}</td>
-            <td style="text-align: center;">
-              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$parent.foundFile(row)">建档</button>
-            </td>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </partial-view>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-
-  export default {
-    title: '小区列表',
-    data () {
-      return {
-        model: new PagedList('rs/sql/address_getArea', 500, {orderitem: '"a.id desc"'})
-      }
-    },
-    props: ['f_filialeid'],
-    ready () {
-      this.search({condition: '1=1'})
-    },
-    methods: {
-      foundFile (row) {
-        console.log('小区建档', row)
-        this.$emit('re-ref', row)
-      },
-      search (obj) {
-        obj.condition += ` and a.f_filialeids  =  '${this.f_filialeid}'`
-
-        this.$refs.pv.load('rs/sql/address_getArea', {data: {orderitem: 'a.id desc', condition: obj.condition}}).then((a) => {
-          if (a.data.length === 0) {
-            this.model.state = '错误'
-            this.model.error = '没有相关的小区信息'
-          } else {
-            this.model.state = '正确'
-            this.model.rows = a.data
-          }
-          this.$emit("ready")
-        })
-      },
-      selfSearch (datas) {
-        datas.condition += ` and a.f_filialeids = '${this.f_filialeid}'`
-        this.model.search(datas.condition, this.model)
-      },
-      // 主要提供外部组件调用，刷新数据
-      reflash () {
-        this.$refs.paged.$refs.criteria.search()
-      }
-    }
-  }
-</script>
+<template>
+  <div style="width: auto;">
+    <partial-view v-ref:pv @condition-changed="selfSearch">
+      <criteria-paged :model="model" v-ref:paged :pager="false">
+        <criteria partial='criteria' v-ref:criteria>
+          <div novalidate class="flex-row auto" partial>
+            <div class="form-group" style="flex: 1;">
+              <input type="text" class="form-control" v-model="model.f_residential_area"
+                     condition="f_residential_area like '%{}%'" placeholder='小区名称'>
+            </div>
+            <div class="form-group" style="margin-right: 0px;" id='filesArea'>
+              <button class="btn btn-success width-100" @click="search()">查询</button>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid >
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>小区详细地址</th>
+              <th>操作</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td id = "1" style="text-align: center;">{{$index + 1}}</td>
+            <td>{{row.f_area_address}}-{{row.f_residential_area}}</td>
+            <td style="text-align: center;">
+              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.$parent.foundFile(row)">建档</button>
+            </td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </partial-view>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    title: '小区列表',
+    data () {
+      return {
+        model: new PagedList('rs/sql/address_getArea', 500, {orderitem: '"a.id desc"'})
+      }
+    },
+    props: ['f_filialeid'],
+    ready () {
+      this.search({condition: '1=1'})
+    },
+    methods: {
+      foundFile (row) {
+        console.log('小区建档', row)
+        this.$emit('re-ref', row)
+      },
+      search (obj) {
+        obj.condition += ` and a.f_filialeids  =  '${this.f_filialeid}'`
+
+        this.$refs.pv.load('rs/sql/address_getArea', {data: {orderitem: 'a.id desc', condition: obj.condition}}).then((a) => {
+          if (a.data.length === 0) {
+            this.model.state = '错误'
+            this.model.error = '没有相关的小区信息'
+          } else {
+            this.model.state = '正确'
+            this.model.rows = a.data
+          }
+          this.$emit("ready")
+        })
+      },
+      selfSearch (datas) {
+        datas.condition += ` and a.f_filialeids = '${this.f_filialeid}'`
+        this.model.search(datas.condition, this.model)
+      },
+      // 主要提供外部组件调用，刷新数据
+      reflash () {
+        this.$refs.paged.$refs.criteria.search()
+      }
+    }
+  }
+</script>