system-clients 3.2.87 → 3.2.89

package/src/components/server/Login.vue

@@ -174,7 +174,7 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
+      let getMacs = yield self.$resetpost('api/af-system/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
       }).catch(() => {
@@ -239,7 +239,7 @@ let saveGen = function *(self) {
       msg = ret.data
     } else if (ret.status === 710) {
       msg = ret.data
-    } else if (ret.status === 555) {
+    } else {
       msg = ret.data
     }
     self.createCode()
@@ -257,21 +257,6 @@ 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)
@@ -427,27 +412,24 @@ export default {
       }else {
         console.log("待办提醒全局关闭。")
       }
-
-
-
-
     },
 
     async loginother(){
-      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)
-            }
-          }
-        }
-      }
+      // if (this.config.distanceLogin) {
+      //   if (this.$login && this.$login.getUrlParames('name') ) {
+      //     let ename = this.$login.getUrlParames('name');
+      //     // todo v4
+      //     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,6 +62,7 @@
     // 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

@@ -155,6 +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('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_street',
@@ -192,6 +193,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('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_building',

package/src/components/server/RoleSelector.vue

@@ -51,6 +51,7 @@
       }
     },
     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))
@@ -65,7 +66,7 @@
         this.$dispatch('re-res',obj)
       },
       filterUser(resids) {
-        // 处理第一次进入页面值异常问题 
+        // 处理第一次进入页面值异常问题
         if(resids.length > 0 && typeof resids[0] == "object"){
           resids = resids[0]
         }
@@ -86,4 +87,4 @@
 
 <style scoped>
 
-</style>
+</style>

package/src/filiale/baole/Login.vue

@@ -175,6 +175,7 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
+      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -439,6 +440,7 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
+          // todo v4
           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){

package/src/filiale/chengtou/Login.vue

@@ -173,6 +173,7 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
+      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -437,6 +438,7 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
+          // todo v4
           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){

package/src/filiale/dongguan/Login.vue

@@ -179,6 +179,7 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
+      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -428,6 +429,7 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
+          // todo v4
           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){

package/src/filiale/dongguan/Main.vue

@@ -97,6 +97,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
+  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -392,6 +393,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
+          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/filiale/furuike/Login.vue

@@ -166,6 +166,7 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
+      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -263,11 +264,13 @@ export default {
         st: obj.ticket,
         serviceKey: this.config.serviceKey
       }
+      // todo v4
       this.$resetpost('/sso/logic/serviceValidate', params,{resolveMsg: null, rejectMsg: null}).then((re) => {
         // this.$showMessage("re----" + JSON.stringify(re))
         if (re.data.code === 200) {
           this.showlogin = false
           let condition = `ename = '${re.data.data.userName}'`
+          // todo v4
           this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
             if (res.data && res.data.length > 0) {
               this.model.ename = res.data[0].ename
@@ -474,6 +477,7 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
+          // todo v4
           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){

package/src/filiale/furuike/Main.vue

@@ -178,6 +178,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
+  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -504,6 +505,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
+          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/filiale/gehua/Main.vue

@@ -151,6 +151,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
+  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -422,6 +423,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
+          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/filiale/konggang/Login.vue

@@ -162,6 +162,7 @@
       console.log('登录配置', self.config)
       if (self.config.isMac) {
         // 获取该登录人分公司下的mac配置
+        // todo v4
         let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
           resolveMsg: null,
           rejectMsg: null
@@ -370,6 +371,7 @@
         if (this.config.distanceLogin) {
           if (this.$login && this.$login.getUrlParames('name') ) {
             let ename = this.$login.getUrlParames('name');
+            // todo v4
             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){