system-clients 3.1.93 → 3.1.96-test

package/src/components/server/Login.vue

@@ -118,6 +118,8 @@
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
 
+
+
   let saveGen = function *(self) {
     try {
       yield self.$login.login(self.model.ename, self.model.password)
@@ -205,23 +207,20 @@
   export default {
     title: '登录',
     async ready () {
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: '获取通知出错！！'})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-
-      if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
-        this.model.ename = this.$login.getUrlCompileParames('name')
-        this.model.password = this.$login.getUrlCompileParames('password')
-        this.confirm()
-      }
+      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)
@@ -243,7 +242,8 @@
           isMac: false,
           depPrompt: false,
           weakPassword: false,
-          title: '燃气客服系统'
+          title: '燃气客服系统',
+          distanceLogin: false
         },
         login: false,
         depPromptShow: false,
@@ -256,10 +256,27 @@
         modifyPwShow: false,
         logoandroid:false,
         showus:false,
-        notice:''
+        notice:'',
+        loginotherflag :true
       }
     },
     methods: {
+      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)
+              }
+            }
+          }
+        }
+      },
       theme(){
         // var  elementList = document.querySelectorAll('body');
         //   console.log(elementList)

package/src/components/server/ResSelectGroup.vue

@@ -68,7 +68,7 @@ export default {
     //人员是否和部门关联
     cascade: {
       type: Boolean,
-      default: false
+      default: true
     },
     selectin: {
       type: Boolean,