address-client 3.2.32 → 3.2.34

package/build/dev-server.js

@@ -11,35 +11,66 @@ 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:8078', str2= 'http://192.168.50.4:8400/'
+var str3= 'https://qnjtkf.cn:7400'
 var proxyTable = {
-
+  '/rs/sql':{
+    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.32",
+  "version": "3.2.34",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

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>
@@ -261,7 +261,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: {
@@ -398,7 +400,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 +615,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}'`}
       }
     }
 

package/src/filiale/qianneng/UserAddress.vue

@@ -8,6 +8,10 @@
           <label for="true">单户</label>
           <input type="radio" id="false" value="more" v-model="onedata">
           <label for="false">多户</label>
+          <button class="button_new-1 button_spacing" v-if="false" v-show=" $login.f.f_role_name.includes('管理员') "style="width: max-content;position: fixed;right: 20px" @click="add('非民用')">添加特殊地址</button>
+        </div>
+        <div class="form-group" v-if="usertype&&!model.id&&!config.hasnumber" style="height: 30.5px">
+          <button class="button_new-1 button_spacing" style="width: max-content;position: fixed;right: 20px" @click="add('民用')">添加民用地址</button>
         </div>
         <!--单个录入-->
         <div v-if="onedata=='one'" class="row">
@@ -15,6 +19,7 @@
                :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']" v-if="!usertype">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;省&ensp;市&ensp;区</label>
             <input type="text" style="width:41%" v-show="false" v-model="model.f_pcd_id"
+                   v-validate:f_pcd_id='{required: true }'
             >
             <v-select :value.sync="model.f_pcd_id" :value-single="true"
                       :options='pcdslist' placeholder='请选择'
@@ -36,6 +41,7 @@
                :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&emsp;&emsp;街道/乡镇</label>
             <input type="text" style="width:41%" v-show="false" v-model="model.f_street_id"
+                   v-validate:f_street_id='{required: true }'
             >
             <v-select :value.sync="model.f_street_id" :value-single="true"
                       :options='streetslist' placeholder='请选择'
@@ -92,6 +98,7 @@
               @change="changecity"
               close-on-select>
             </v-select>
+
           </div>
           <div v-if="!usertype" class="col-sm-6 form-group" :class="[$v.f_building_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;楼&emsp;&emsp;号</label>
@@ -113,13 +120,12 @@
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
             />
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group "
+          <div v-if="!usertype" class="col-sm-6"
                :class="[$v.f_room.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">&emsp;&emsp;&nbsp;门&ensp;牌&ensp;号</label>
             <input type="text" style="width:40%" v-model="model.f_room" class="input_search" placeholder="门牌号"
                    v-validate:f_room='{required: true }'/>
-            <input type="text" style="width:20%" v-model="model.f_room_suffix" class="input_search"
-            />
+            <input type="text" style="width:auto;margin-top: -9px;margin-left: 105px" v-model="model.f_room_suffix" placeholder="特殊信息" class="input_search"/>
           </div>
           <div class="col-sm-6 form-group">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;地址状态</label>
@@ -137,6 +143,13 @@
             &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
           </div>
 
+          <div v-if="!usertype" class="col-sm-12 form-group "
+               :class="[$v.f_address.required ? 'has-error' : 'has-success']">
+            <label for="f_address" class="font_normal_body">&emsp;&emsp;&nbsp;详细地址</label>
+            <input type="text" style="width:80%" v-model="model.f_address" class="input_search" placeholder="详细地址"
+                   v-validate:f_address='{required: true }'/>
+          </div>
+
           <div v-if="usertype" class="col-sm-12 form-group "
                :class="[$v.f_address.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">&emsp;&emsp;&nbsp;详细地址</label>
@@ -187,6 +200,7 @@
                :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;省&ensp;市&ensp;区</label>
             <input type="text" style="width:60%" v-show="false" v-model="model.f_pcd_id"
+                   v-validate:f_pcd_id='{required: true }'
             >
             <v-select :value.sync="model.f_pcd_id" :value-single="true"
                       :options='pcdslist' placeholder='请选择'
@@ -197,6 +211,7 @@
                :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;街&emsp;&emsp;道</label>
             <input type="text" style="width:60%" v-show="false" v-model="model.f_street_id"
+                   v-validate:f_street_id='{required: true }'
             >
             <v-select :value.sync="model.f_street_id" :value-single="true"
                       :options='streetslist' placeholder='请选择'
@@ -349,7 +364,7 @@
     await self.$getConfig(self, 'UserAddress')
     console.log('原地址配置',self.config)
     console.log('获取地址配置',self.config)
-    Object.assign(self.model, self.config)
+    // Object.assign(self.model, self.config)
   }
 
   export default {
@@ -392,19 +407,19 @@
           f_building: '',
           f_building_start: '',
           f_building_end: '',
-          f_building_suffix: '',
+          f_building_suffix: '号楼',
           f_unit: '',
           f_unit_start: '',
           f_unit_end: '',
-          f_unit_suffix: '',
+          f_unit_suffix: '单元',
           f_floor: '',
           f_floor_start: '',
           f_floor_end: '',
-          f_floor_suffix: '',
+          f_floor_suffix: '层',
           f_room: '',
           f_room_start: '',
           f_room_end: '',
-          f_room_suffix: '',
+          f_room_suffix: '室',
           //详细地址
           f_address: '',
           //单位名称
@@ -432,13 +447,24 @@
     props: ['f_filialeids', 'row','operation','usertype'],
    async ready(){
       this.initdata()
-      getAreaConfig(this)
+      // getAreaConfig(this)
+     //打印config
+     console.log(this.config)
       this.model.f_building_suffix=this.config.f_building_suffix
       this.model.f_unit_suffix=this.config.f_unit_suffix
       this.model.f_floor_suffix=this.config.f_floor_suffix
       this.model.f_room_suffix=this.config.f_room_suffix
     },
     methods: {
+      //添加方法
+      add(val){
+        if (this.f_filialeids) {
+          // this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add',val)
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
       async sliceChange(slice){
         this.areaschoice=[]
         if(slice){
@@ -457,7 +483,8 @@
         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}'`
+        // isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and
+        let condition = `a.f_orgid = '${this.f_filialeids}'`
         let req = await this.$resetpost('rs/sql/address_getresidential', {
           data: {
             condition: condition
@@ -472,6 +499,7 @@
             id: row.id
           })
         })
+        console.log("获取到的redata",redata)
         this.areaslist=redata
       },
       standardyanzheng() {
@@ -581,6 +609,14 @@
           }
         }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
         let redata = []
+        if (req.data.length === 0){
+          redata.push({
+            label: '['+row.f_street+']'+'无',
+            value: '',
+            data: '',
+            id: ''
+          })
+        }
         req.data.forEach((row) => {
           redata.push({
             label: '['+row.f_street+']'+row.f_residential_area,
@@ -604,6 +640,12 @@
           }
         }, {resolveMsg: null, rejectMsg: '获取楼栋失败!'})
         let redata = []
+        if(req.data.length === 0){
+          redata.push({
+            label: '无',
+            value: ' ',
+          })
+        }
         req.data.forEach((row) => {
           redata.push({
             label: row.f_building,
@@ -671,7 +713,9 @@
           this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
           this.model.slice_area = selectArea.f_slice_area
           // 拼接地址
-          this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
+          if(selectArea.f_residential_area !== '无'){
+            this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
+          }
           this.getbuildingList(`f_filialeid = '${this.f_filialeids}' and f_residential_area_id ='${selectArea.id}'`)
         }
         this.$nextTick(() => {
@@ -724,10 +768,14 @@
                   console.log('批量', this.model)
                   let data=Object.assign({},this.model)
                   data.f_create_person= this.$login.f.name
-                  if ((i+'').length == 1) {
-                    data.f_building= data.f_building_prefix + '0' +i
-                  } else {
-                    data.f_building= data.f_building_prefix + '' +i
+                  if ( i != '无'){
+                    if ((i+'').length == 1) {
+                      data.f_building= data.f_building_prefix + '0' +i
+                    } else {
+                      data.f_building= data.f_building_prefix + '' +i
+                    }
+                  }else {
+                    data.f_building = data.f_building_prefix + ''
                   }
                   if ((j+'').length == 1) {
                     data.f_unit= data.f_unit_prefix + '0'+j
@@ -823,6 +871,7 @@
             this.model.f_slice_area = this.model.slice_area
           }
         }
+
         if (( this.model.f_unit+'').length == 1) {
           this.model.f_unit= '0'+ this.model.f_unit
         }
@@ -847,7 +896,7 @@
           this.model.f_pcd=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
           this.model.f_street=this.findbyid(this.streetslist,this.model.f_street_id).f_street
           this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
-          if (( this.$refs.f_building_id.selectedItems+'').length == 1) {
+          if (( this.$refs.f_building_id.selectedItems+'').length == 1 && this.$refs.f_building_id.selectedItems!= '无') {
             this.model.f_building= '0'+ this.$refs.f_building_id.selectedItems
           }else{
             this.model.f_building = this.$refs.f_building_id.selectedItems
@@ -857,7 +906,7 @@
             this.$showMessage('请选择楼栋数据!!!')
             return
           }
-          this.model.f_address = this.model.f_street + this.model.f_residential_area +  (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
+          this.model.f_address = this.model.f_street + (this.model.f_residential_area!='无'?this.model.f_residential_area:'') +  (this.model.f_building&&this.model.f_building!='无'?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
         }
         await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
       },