address-client 3.0.36-aodeToV4 → 3.0.38-aode

package/src/components/BatchOrders.vue

@@ -124,7 +124,7 @@
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <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"></footer>
@@ -140,7 +140,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getUserAddress',20,{}),
+        model: new PagedList('rs/sql/address_getUserAddress',20,{}),
         addflag: false,
         addtitle:'',
 
@@ -195,12 +195,12 @@
       async delete(row){
         if(row.id){
           var id = row.id
-          let service = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{resolveMsg: null, rejectMsg: null})
-          let userfiles = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
+          let service = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{resolveMsg: null, rejectMsg: null})
+          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(service.data.length || userfiles.data.length){
             this.$showAlert('该地址下已有工单或档案,无法删除!','warning',1000)
           }else{
-            this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
               this.$dispatch('cancel')
             })
           }
@@ -244,7 +244,7 @@
           this.all = true
           console.log(this.$refs.paged.$refs.cri.condition,"=============")
           let HttpReset = new HttpResetClass()
-          await HttpReset.load('POST', 'api/af-revenue/sql/address_getUserAddress?pageNo=1&pageSize=9999999', {
+          await HttpReset.load('POST', 'rs/sql/address_getUserAddress?pageNo=1&pageSize=9999999', {
             data: {
               condition: `${this.$refs.paged.$refs.cri.condition} and a.f_filialeid = '${this.f_filialeids}' `
             }
@@ -292,7 +292,7 @@
           user:this.$login.f
         }
         console.log("filepath="+JSON.stringify(data))
-        await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
           this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
           //关闭上传框
           this.closeFile()

package/src/components/NewAddressInfo.vue

@@ -75,7 +75,7 @@
 
   let getMeterType = function * (self) {
     if (self.row) {
-      let result = yield self.$resetpost('api/af-revenue/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${self.row.f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null})
+      let result = yield self.$resetpost('rs/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${self.row.f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null})
       if (result && result.data.length > 0) {
         console.log('数据格式是神马样子的', result)
         if (result.data[0].f_meter_type === '物联网表') {
@@ -138,7 +138,7 @@
     data.f_state = '有效'
     data.f_delaypay = 0
     console.log("数据参数附属："+JSON.stringify(data))
-    let result = await self.$resetpost('api/af-revenue/entity/save/t_area', data)
+    let result = await self.$resetpost('rs/entity/t_area', data)
     // self.$dispatch('success', '新建小区成功', 'new-area-info', data)
     console.log("result=", result.data)
     self.initModel()
@@ -146,7 +146,7 @@
   }
 
   let validateAddressGen = function * (self) {
-    let areaRes = yield self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: {tablename: 't_area', condition: `f_residential_area = '${self.model.f_residential_area}' and f_street = '${self.model.f_street}'`}}, {resolveMsg: null, rejectMsg: '验证小区，查询出错！！！！'})
+    let areaRes = yield self.$resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_area', condition: `f_residential_area = '${self.model.f_residential_area}' and f_street = '${self.model.f_street}'`}}, {resolveMsg: null, rejectMsg: '验证小区，查询出错！！！！'})
     console.log('查询出的小区,,,', areaRes)
     if (areaRes.data.length > 0) {
       self.$showAlert('小区已存在, 请重新输入', 'danger', 0)
@@ -191,7 +191,7 @@
       // 'model.f_meter_brand' (val) {
       //   console.log('val里面是神马', val)
       //   if (val && val.length > 0) {
-      //     this.$resetpost('api/af-revenue/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${val[0].f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      //     this.$resetpost('rs/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${val[0].f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
       //       console.log('res是神马呀', res)
       //       if (res.data[0].f_meter_type === '物联网表') {
       //         this.viewsee = true

package/src/components/OneCodeList.vue

@@ -205,7 +205,7 @@
   export default {
     data() {
       return {
-        model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy', 20,{
+        model: new PagedList('rs/sql/address_singleTableOrderBy', 20,{
           tablename: `'t_code_contract'`,items: `'*'`,
           orderitem: `'id '`})
       }

package/src/components/StreetList.vue

@@ -101,7 +101,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getstreetlist',20),
+        model: new PagedList('rs/sql/address_getstreetlist',20),
         addflag: false,
         addtitle:'',
 
@@ -131,7 +131,7 @@
       async delete(row){
         if(row.id){
           var id = row.id
-          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
             {data: {
                 items: 'f_street_id',
                 tablename: 't_area',
@@ -141,7 +141,7 @@
           if(useraredss.data.length>0){
             this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
           }else{
-            this.$resetdelete('api/af-revenue/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
               this.$dispatch('cancel')
             })
           }

package/src/components/UserAddress.vue

@@ -66,24 +66,25 @@
                       close-on-select v-ref:slice>
             </v-select>
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group " :class="[$v.f_building.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;号</label>
             <input type="text" style="width:40%" v-model="model.f_building" class="input_search"
-                   placeholder="楼号"/>
+                   placeholder="楼号"  v-validate:f_building='{required: true }'/>
             <input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
             />
 
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group " :class="[$v.f_unit.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">单&emsp;&emsp;元</label>
-            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
+            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"
+                   v-validate:f_unit='{required: true }' />
             <input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
             />
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group "  :class="[$v.f_floor.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;层</label>
             <input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
-                   placeholder="楼层" />
+                   placeholder="楼层"  v-validate:f_floor='{required: true }' />
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
             />
           </div>
@@ -391,7 +392,7 @@
   async initAreas (val) {
     if (val) {
       this.sliceArea = [];
-      let getAllArea = await this.$resetpost('/api/af-revenue/sql/address_singleTableOrderBy', {
+      let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
         data:{
           items: '*',
           tablename: 't_zone',
@@ -411,7 +412,7 @@
   async initpcds(pconditon){
     this.pcdslist = []
     let HttpReset = new HttpResetClass()
-    let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+    let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
       data: {
         items: '*',
         tablename: 't_pcd',
@@ -434,7 +435,7 @@
   async initstreets(pconditon){
     this.streetslist = []
     let HttpReset = new HttpResetClass()
-    let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
+    let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
       data: {
         items: '*',
         tablename: 't_street',
@@ -460,7 +461,7 @@
     // }
     this.areaslist = []
     let HttpReset = new HttpResetClass()
-    let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+    let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
       data: {
         items: '*',
         tablename: 't_area',
@@ -648,7 +649,7 @@
       }
       this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-        this.$resetpost('api/af-revenue/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
+        this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
           this.cleardara()
           this.$dispatch('confirm')
         })
@@ -696,7 +697,7 @@
       this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
       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
     }
-    await this.$resetpost('api/af-revenue/logic/address_updateuseraddress', this.model)
+    await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
   },
   cancel(){
     this.cleardara()

package/src/components/UserAddressChange.vue

@@ -35,7 +35,7 @@
     title: '地址变更列表',
     data () {
       return {
-        model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy',20, {
+        model: new PagedList('rs/sql/address_singleTableOrderBy',20, {
           tablename: `'t_address_change'`,items: `'*'`,
           orderitem: `'f_operate_date desc'`}),
       }

package/src/components/addressts/AddressListts.vue

@@ -155,7 +155,7 @@
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <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"></footer>
@@ -172,7 +172,7 @@
       return {
         iswork: false,
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getAddress_ts',20,{tablename: `'t_user_address_ts'`,items: `'*'`,orderitem: `'id desc'`}),
+        model: new PagedList('rs/sql/address_getAddress_ts',20,{tablename: `'t_user_address_ts'`,items: `'*'`,orderitem: `'id desc'`}),
         addflag: false,
         addtitle:'',
 
@@ -231,8 +231,8 @@
 
       if(row.id){
         var id = row.id
-        let userfiles = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles_ts',condition: `f_useraddress_id='${id}' and f_table_state in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
-        // let isdelete = await this.$resetpost('api/af-revenue/sql/isDeleteAddress', {data: {f_addressid: id}},{resolveMsg: null, rejectMsg: null})
+        let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles_ts',condition: `f_useraddress_id='${id}' and f_table_state in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
+        // let isdelete = await this.$resetpost('rs/sql/isDeleteAddress', {data: {f_addressid: id}},{resolveMsg: null, rejectMsg: null})
         if(userfiles.data.length){
           this.$showAlert('该地址下已有正常/待开通表具档案,无法删除！','warning',1000)
            return
@@ -241,7 +241,7 @@
         //   this.$showAlert('该地址下已有正在工作的置换单,无法删除！','warning',1000)
         //   return
         // }
-        this.$resetdelete('api/af-revenue/entity/t_user_address_ts', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$resetdelete('rs/entity/t_user_address_ts', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
           this.$dispatch('cancel')
         })
       }
@@ -290,7 +290,7 @@
       }
       this.closeFile();
       try{
-        await this.$resetpost(`api/af-revenue/logic/address_useraddressimport_ts`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+        await this.$resetpost(`rs/logic/address_useraddressimport_ts`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
           this.$showAlert("导入成功",'success', 2000);
           this.iswork = false
           this.init()

package/src/components/addressts/UserAddressChangets.vue

@@ -35,7 +35,7 @@
     title: '地址变更列表',
     data () {
       return {
-        model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy',20, {
+        model: new PagedList('rs/sql/address_singleTableOrderBy',20, {
           tablename: `'t_address_change_ts'`,items: `'*'`,
           orderitem: `'f_operate_date desc'`}),
       }

package/src/components/addressts/UserAddressts.vue

@@ -66,24 +66,25 @@
                       close-on-select v-ref:slice>
             </v-select>
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group " :class="[$v.f_building.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;号</label>
             <input type="text" style="width:40%" v-model="model.f_building" class="input_search"
-                   placeholder="楼号"/>
+                   placeholder="楼号"  v-validate:f_building='{required: true }'/>
             <input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
             />
 
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group " :class="[$v.f_unit.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">单&emsp;&emsp;元</label>
-            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
+            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"
+                   v-validate:f_unit='{required: true }' />
             <input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
             />
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group "  :class="[$v.f_floor.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;层</label>
             <input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
-                   placeholder="楼层" />
+                   placeholder="楼层"  v-validate:f_floor='{required: true }' />
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
             />
           </div>
@@ -351,7 +352,7 @@
   async initAreas (val) {
     if (val) {
       this.sliceArea = [];
-      let getAllArea = await this.$resetpost('/api/af-revenue/sql/address_singleTableOrderBy', {
+      let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
         data:{
           items: '*',
           tablename: 't_zone',
@@ -371,7 +372,7 @@
   async initpcds(pconditon){
     this.pcdslist = []
     let HttpReset = new HttpResetClass()
-    let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+    let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
       data: {
         items: '*',
         tablename: 't_pcd',
@@ -394,7 +395,7 @@
   async initstreets(pconditon){
     this.streetslist = []
     let HttpReset = new HttpResetClass()
-    let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
+    let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
       data: {
         items: '*',
         tablename: 't_street',
@@ -420,7 +421,7 @@
     // }
     this.areaslist = []
     let HttpReset = new HttpResetClass()
-    let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+    let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
       data: {
         items: '*',
         tablename: 't_area',
@@ -607,7 +608,7 @@
       }
       this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-        this.$resetpost('api/af-revenue/logic/address_adduserlist_ts',{data: {addlist:this.addresslist}},msg).then((req) => {
+        this.$resetpost('rs/logic/address_adduserlist_ts',{data: {addlist:this.addresslist}},msg).then((req) => {
           this.cleardara()
           this.$dispatch('confirm')
         })
@@ -655,7 +656,7 @@
       this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
       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
     }
-    await this.$resetpost('api/af-revenue/logic/address_updateuseraddress_ts', this.model)
+    await this.$resetpost('rs/logic/address_updateuseraddress_ts', this.model)
   },
   cancel(){
     this.cleardara()

package/src/components/areauser/AreaUser.vue

@@ -104,7 +104,7 @@
     title: '小区使用人',
     data () {
       return {
-         model: new PagedList('api/af-revenue/sql/getareauser', 20, {}),
+         model: new PagedList('rs/sql/getareauser', 20, {}),
         condition:'',
         getfield: {},
         show:false,
@@ -128,7 +128,7 @@
         // }
         this.areaslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
           data: {
             items: '*',
             tablename: 't_area',
@@ -177,7 +177,7 @@
           f_residential_area_id:this.newinfo.residential_id
         }
 
-        let res =  await this.$resetpost('api/af-revenue/logic/changeareaUser', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
+        let res =  await this.$resetpost('rs/logic/changeareaUser', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
         this.$showMessage(`成功批量修改了${res.data}位用户的小区`)
         this.criteriaShow = false
         this.close()