system-clients 3.3.1 → 3.3.2-v3

package/src/components/equipment/PosAdd.vue

@@ -33,7 +33,7 @@
             <label class="font_normal_body" >机器编号</label>
             <input type="text" class="input_search" style="width: 60%" v-model="model.f_machine_number" placeholder="机器编号" >
           </div>
-          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_phone.required || $v.f_phone.minlength || $v.f_phone.maxlength}">
+          <div class="col-sm-6 form-group" :class="{'has-error': $v.f_phone.required}">
             <label class="font_normal_body">联系电话</label>
             <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话"
                    v-validate:f_phone="{required: true, minlength:7, maxlength: 11}" title="手机号必须7-11位">
@@ -223,7 +223,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
               this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送停用指令，请稍后查看执行结果！`, 'success', 2500)
               this.model.f_state = '停用'
               try {
-                this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
+                // 测试接口
+                // this.$resetpost('rs/logic/updatePosState', {data: {number: this.model.f_terminal_number, state: '停用'}}, {resolveMsg: null, rejectMsg: null}, 0)
+                //   .then((res) => {})
+                this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
               } catch (error) {
                 this.search()
               }
@@ -235,7 +238,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
               this.$showAlert(`已向设备号： ${this.model.f_terminal_number}发送启用指令，请稍后查看执行结果！`, 'success', 2500)
               this.model.f_state = '正常'
               try {
-                this.$resetpost('api/af-system/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
+                // 测试接口
+                // this.$resetpost('rs/logic/getEditPosState', {data: {number: this.model.f_terminal_number, state: '正常'}}, {resolveMsg: null, rejectMsg: null}, 0)
+                //   .then((res) => {})
+                this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
               } catch (error) {
                 this.search()
               }
@@ -253,8 +259,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         this.show=true
       },
       upgradeRoot() {
-        // todo v4
-        this.$resetpost('api/af-revenue/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
+        this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
         this.$dispatch('refresh')
       },
       search () {
@@ -273,8 +278,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
           this.model.f_depname = this.$login.f.deps
           this.model.f_orgstr = this.$login.f.fullids
         }
-        // todo v4
-         this.$resetpost('api/af-system/logic/save_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
            this.$dispatch('refresh')
          }).catch((error) => {
            this.$dispatch('refresh')

package/src/components/equipment/PosList.vue

@@ -165,8 +165,8 @@
     data () {
       return {
         source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        model: new PagedList('api/af-system/sql/equipmentQuery', 20),
-        model2: new PagedList('api/af-system/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
+        model: new PagedList('rs/sql/equipmentQuery', 20),
+        model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
         curorgid: [this.f_filialeid],
         f_orgid: '',
         f_filialeids: '',
@@ -238,7 +238,7 @@
           this.showAlert('出现异常，请重新进操作')
           return
         }
-        await this.$resetpost('api/af-system/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
+        await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
           rejectMsg: null,
           resolveMsg: null
         })
@@ -253,6 +253,7 @@
         this.infoshow = true
       },
       search () {
+        console.log("111111111111111111111111111111111111")
         this.$refs.paged.$refs.cri.search()
       },
 
@@ -277,6 +278,7 @@
       },
 
       getorg (val) {
+        console.log("====================", val)
         this.f_orgid = val[0]
         this.f_filialeid = val[0]
         // this.search()

package/src/components/equipment/PosManage.vue

@@ -78,7 +78,7 @@
       //     return
       //   }
       //
-      //   await this.$resetpost('api/af-revenue/logic/batchPos',{data: {tasks: arrs, taskState: val}}, {rejectMsg: null, resolveMsg: null})
+      //   await this.$resetpost('rs/logic/batchPos',{data: {tasks: arrs, taskState: val}}, {rejectMsg: null, resolveMsg: null})
       //
       //   // 需要提示
       //   this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`)

package/src/components/equipment/PosParamAdd.vue

@@ -124,7 +124,7 @@ export default {
       this.bankmodel = JSON.parse(JSON.stringify(this.bankmodel))
     },
     async confirm() {
-      await this.$resetpost('api/af-system/logic/Pos_saveParam',
+      await this.$resetpost('rs/logic/Pos_saveParam',
         {
           data: {
             model: this.model,
@@ -139,7 +139,7 @@ export default {
     async edit(param_id) {
       this.param_id = param_id
       let load = new HttpResetClass()
-      load.load("POST", 'api/af-system/sql/singleTable',
+      load.load("POST", 'rs/sql/singleTable',
         {
           data: {
             tablename: ' t_equipment_param ',

package/src/components/equipment/PosParamList.vue

@@ -73,7 +73,7 @@ export default {
   components: {},
   data() {
     return {
-      model: new PagedList('api/af-system/sql/get_posParam', 20),
+      model: new PagedList('rs/sql/get_posParam', 20),
       curorgid: [this.f_filialeid],
     }
   },
@@ -93,7 +93,7 @@ export default {
       }
     },
     async delete(row) {
-      await this.$resetpost('api/af-system/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
+      await this.$resetpost('rs/logic/deletePosParam', {data: row}, {rejectMsg: null, resolveMsg: null})
       await this.search()
     },
     modify(row) {

package/src/components/materialManage/materialList.vue

@@ -175,7 +175,7 @@
     data(){
           //配置后台systemModule，sql
        return{
-         model: new PagedList('api/af-revenue/sql/singleTable_OrderBy', 50),
+         model: new PagedList('rs/sql/singleTable_OrderBy', 50),
          row: null,
          searchshow: true,
          obj: {

package/src/components/parammanage/ParamPage.vue

@@ -64,10 +64,10 @@
         <template partial='body'>
           <td style="text-align:center">{{$index+1}}</td>
           <td style="text-align:center">{{row.name}}</td>
-          <td class="flex-row col-sm-5">
-            <button type="button" name="button" class="button_search button_spacing width-60" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
-            <button type="button" name="button" class="button_search button_spacing width-60" v-if="$index!=0" @click.stop="$parent.$parent.move(row,$index)">上移</button>
-            <button type="button" name="button" class="btn btn-danger button_spacing width-60" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
+          <td class="flex-around col-sm-3">
+            <button type="button" name="button" class="button_search" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
+            <button type="button" name="button" class="button_search" v-if="$index!=0" @click.stop="$parent.$parent.move(row,$index)">上移</button>
+            <button type="button" name="button" class="btn btn-danger" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
           </td>
         </template>
       </data-grid>
@@ -179,8 +179,8 @@
         var param2=this.params.rows[index-1]
         let http = new HttpResetClass()
         try {
-          await http.load('POST', 'api/af-system/logic/system_saveParamValue', param1, {resolveMsg: null, rejectMsg: null})
-          await http.load('POST', 'api/af-system/logic/system_saveParamValue', param2, {resolveMsg: null, rejectMsg: null})
+          await http.load('POST', 'rs/entity/t_paramvalue', param1, {resolveMsg: null, rejectMsg: null})
+          await http.load('POST', 'rs/entity/t_paramvalue', param2, {resolveMsg: null, rejectMsg: null})
           this.$showAlert('上移成功', 'success', 2000)
         }catch (e) {
           console.log(e)
@@ -198,7 +198,7 @@
       async queryParam (condition) {
         this.model.rows = []
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'api/af-system/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'rs/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.model.rows = res.data
       },
       selected (val) {
@@ -207,7 +207,7 @@
       },
       async getParamValue(obj) {
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'api/af-system/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'rs/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.params.rows  = res.data
       },
       filter_query (paramName,orgid) {
@@ -258,7 +258,7 @@
         if (type === 't_parameter') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('api/af-system/logic/deleteParam', row).then((res) => {
+              this.$resetpost('rs/logic/deleteParam', row).then((res) => {
                 this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
                 this.selectItem = null
               })
@@ -267,7 +267,7 @@
         } else if (type === 't_paramvalue') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('api/af-system/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
+              this.$resetpost('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
                 this.getParamValue(this.selectItem)
               })
             }
@@ -291,7 +291,7 @@
             //添加当前分公司
           }
           data.f_filialeids = this.modifyItem.f_filialeids
-          this.$resetpost('api/af-system/logic/system_saveParam', data).then((res) => {
+          this.$resetpost('rs/logic/system_saveParam', data).then((res) => {
             //无id
             this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             this.show = false
@@ -310,7 +310,7 @@
               processid: this.selectItem.id
             }
           }
-          this.$resetpost('api/af-system/logic/system_saveParamValue', data).then((res) => {
+          this.$resetpost('rs/entity/t_paramvalue', data).then((res) => {
             this.show = false
             // 如果没有id，需要在数组中添加
             this.getParamValue(this.selectItem)

package/src/components/parammanage/ParamPages.vue

@@ -150,7 +150,7 @@
         if (row.EntityType === 't_parameter') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$refs.paramsLoad.load('api/af-revenue/logic/deleteParam', row).then((res) => {
+              this.$refs.paramsLoad.load('rs/logic/deleteParam', row).then((res) => {
                 this.loadParams()
                 this.selectItem = null
               })
@@ -159,7 +159,7 @@
         } else if (row.EntityType === 't_paramvalue') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$refs.selectsLoad.load('api/af-revenue/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
+              this.$refs.selectsLoad.load('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
                 this.params.rows.splice(index, 1)
               })
             }

package/src/components/parammanage/SinglePage.vue

@@ -30,11 +30,11 @@
         <data-grid :model="model" v-ref:grid >
           <template partial='head'>
             <tr>
-              <th><nobr>序号</nobr></th>
-              <th><nobr>名称</nobr></th>
-              <th><nobr>参数值</nobr></th>
-              <th><nobr>所属</nobr></th>
-              <th><nobr>操作</nobr></th>
+              <th>序号</th>
+              <th>名称</th>
+              <th>参数值</th>
+              <th>所属</th>
+              <th>操作</th>
             </tr>
           </template>
           <template partial='body'>
@@ -149,7 +149,7 @@
       async queryParam (condition) {
         this.model.rows = []
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'api/af-system/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
+        let res = await http.load('POST', 'rs/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
         this.model.rows = res.data
       },
 
@@ -183,7 +183,7 @@
       deleteItem (row) {
         this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$resetpost('api/af-system/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
+            this.$resetpost('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
             })
           }
@@ -201,7 +201,7 @@
         this.show = true
       },
       confirm () {
-        this.$resetpost('api/af-system/logic/system_saveSingle', this.selectItem).then((res) => {
+        this.$resetpost('rs/logic/system_saveSingle', this.selectItem).then((res) => {
           // 如果没有id，需要在数组中添加
           this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
           this.show = false

package/src/components/parammanage/SinglePages.vue

@@ -95,14 +95,14 @@
     },
     methods: {
       loadSingle () {
-        this.$refs.singleLoad.load('api/af-system/sql/singleTable', {data: {tablename: 't_singlevalue', condition: '1=1'}}).then((res) => {
+        this.$refs.singleLoad.load('rs/sql/singleTable', {data: {tablename: 't_singlevalue', condition: '1=1'}}).then((res) => {
           this.model.rows = this.params = res.data
         })
       },
       deleteItem (row) {
         this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$refs.singleLoad.load('api/af-revenue/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
+            this.$refs.singleLoad.load('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
               this.loadSingle()
             })
           }

package/src/components/server/AddChangeMsg.vue

@@ -51,7 +51,7 @@ export default {
         tablename: 't_changedeclare',
         parameters: this.model
       }
-      this.$post('api/af-revenue/logic/save', {data: param})
+      this.$post('rs/logic/save', {data: param})
       .then(() => {
         this.model = {}
         this.$emit('toggle')

package/src/components/server/ChangeDeclare.vue

@@ -30,7 +30,7 @@ export default {
       orderitem: 'f_change_date DESC'
     }
     this.$info(`加载数据中..., sql:${sql}`)
-    this.$refs.pv.load('api/af-revenue/sql/singleTable_OrderBy', {data: condition}).then((a) => {
+    this.$refs.pv.load('rs/sql/singleTable_OrderBy', {data: condition}).then((a) => {
       this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
       this.model = a.data
     }).catch((error) => {

package/src/components/server/Login.vue

@@ -145,6 +145,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -158,23 +159,11 @@ let saveGen = function *(self) {
     if(self.$appdata){
       yield self.$appdata.load()
     }
-    if (Vue.$heatCompatibility) {
-      try {
-        if(self.$loginHeat){
-          yield self.$loginHeat.login(self.model.ename, self.model.password)
-        }
-        if(self.$appdataHeat){
-          yield self.$appdataHeat.load()
-        }
-      } catch (e) {
-        console.log('热力系统登陆失败!')
-      }
-    }
     yield self.$getConfig(self, 'Login')
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      let getMacs = yield self.$resetpost('api/af-system/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
+      let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
       }).catch(() => {
@@ -203,12 +192,15 @@ let saveGen = function *(self) {
       }
     }
     console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
+    // 弱口令验证（默认开启，跳转过来的不进行验证）
+    if ((!self.otherLogin) && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
+    } else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
+      self.$showMessage('登录系统: 您的密码已超过两个半月未修改，请修改密码后重新登录！！！', ['confirm']).then((res) => {
+        self.modifyPwShow = true
+      })
     } else if ((!self.otherLogin) && self.$login.depPrompt) {
       self.depPromptShow = true
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -229,6 +221,7 @@ let saveGen = function *(self) {
     }
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -239,7 +232,7 @@ let saveGen = function *(self) {
       msg = ret.data
     } else if (ret.status === 710) {
       msg = ret.data
-    } else {
+    } else if (ret.status === 555) {
       msg = ret.data
     }
     self.createCode()
@@ -257,16 +250,29 @@ export default {
     this.titleShow = this.$appdata.getSingleValue('关于我们')
     window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
     this.vTime = this.format(new Date(window.versionTime));
+    // try{
+    //   let http = new HttpResetClass()
+    //   let res = await http.load('POST', 'rs/sql/singleTable',
+    //     {data:{
+    //         tablename: 't_changedeclare',
+    //         condition: ` f_type ='变更通知' `
+    //       }
+    //     }, {resolveMsg: null, rejectMsg: null})
+    //   if(res.data.length>0){
+    //     console.log("---------------获取通知",res.data[0].f_change_message)
+    //     this.notice=res.data[0].f_change_message
+    //   }
+    // }catch(e){}
+
+    this.loginother();
     $('#login-button').click(function (event) {
       event.preventDefault()
       $('form').fadeOut(500)
     })
     if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
       const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
-      console.log(subUrl)
       this.model.ename = window.atob(subUrl[0])
       this.model.password = window.atob(subUrl[1])
-      console.log('this.model.ename',this.model.ename)
       this.otherLogin = true
       this.confirm()
     }else{
@@ -346,7 +352,7 @@ export default {
       } else {
         condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
       }
-      await http.load('POST', '/api/af-system/sql/singleTable', {data: {
+      await http.load('POST', '/rs/sql/singleTable', {data: {
           tablename:'t_order_center',
           condition:condition
         }}, {
@@ -412,24 +418,27 @@ export default {
       }else {
         console.log("待办提醒全局关闭。")
       }
+
+
+
+
     },
 
     async loginother(){
-      // if (this.config.distanceLogin) {
-      //   if (this.$login && this.$login.getUrlParames('name') ) {
-      //     let ename = this.$login.getUrlParames('name');
-      //     // todo v4
-      //     let logininfo = await this.$resetpost('api/af-revenue/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
-      //     if(logininfo.data){
-      //       if(logininfo.data.ename && logininfo.data.password){
-      //         this.model.ename = logininfo.data.ename
-      //         this.model.password =logininfo.data.password
-      //         let gen = saveGen(this)
-      //         return co(gen)
-      //       }
-      //     }
-      //   }
-      // }
+      if (this.config.distanceLogin) {
+        if (this.$login && this.$login.getUrlParames('name') ) {
+          let ename = this.$login.getUrlParames('name');
+          let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
+          if(logininfo.data){
+            if(logininfo.data.ename && logininfo.data.password){
+              this.model.ename = logininfo.data.ename
+              this.model.password =logininfo.data.password
+              let gen = saveGen(this)
+              return co(gen)
+            }
+          }
+        }
+      }
     },
     theme(){
       // var  elementList = document.querySelectorAll('body');

package/src/components/server/ModifyPw.vue

@@ -62,7 +62,6 @@
     // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
     // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
     //  Util.f.password = self.deliver.newpassword
-    // todo v4
     let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {

package/src/components/server/PcdBuildingSelect.vue

@@ -66,7 +66,7 @@
     self.arrays.pcd=[{label:'全部',value:''}]
     if(self.show.pcdShow){
       let HttpReset = new HttpResetClass()
-      var pcd = await HttpReset.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+      var pcd = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
         data: {
           items: 'f_pcd',
           tablename: 't_pcd',
@@ -80,7 +80,7 @@
     }else if(self.show.streetShow){
       console.log("------------查街道")
       let HttpReset = new HttpResetClass()
-      var street = await HttpReset.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+      var street = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
         data: {
           items: 'f_street',
           tablename: 't_street',
@@ -93,7 +93,7 @@
       }
     }else if(self.show.areaShow){
       let HttpReset = new HttpResetClass()
-      var area = await HttpReset.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+      var area = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
         data: {
           items: 'f_residential_area',
           tablename: 't_area',
@@ -155,8 +155,7 @@
       async pcdChange(){
         this.arrays.street=[{label:'全部',value:''}]
         var condition = `f_filialeid = '${this.$login.f.orgid}' and f_street is not null group by f_street`
-        // todo v4
-        let street = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
+        let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_street',
             tablename: 't_street',
@@ -172,7 +171,7 @@
       async streetChange(){
         this.arrays.area=[{label:'全部',value:''}]
         var condition = `f_street = '${this.model.f_street?this.model.f_street:null}' and f_residential_area is not null group by f_residential_area`
-        let area = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
+        let area = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_residential_area',
             tablename: 't_area',
@@ -193,8 +192,7 @@
         }else{
           condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
         }
-        // todo v4
-        let build = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
+        let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_building',
             tablename: 't_user_address',

package/src/components/server/ResSelect.vue

@@ -80,9 +80,6 @@
       //找到跟节点
       ergodicList (val,parentname) {
         if(val.children.length > 0 ){
-          if (val.name !== '组织机构' && parentname !== '资源管理'){
-            this.resoptions.push({label: parentname === '组织机构' ? val.name : val.name+' - '+parentname, value: val.id})
-          }
           parentname=parentname+val.name
           this.treetoList(val,parentname)
         }else {

package/src/components/server/ResSelectGroup.vue

@@ -167,7 +167,7 @@ export default {
           for (let row of this.$refs.department.resoptions) {
             depids.push(row.value)
           }
-          let depid = depids.length ? plugin.convertToIn(depids) : `('')`
+          let depid = depids.length ? plugin.convertToIn(depids) : ('')
           condition += " and f_depid in " + depid;
         }
       }

package/src/components/server/RoleSelector.vue

@@ -51,7 +51,6 @@
       }
     },
     ready() {
-      // todo v4
       this.$resetpost('/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
         .then(res => {
           console.log('res-->' + JSON.stringify(res))
@@ -66,7 +65,7 @@
         this.$dispatch('re-res',obj)
       },
       filterUser(resids) {
-        // 处理第一次进入页面值异常问题
+        // 处理第一次进入页面值异常问题 
         if(resids.length > 0 && typeof resids[0] == "object"){
           resids = resids[0]
         }
@@ -87,4 +86,4 @@
 
 <style scoped>
 
-</style>
+</style>

package/src/components/server/TestResSelectGroup.vue

@@ -42,7 +42,7 @@
 
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
-                                sqlurl="api/af-revenue/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
+                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
                                 :choose-col="true"></export-excel>
 
                   <print-data :model="$parent.model" :field="$parent.$parent.getfield"