address-client 3.2.31 → 3.2.33-1

package/build/dev-server.js

@@ -10,36 +10,73 @@ var proxy = httpProxy.createProxyServer()
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var str = 'http://127.0.0.1:8090', str2= 'http://192.168.50.4:8400'
+var str = 'https://qnjtkf.cn:8400', str2= 'https://qnjtkf.cn:8400'
+var str3= 'https://qnjtkf.cn:8400'
 var proxyTable = {
-
+  '/rs/sql':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/webapps':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
   '/rs/logic/getLogin': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/logic/getInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true,
+  },
+  '/rs/logic/getSaleInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/logic':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
   '/rs/vue': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/user': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/db': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/search': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
   '/rs/data': {
-    target: str2
-  },
-  '/rs/logic/getInitData': {
-    target: str2
-  },
-  '/rs/logic/getSaleInitData': {
-    target: str2
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs': {
     // target: 'http://192.168.50.199:8300'
-    target: str
+    target: str3,
+    secure:true,
+    changeOrigin:true
   }
 }
 

package/package.json

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

package/src/components/AddressList.vue

@@ -183,14 +183,16 @@
     </criteria-paged>
   </div>
   <work-busy :is-busy='isbusy'></work-busy>
-  <modal :show.sync="showFile" width="480px" v-ref:modal backdrop="true">
+  <modal :show.sync="showFile" width="600px"  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>
+        <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="downloadFiles()">模板下载
+        </button>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer" style="display: none"></footer>
@@ -327,6 +329,19 @@
       //this.$refs.paged.$refs.grid.selectInit()
     },
     methods: {
+      downloadFiles(){
+        let downurl='rs/downloadfile/file?filename=地址导入Excel模板';
+        this.$resetget(downurl,{}).then(res=>{
+          var link = document.createElement('a');
+          link.target="_blank"
+          link.href =downurl ;
+          link.setAttribute("download", "地址导入Excel模板.xlsx"); //指定下载后的文件名，防跳转
+          document.body.appendChild(link);
+          link.click();
+        })
+
+
+      },
       getotherfooter() {
         // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
@@ -421,11 +436,11 @@
         this.userInfos = []
         this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
           this.userInfos[n] = {
-            userid: row.id,
+            addressid: row.id,
             f_residential_area: row.f_residential_area,
             f_street: row.f_street,
             f_address: row.f_address,
-            f_address_rest: row.f_street + row.f_residential_area + (row.f_building?row.f_building+row.f_building_suffix:'') + (row.f_unit?row.f_unit+row.f_unit_suffix:'') + (row.f_floor?row.f_floor+row.f_floor_suffix:'') + (row.f_room?row.f_room+row.f_room_suffix:'')
+            f_address_rest: (row.f_building?row.f_building+row.f_building_suffix:'') + (row.f_unit?row.f_unit+row.f_unit_suffix:'') + (row.f_floor?row.f_floor+row.f_floor_suffix:'') + (row.f_room?row.f_room+row.f_room_suffix:'')
           }
         })
         let modifyBatchData = {

package/src/components/AddressModel.vue

@@ -1,95 +1,95 @@
-<template>
-  <modal :show.sync="isshow" :width='width'  v-ref:modal backdrop="false">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="closeTree"><span>&times;</span></button>
-      <h4 class="modal-title">地址管理</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="from-group" style="height: 450px;overflow: auto;">
-        <address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
-        <!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect  :show="showType" :value="value"  @re-ref="selectclick"></address-select>-->
-      </div>
-    </article>
-    <footer slot="modal-footer">
-      <button  type="button" class="btn btn-success" @click='confirm'>确认</button>
-    </footer>
-  </modal>
-</template>
-
-<script>
-  export default {
-    name: "AddressModel",
-    title: '地址管理弹窗',
-    props: {
-      // 地址查询方式
-      isquery: {
-        type: Boolean,
-        default: true,
-      },
-      //位置信息
-      f_location: {
-        type: Object,
-        default: {
-          f_locationId: '1535',
-          f_locationType: 't_organization',
-        }
-      },
-      //是否显示
-      isshow: {
-        type: Boolean,
-        default : false,
-      },
-      // 是否选中
-      isselect: {
-        type: Boolean,
-        default: false,
-      },
-      // 默认显示地址
-      value:{
-        type: Object
-      },
-      // 下拉选择 || 树选择
-      showType: {
-        type: Boolean,
-        default: false
-      },
-      // 是否显示批量添加
-      isbasch: {
-        type: Boolean,
-        default: true,
-      }
-    },
-    data(){
-      return{
-        width: '90%'
-      }
-    },
-    methods:{
-      confirm(){
-        this.$emit('addressno')
-      },
-      // 关闭 弹窗
-      closeTree() {
-        this.isshow = false
-        this.$emit('addressno')
-      }
-      // 选中
-      // selectclick(newobj, address) {
-      //   this.$emit('re-ref', newobj, address)
-      // }
-    },
-    watch:{
-      //显示改变且为true
-      'isshow'(val){
-        if(val){
-          //刷新数据
-          this.$refs.addresstree.init()
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <modal :show.sync="isshow" :width='width'  v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeTree"><span>&times;</span></button>
+      <h4 class="modal-title">地址管理</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group" style="height: 450px;overflow: auto;">
+        <address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
+        <!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect  :show="showType" :value="value"  @re-ref="selectclick"></address-select>-->
+      </div>
+    </article>
+    <footer slot="modal-footer">
+      <button  type="button" class="btn btn-success" @click='confirm'>确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+  export default {
+    name: "AddressModel",
+    title: '地址管理弹窗',
+    props: {
+      // 地址查询方式
+      isquery: {
+        type: Boolean,
+        default: true,
+      },
+      //位置信息
+      f_location: {
+        type: Object,
+        default: {
+          f_locationId: '1535',
+          f_locationType: 't_organization',
+        }
+      },
+      //是否显示
+      isshow: {
+        type: Boolean,
+        default : false,
+      },
+      // 是否选中
+      isselect: {
+        type: Boolean,
+        default: false,
+      },
+      // 默认显示地址
+      value:{
+        type: Object
+      },
+      // 下拉选择 || 树选择
+      showType: {
+        type: Boolean,
+        default: false
+      },
+      // 是否显示批量添加
+      isbasch: {
+        type: Boolean,
+        default: true,
+      }
+    },
+    data(){
+      return{
+        width: '90%'
+      }
+    },
+    methods:{
+      confirm(){
+        this.$emit('addressno')
+      },
+      // 关闭 弹窗
+      closeTree() {
+        this.isshow = false
+        this.$emit('addressno')
+      }
+      // 选中
+      // selectclick(newobj, address) {
+      //   this.$emit('re-ref', newobj, address)
+      // }
+    },
+    watch:{
+      //显示改变且为true
+      'isshow'(val){
+        if(val){
+          //刷新数据
+          this.$refs.addresstree.init()
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/AreaList.vue

@@ -321,7 +321,7 @@
         if (this.f_filialeids) {
           if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
             this.showDelete = true
-            let condition = `a.f_orgid = '${this.f_filialeids}'`
+            let condition = `a.f_orgid = '${this.$login.f.orgid}'`
             let req = await this.$resetpost('rs/sql/address_getresidential', {
               data: {
                 condition: condition

package/src/components/UserAddress.vue

@@ -431,7 +431,7 @@
         this.areaslist = []
         // this.model.f_residential_area_id = null
         // this.model.f_residential_area = null
-        let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and  a.f_orgid = '${this.f_filialeids}'`
+        let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and  a.f_orgid = '${this.$login.f.orgid}'`
         let req = await this.$resetpost('rs/sql/address_getresidential', {
           data: {
             condition: condition
@@ -466,9 +466,9 @@
         this.model.f_address_state = '已通气'
         this.initAreas(this.f_filialeids)
         // 添加特殊地址选省市区
-        this.initpcds(` f_orgid = '${this.f_filialeids}'`)
-        this.initstreets(` f_orgid = '${this.f_filialeids}' `)
-        this.initareas(` f_orgid = '${this.f_filialeids}'`)
+        this.initpcds(` f_orgid = '${this.$login.f.orgid}'`)
+        this.initstreets(` f_orgid = '${this.$login.f.orgid}' `)
+        this.initareas(` f_orgid = '${this.$login.f.orgid}'`)
 
       },
 

package/src/filiale/dongguan/AddStreetOrPcd.vue

@@ -245,7 +245,7 @@
             tablename: 'divisions_of_china',
             condition: 'areaCode is null'
           }
-        }).then(res => {
+        },{resolveMsg: null,rejectMsg: null}).then(res => {
           this.provinceOptions = this.handleTree(res.data, 'code', 'parentcode')
         })
       },
@@ -364,7 +364,7 @@
         this.pcdmodel.f_depid = this.$login.f.depids
         this.pcdmodel.f_depname = this.$login.f.deps
         this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
-        await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
+        await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel,{resolveMsg: null,rejectMsg: null})
       },
       //保存街道
       async savestreet(){
@@ -377,7 +377,7 @@
         this.streetmodel.f_depname = this.$login.f.deps
         this.streetmodel.f_pcd=this.findbyid(this.pcdslist,this.streetmodel.f_pcd_id).f_pcd
         console.log('获取街道model', this.streetmodel)
-        await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
+        await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel,{resolveMsg: null,rejectMsg: null})
       },
       cancel(){
         this.cleardara()

package/src/filiale/qianneng/AddressList.vue

@@ -34,8 +34,8 @@
             </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_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_new button_spacing" style="width: max-content" v-show="this.$login.r.includes('批量修改')" @click="$parent.$parent.modifyBatch()">批量修改</button>
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
               <button class="button_export button_spacing"  @click="$parent.$parent.importAddress('导入')">模板导入</button>
@@ -122,6 +122,17 @@
                         close-on-select>
               </v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">地区类型</label>
+              <v-select
+                class="select_list select"
+                :value.sync="model.f_iscity"
+                v-model="model.f_iscity"
+                :options='$parent.$parent.iscity' placeholder='地区类型'
+                condition="a.f_iscity = '{}'"
+                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"
@@ -154,6 +165,7 @@
           <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>
@@ -172,6 +184,7 @@
           <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_iscity}}</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_enter_number}}</nobr></td>
@@ -261,7 +274,9 @@
     data () {
       return {
         criteriaShow: false,
+        // rs/sql/address_singleTableOrderBy
         model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
+        //address_getAddress params:{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}
         config: {
           // 导出列要和查询列相同
           excelHeaders: {
@@ -277,11 +292,13 @@
             'f_floor':'楼层',
             'f_room':'门牌号',
             'f_address':'详细地址',
+            'f_iscity':'地区类型',
             'f_address_state':'地址状态',
             'f_create_date':'时间',
             'f_state':'状态'
           },
         },
+        iscity:[{label:'市区',value:'市区'},{label:'乡镇',value:'乡镇'},{label:'全部',value:''}],
         isbusy:false,
         addflag: false,
         addtitle:'',
@@ -398,7 +415,7 @@
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
-        args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+        args.condition =  `${args.condition} and f_filialeid = '${this.f_filialeids}'`
         this.model.search(args.condition, args.model)
       },
 
@@ -613,7 +630,7 @@
       },
       getCondition() {
         return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and a.f_filialeid = '${this.f_filialeids}'`}
+          condition: `${this.$refs.paged.$refs.cri.condition}` + `and f_filialeid = '${this.f_filialeids}'`}
       }
     }