address-client 3.0.17 → 3.0.19-wsd

package/src/components/AddressFiles.vue

@@ -1,153 +1,153 @@
-<template>
-  <div style="widows: auto;">
-    <criteria-paged :model="model" v-ref:paged :pager="false">
-      <criteria partial='criteria' @condition-changed='$parent.selfsearch' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <!--<div class="col-sm-4 ">-->
-            <!--<input  type="text" style="width:98%" class="input_search"  v-model="model.f_residential_arearea"-->
-            <!--condition="f_residential_area like '%{}%'" placeholder="小区"/>-->
-            <!--</div>-->
-            <!--<div class="col-sm-4 ">-->
-            <!--<input  type="text" style="width:98%" class="input_search"  v-model="model.f_building"-->
-            <!--condition="f_building like '%{}%'" placeholder="楼号"/>-->
-            <!--</div>-->
-            <div class="col-sm-9 ">
-              <input  type="text" class="input_search button_spacing"  v-model="model.f_address"
-                      condition="f_address like '%{}%'" placeholder="详细地址"/>
-            </div>
-
-            <div class="span" style="float:right;">
-              <button class="button_search button_spacing" @click="search()" >查询</button>
-              <!--<div style="float: right"  class="button_spacing" ></div>-->
-              <!--<div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
-            </div>
-          </div>
-          <!--<div class="row" v-show="$parent.$parent.criteriaShow" style="margin-top: 10px">-->
-          <!--<div class="col-sm-4 ">-->
-          <!--<input  type="text" style="width:98%" class="input_search "  v-model="model.f_unit"-->
-          <!--condition="f_unit like '%{}%'" placeholder="单元"/>-->
-          <!--</div>-->
-          <!--<div class="col-sm-4 ">-->
-          <!--<input  type="text" style="width:98%" class="input_search "  v-model="model.f_floor"-->
-          <!--condition="f_floor like '%{}%'" placeholder="楼层"/>-->
-          <!--</div>-->
-          <!--<div class="col-sm-4 ">-->
-          <!--<input  type="text" style="width:98%" class="input_search "  v-model="model.f_room"-->
-          <!--condition="f_room like '%{}%'" placeholder="门牌号"/>-->
-          <!--</div>-->
-          <!--<div class="col-sm-4 ">-->
-          <!--<v-select :value.sync="model.file_num" :options='$parent.$parent.filenums' placeholder='表具数'-->
-          <!--close-on-select-->
-          <!--v-model='model.file_num' condition="file_num {}" style="width: 98%"></v-select>-->
-          <!--</div>-->
-          <!--<div class="col-sm-8 ">-->
-          <!--<input  type="text" style="width:98%" class="input_search"  v-model="model.f_address"-->
-          <!--condition="f_address like '%{}%'" placeholder="详细地址"/>-->
-          <!--</div>-->
-          <!--</div>-->
-        </div>
-      </criteria>
-
-      <data-grid  :model="model" partial='list' v-ref:grid class="list_area table_sy" v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <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.f_address}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.file_num}}</nobr></td>
-            <td style="text-align:center">
-              <div v-if="row.file_num > 0 && !row.f_userinfo_id">
-                <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'complete')">完善档案</button>
-              </div>
-              <div v-if="row.file_num === 0">
-                <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'add')">添加表具</button>
-              </div>
-              <div v-if="row.file_num > 0 && row.f_userinfo_id && $parent.$parent.$parent.config.oneToMany">
-                <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'add')">添加表具</button>
-              </div>
-            </td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList, HttpResetClass } from 'vue-client'
-
-  let readySync = async function (self) {
-
-    await self.$refs.paged.$refs.cri.search()
-
-    // 获取地址管理特殊文件
-    let http = new HttpResetClass()
-
-    let getConfig = await http.load('GET', '/rs/vue/AddressList.json', {}, {resolveMsg: null, rejectMsg: null})
-
-    if (getConfig) {
-      Object.assign(self.config, self.config, getConfig.data)
-    }
-    console.log('获取到的地址配置文件', self.config)
-  }
-  export default {
-    data () {
-      return {
-        criteriaShow: false,
-        config: {
-          // 是否支持一对多
-          oneToMany: false
-        },
-        model: new PagedList('rs/sql/address_files',30,{orderitem: `'f_create_date desc'`}),
-        //分公司id串
-        f_filialeids: this.$login.f.orgid,
-        filenums: [{label: '全部', value: ''},{label: '多表', value: '> 1'}, {label: '一表', value: '= 1'}]
-      }
-    },
-    ready(){
-      readySync(this)
-    },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      selfsearch(args){
-        //添加分公司查询条件
-        args.condition =  `${args.condition} and f_filialeid = '${this.f_filialeids}'`
-        this.$refs.paged.$refs.grid.$el.scrollTop = 0
-        //执行查询
-        this.model.search(args.condition, args.model, args.condValue)
-      },
-      //清空
-      clear(){
-        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = ''
-        })
-      },
-      create(row, action){
-
-        console.log('点击的动作', action)
-
-        if (row.file_num > 0 && action === 'add') {
-          // 属于一址多表
-          this.$showMessage('该地址下已存在表具信息，确定要新加一个新表具吗？', ['confirm', 'cancel']).then((res) => {
-            if (res === 'confirm') {
-              //发出事件,用于建档或修正档案
-              this.$dispatch('buildfiles',row)
-            }
-          })
-        } else {
-          this.$dispatch('buildfiles',row)
-        }
-
-      }
-    }
-  }
-</script>
+<template>
+  <div style="widows: auto;">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.selfsearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <!--<div class="col-sm-4 ">-->
+            <!--<input  type="text" style="width:98%" class="input_search"  v-model="model.f_residential_arearea"-->
+            <!--condition="f_residential_area like '%{}%'" placeholder="小区"/>-->
+            <!--</div>-->
+            <!--<div class="col-sm-4 ">-->
+            <!--<input  type="text" style="width:98%" class="input_search"  v-model="model.f_building"-->
+            <!--condition="f_building like '%{}%'" placeholder="楼号"/>-->
+            <!--</div>-->
+            <div class="col-sm-9 ">
+              <input  type="text" class="input_search button_spacing"  v-model="model.f_address"
+                      condition="f_address like '%{}%'" placeholder="详细地址"/>
+            </div>
+
+            <div class="span" style="float:right;">
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+              <!--<div style="float: right"  class="button_spacing" ></div>-->
+              <!--<div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
+            </div>
+          </div>
+          <!--<div class="row" v-show="$parent.$parent.criteriaShow" style="margin-top: 10px">-->
+          <!--<div class="col-sm-4 ">-->
+          <!--<input  type="text" style="width:98%" class="input_search "  v-model="model.f_unit"-->
+          <!--condition="f_unit like '%{}%'" placeholder="单元"/>-->
+          <!--</div>-->
+          <!--<div class="col-sm-4 ">-->
+          <!--<input  type="text" style="width:98%" class="input_search "  v-model="model.f_floor"-->
+          <!--condition="f_floor like '%{}%'" placeholder="楼层"/>-->
+          <!--</div>-->
+          <!--<div class="col-sm-4 ">-->
+          <!--<input  type="text" style="width:98%" class="input_search "  v-model="model.f_room"-->
+          <!--condition="f_room like '%{}%'" placeholder="门牌号"/>-->
+          <!--</div>-->
+          <!--<div class="col-sm-4 ">-->
+          <!--<v-select :value.sync="model.file_num" :options='$parent.$parent.filenums' placeholder='表具数'-->
+          <!--close-on-select-->
+          <!--v-model='model.file_num' condition="file_num {}" style="width: 98%"></v-select>-->
+          <!--</div>-->
+          <!--<div class="col-sm-8 ">-->
+          <!--<input  type="text" style="width:98%" class="input_search"  v-model="model.f_address"-->
+          <!--condition="f_address like '%{}%'" placeholder="详细地址"/>-->
+          <!--</div>-->
+          <!--</div>-->
+        </div>
+      </criteria>
+
+      <data-grid  :model="model" partial='list' v-ref:grid class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <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.f_address}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.file_num}}</nobr></td>
+            <td style="text-align:center">
+              <div v-if="row.file_num > 0 && !row.f_userinfo_id">
+                <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'complete')">完善档案</button>
+              </div>
+              <div v-if="row.file_num === 0">
+                <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'add')">添加表具</button>
+              </div>
+              <div v-if="row.file_num > 0 && row.f_userinfo_id && $parent.$parent.$parent.config.oneToMany">
+                <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.create(row, 'add')">添加表具</button>
+              </div>
+            </td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList, HttpResetClass } from 'vue-client'
+
+  let readySync = async function (self) {
+
+    await self.$refs.paged.$refs.cri.search()
+
+    // 获取地址管理特殊文件
+    let http = new HttpResetClass()
+
+    let getConfig = await http.load('GET', '/rs/vue/AddressList.json', {}, {resolveMsg: null, rejectMsg: null})
+
+    if (getConfig) {
+      Object.assign(self.config, self.config, getConfig.data)
+    }
+    console.log('获取到的地址配置文件', self.config)
+  }
+  export default {
+    data () {
+      return {
+        criteriaShow: false,
+        config: {
+          // 是否支持一对多
+          oneToMany: false
+        },
+        model: new PagedList('rs/sql/address_files',30,{orderitem: `'f_create_date desc'`}),
+        //分公司id串
+        f_filialeids: this.$login.f.orgid,
+        filenums: [{label: '全部', value: ''},{label: '多表', value: '> 1'}, {label: '一表', value: '= 1'}]
+      }
+    },
+    ready(){
+      readySync(this)
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      selfsearch(args){
+        //添加分公司查询条件
+        args.condition =  `${args.condition} and f_filialeid = '${this.f_filialeids}'`
+        this.$refs.paged.$refs.grid.$el.scrollTop = 0
+        //执行查询
+        this.model.search(args.condition, args.model, args.condValue)
+      },
+      //清空
+      clear(){
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = ''
+        })
+      },
+      create(row, action){
+
+        console.log('点击的动作', action)
+
+        if (row.file_num > 0 && action === 'add') {
+          // 属于一址多表
+          this.$showMessage('该地址下已存在表具信息，确定要新加一个新表具吗？', ['confirm', 'cancel']).then((res) => {
+            if (res === 'confirm') {
+              //发出事件,用于建档或修正档案
+              this.$dispatch('buildfiles',row)
+            }
+          })
+        } else {
+          this.$dispatch('buildfiles',row)
+        }
+
+      }
+    }
+  }
+</script>

package/src/components/AddressList.vue

@@ -16,6 +16,12 @@
               >
               </res-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">&nbsp;&nbsp;用户编号&nbsp;&nbsp;</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
+                      condition="f_userinfo_code = '{}'" placeholder="用户编号"
+                      :size="model.f_userinfo_code ? model.f_userinfo_code.length*2 : 8"/>
+            </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
@@ -70,6 +76,7 @@
         <template partial='head'>
           <tr>
             <th><nobr>序号</nobr></th>
+            <th><nobr>用户编号</nobr></th>
             <th><nobr>区/县</nobr></th>
             <th><nobr>片区</nobr></th>
             <th><nobr>街道</nobr></th>
@@ -86,6 +93,7 @@
         <template partial='body'>
           <tr>
             <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</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>

package/src/components/AddressManage.vue

@@ -1,114 +1,114 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}">
-      <address-list @select-changed="selected" v-ref:addresslist :style="style"  :f_filialeids.sync="f_filialeids"></address-list>
-    </div>
-    <div v-show="useraddressShow"  class="binary-right">
-      <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.orgid,
-        area: [],
-        street: [],
-        residential: [],
-        row: {},
-        useraddressShow: false,
-        addressId: null,
-        style:'col-sm-2 '
-      }
-    },
-    props:{
-
-    },
-    methods:{
-      selected(obj){
-        this.style='col-sm-3 '
-        if(obj.val&&obj.val.id){
-          if (obj.val.f_filialeid != this.f_filialeids) {
-            this.refresh()
-            return
-          }
-          // 呼叫中心需要
-          this.$dispatch('re-ref', obj.val)
-          this.addressId=obj.val.id
-          this.useraddressShow=true
-          this.$refs.useraddressmsg.cleardara()
-          this.$refs.useraddressmsg.initdata()
-          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
-          }
-          if (obj.val.f_slice_area && obj.val.f_area_code) {
-            this.$refs.useraddressmsg.model.slice_area = [{
-              name: this.$refs.useraddressmsg.model.f_slice_area,
-              code: this.$refs.useraddressmsg.model.f_area_code
-            }]
-          }
-        }
-      },
-      refresh () {
-        this.addressId=null
-        this.useraddressShow = false
-        this.$refs.addresslist.$refs.paged.$refs.cri.search()
-      }
-    },
-    events:{
-      'add'(val){
-        this.style='col-sm-3 '
-        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.pcdslist=[]
-        this.$refs.useraddressmsg.streetslist=[]
-        this.$refs.useraddressmsg.areaslist=[]
-        this.$refs.useraddressmsg.initdata()
-      },
-      'confirm' () {
-        this.style='col-sm-2 '
-        this.addressId=null
-        this.$refs.addresslist.$refs.paged.$refs.cri.search()
-        this.useraddressShow = false
-      },
-      'modify'(area){
-        this.style='col-sm-2 '
-      },
-      'cancel' () {
-        this.style='col-sm-2 '
-        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="{'basic-main':!useraddressShow,'binary-left':useraddressShow}">
+      <address-list @select-changed="selected" v-ref:addresslist :style="style"  :f_filialeids.sync="f_filialeids"></address-list>
+    </div>
+    <div v-show="useraddressShow"  class="binary-right">
+      <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.orgid,
+        area: [],
+        street: [],
+        residential: [],
+        row: {},
+        useraddressShow: false,
+        addressId: null,
+        style:'col-sm-2 '
+      }
+    },
+    props:{
+
+    },
+    methods:{
+      selected(obj){
+        this.style='col-sm-3 '
+        if(obj.val&&obj.val.id){
+          if (obj.val.f_filialeid != this.f_filialeids) {
+            this.refresh()
+            return
+          }
+          // 呼叫中心需要
+          this.$dispatch('re-ref', obj.val)
+          this.addressId=obj.val.id
+          this.useraddressShow=true
+          this.$refs.useraddressmsg.cleardara()
+          this.$refs.useraddressmsg.initdata()
+          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
+          }
+          if (obj.val.f_slice_area) {
+            this.$refs.useraddressmsg.model.slice_area = [{
+              name: this.$refs.useraddressmsg.model.f_slice_area,
+              code: this.$refs.useraddressmsg.model.f_area_code
+            }]
+          }
+        }
+      },
+      refresh () {
+        this.addressId=null
+        this.useraddressShow = false
+        this.$refs.addresslist.$refs.paged.$refs.cri.search()
+      }
+    },
+    events:{
+      'add'(val){
+        this.style='col-sm-3 '
+        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.pcdslist=[]
+        this.$refs.useraddressmsg.streetslist=[]
+        this.$refs.useraddressmsg.areaslist=[]
+        this.$refs.useraddressmsg.initdata()
+      },
+      'confirm' () {
+        this.style='col-sm-2 '
+        this.addressId=null
+        this.$refs.addresslist.$refs.paged.$refs.cri.search()
+        this.useraddressShow = false
+      },
+      'modify'(area){
+        this.style='col-sm-2 '
+      },
+      'cancel' () {
+        this.style='col-sm-2 '
+        this.addressId=null
+        this.$refs.addresslist.$refs.paged.$refs.cri.search()
+        this.useraddressShow = false
+      },
+    }
+  }
+</script>
+<style>
+</style>