address-client 3.0.24-72 → 3.0.24-76

package/package.json

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

package/src/components/AddressList.vue

@@ -121,6 +121,16 @@
                         close-on-select>
               </v-select>
             </div>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">状&emsp;&emsp;态</label>
+              <v-select :value.sync="model.f_state"
+                        class="select_list select"
+                        v-model="model.f_state"
+                        condition="a.f_state {}"
+                        :options='$parent.$parent.getstate' placeholder='地址状态'
+                        close-on-select>
+              </v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -139,6 +149,7 @@
             <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>门牌号</nobr></th>
             <th><nobr>详细地址</nobr></th>
             <th><nobr>地址状态</nobr></th>
+            <th><nobr>状态</nobr></th>
             <th><nobr>时间</nobr></th>
             <th><nobr>操作</nobr></th>
           </tr>
@@ -157,6 +168,7 @@
             <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_address_state}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_state ==='作废'?'作废':'有效'}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_create_date}}</nobr></td>
             <td style="text-align:center">
              <!-- <button type="button" name="button" class="btn btn-link"
@@ -212,7 +224,8 @@
             'f_room':'门牌号',
             'f_address':'详细地址',
             'f_address_state':'地址状态',
-            'f_create_date':'时间'
+            'f_create_date':'时间',
+            'f_state':'状态'
           },
         },
         isbusy:false,
@@ -225,7 +238,7 @@
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
-
+        getstate:[{label:'全部',value:''},{label:'有效',value:" = '有效' or a.f_state is null"},{label:'作废',value:" = '作废'"}],
         //文件上传弹框
         showFile: false,
         showrightchange:true

package/src/filiale/WEINAN/AddAreaMsg.vue

@@ -77,7 +77,7 @@
             <input type="text" style="width:60%" class="input_search"  v-model="areamodel.f_area_address"
                    class="form-control" placeholder="单位地址">
           </div>
-          <div v-if="f_special"
+          <div
                class="col-sm-6 form-group"
                :class="[$v.f_linkname.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">联&ensp;系&ensp;人</label>
@@ -85,7 +85,7 @@
                    class="form-control" placeholder="联系人"
                    v-validate:f_linkname='{required: true }'>
           </div>
-          <div v-if="f_special"
+          <div
                class="col-sm-6 form-group"
                :class="[$v.f_linkphone.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">联系电话</label>

package/src/filiale/tongchuan/AddAreaMsg.vue

@@ -38,7 +38,7 @@
               close-on-select search="true" @change="streetChange">
             </v-select>
           </div>
-          <div class="col-sm-6 form-group" :class="[$v.slice.required ? 'has-error' : 'has-success']">
+          <div class="col-sm-6 form-group" :class="[$v.slice.required ? 'has-error' : 'has-success']" v-if="false">
             <label class="font_normal_body">片&emsp;&emsp;区</label>
             <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
                    v-validate:slice='{required: true }'>

package/src/filiale/tongchuan/AddressList.vue

@@ -0,0 +1,379 @@
+<template>
+  <div class="flex" @keyup.enter="search">
+    <criteria-paged :model="model" v-ref:paged>
+      <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="$parent.$parent.style">
+              <label class="font_normal_body">组织机构</label>
+              <res-select
+                restype='organization'
+                          @res-select="$parent.$parent.getorg"
+                          is-mul="false"
+                          :initresid='$parent.$parent.curorgid'
+              >
+              </res-select>
+            </div>
+            <div :class="$parent.$parent.style" v-if="$parent.$parent.showrightchange">
+              <label class="font_normal_body">用户编号</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
+                      condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
+            </div>
+            <div v-if="$parent.$parent.showrightchange" :class="$parent.$parent.style">
+              <label class="font_normal_body">小&emsp;&emsp;区</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
+                      condition="a.f_residential_area like '%{}%'" placeholder="小区"
+                      :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
+            </div>
+            <!--<div v-if="$parent.$parent.showrightchange" :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.useraddressShow">-->
+            <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.showrightchange">
+              <label class="font_normal_body">楼&emsp;&emsp;号</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
+                      condition="a.f_building like '%{}%'" placeholder="楼号"
+                      :size="model.f_building ? model.f_building.length*2 : 6"/>
+            </div>
+            <div class="col-sm-4 form-group button-range" >
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_new button_spacing"  style="width: max-content" @click="$parent.$parent.add('民用')">添加民用</button>
+              <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <button class="button_export button_spacing"  @click="$parent.$parent.importAddress('导入')">模板导入</button>
+              <button class="button_export button_spacing"
+                      v-show="this.$login.r.includes('完善地址')"
+                      @click="$parent.$parent.importAddress('完善')">完善地址</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/exportfile"
+                            sql-name="addressGetAddress"
+                            template-name='地址管理查询导出'
+                            :choose-col="true"></export-excel>
+              <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">
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.showrightchange">
+              <label class="font_normal_body">用户编号</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
+                      condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
+            </div>
+            <div v-if="!$parent.$parent.showrightchange" :class="$parent.$parent.style">
+              <label class="font_normal_body">小&emsp;&emsp;区</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
+                      condition="a.f_residential_area like '%{}%'" placeholder="小区"
+                      :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
+            </div>
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
+              <label class="font_normal_body">楼&emsp;&emsp;号</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
+                      condition="a.f_building like '%{}%'" placeholder="楼号"
+                      :size="model.f_building ? model.f_building.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">单&emsp;&emsp;元</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_unit" style="width:60%"
+                      condition="a.f_unit like '%{}%'" placeholder="单元"
+                      :size="model.f_unit ? model.f_unit.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">楼&emsp;&emsp;层</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_floor" style="width:60%"
+                      condition="a.f_floor like '%{}%'" placeholder="楼层"
+                      :size="model.f_floor ? model.f_floor.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">门&ensp;牌&ensp;号</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_room" style="width:60%"
+                      condition="a.f_room like '%{}%'" placeholder="门牌号"
+                      :size="model.f_room ? model.f_room.length*2 : 6"/>
+            </div>
+<!--            <div :class="$parent.$parent.style">-->
+<!--              <label class="font_normal_body">小&emsp;&emsp;区</label>-->
+<!--              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"-->
+<!--                      condition="a.f_residential_area like '%{}%'" placeholder="小区"-->
+<!--                      :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>-->
+<!--            </div>-->
+
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">地址&emsp;ID</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.id" style="width:60%"
+                      condition="a.id = '{}'" placeholder="地址ID"
+              />
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">详细地址</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_address" style="width:60%"
+                      condition="a.f_address like '%{}%'" placeholder="详细地址"
+                      :size="model.f_address ? model.f_address.length*2 : 8"/>
+            </div>
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
+              <label class="font_normal_body">街&emsp;&emsp;道</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
+                      condition="f_street like '%{}%'" placeholder="街道"
+                      :size="model.f_street ? model.f_street.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">地址状态</label>
+              <v-select :value.sync="model.f_address_state"
+                        class="select_list select"
+                        v-model="model.f_address_state"
+                        condition="a.f_address_state = '{}'"
+                        :options='$parent.$parent.getaddresstate' placeholder='地址状态'
+                        close-on-select>
+              </v-select>
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">状&emsp;&emsp;态</label>
+              <v-select :value.sync="model.f_state"
+                        class="select_list select"
+                        v-model="model.f_state"
+                        condition="a.f_state {}"
+                        :options='$parent.$parent.getstate' placeholder='地址状态'
+                        close-on-select>
+              </v-select>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' style="overflow: auto" class="list_area table_sy"  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>用户编号</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>区/县</nobr></th>
+            <th><nobr>街道</nobr></th>
+            <th><nobr>小区(单位)</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼号</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>单元</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼层</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><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>{{$index + 1}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_building}}{{row.f_building_suffix}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_unit}}{{row.f_unit_suffix}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_address_state}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_state ==='作废'?'作废':'有效'}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_create_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 v-if="!row.f_useraddress_id" type="button" name="button" class="btn btn-danger"
+                      style="padding: 5px 12px"
+                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
+            </td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <work-busy :is-busy='isbusy'></work-busy>
+  <modal :show.sync="showFile" width="480px" v-ref:modal backdrop="true">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+      <h4 class="modal-title">选择文件</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="display: none"></footer>
+  </modal>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+  }
+  export default {
+    data () {
+      return {
+        criteriaShow: false,
+        model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_user_name':'用户姓名',
+            'f_userinfo_code':'用户编号',
+            'id':'地址ID',
+            'f_pcd':'区/县',
+            'f_slice_area':'片区',
+            'f_street':'街道',
+            'f_residential_area':'小区',
+            'f_building':'楼号',
+            'f_unit':'单元',
+            'f_floor':'楼层',
+            'f_room':'门牌号',
+            'f_address':'详细地址',
+            'f_address_state':'地址状态',
+            'f_create_date':'时间',
+            'f_state':'状态'
+          },
+        },
+        isbusy:false,
+        addflag: false,
+        addtitle:'',
+        other: [],
+        footer: [],
+        getfield: {},
+        imptype:'',
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+        getstate:[{label:'全部',value:''},{label:'有效',value:" = '有效' or a.f_state is null"},{label:'作废',value:" = '作废'"}],
+        //文件上传弹框
+        showFile: false,
+        showrightchange:true
+      }
+    },
+    title: '地址列表',
+    props:{
+      f_filialeids:{
+        type: String
+      },
+      style: {
+        type: String,
+        default: 'col-sm-2 '
+      }
+    },
+    ready(){
+      readyGen(this)
+      this.search()
+    },
+    methods: {
+      getotherfooter() {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other = [];
+        this.footer = [];
+        // let exportdata = this.getCondition;
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData = [], exportfield = this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      //添加方法
+      add(val){
+        if (this.f_filialeids) {
+          this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add',val)
+          this.showrightchange = false;
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      importAddress(val){
+        this.imptype = val
+        this.showFile = true
+      },
+      // 关闭文件上传对话框
+      closeFile() {
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+      },
+      //修改
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      async delete(row){
+        if(row.id >= 0){
+          var id = row.id
+          let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
+          if(userfiles.data.length){
+            this.$showAlert('该地址下已有正常表具档案,无法删除！','warning',1000)
+          }else{
+            this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+        this.model.search(args.condition, args.model)
+      },
+
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      }
+    },
+    events: {
+      onFileUpload: async function (file, res) {
+        this.isbusy = true
+        console.log("上传完毕"+JSON.stringify(res))
+        let data = {
+          filepath: res.f_downloadpath,
+          user:this.$login.f,
+          type :this.imptype
+        }
+        console.log("filepath="+JSON.stringify(data))
+        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+          this.isbusy = false
+          if(res.data.type=="success"){
+            this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
+          }else{
+            this.$showMessage(res.data.msg);
+          }
+          //关闭上传框
+          this.closeFile()
+          //重新查询
+          this.init()
+        }).catch(error=>{
+          this.isbusy = false
+        })
+      },
+      'onFileError'(error) {
+        this.$showAlert(error, 'warning', 2000)
+      }
+    },
+    computed: {
+      //地址状态下拉框
+      getaddresstate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
+      },
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + `and a.f_filialeid = '${this.f_filialeids}'`}
+      }
+    }
+
+  }
+</script>