liuzhihui 2 years ago
parent
commit
fd30eb9309

+ 3 - 2
CallCenterWeb.UI/RMYY/src/api/login.js

24
 }
24
 }
25
 
25
 
26
 // OA登录
26
 // OA登录
27
-export function OAlogin(loginid) {
27
+export function OAlogin(loginid, oploginid) {
28
   return request({
28
   return request({
29
     url: 'Home/OAlogin',
29
     url: 'Home/OAlogin',
30
     method: 'post',
30
     method: 'post',
31
     data: {
31
     data: {
32
-      loginid
32
+      loginid,
33
+      oploginid
33
     }
34
     }
34
   })
35
   })
35
 }
36
 }

+ 4 - 4
CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

640
           return
640
           return
641
         }
641
         }
642
         if (this.worktypeInfo == "ywzx_jtyy") {
642
         if (this.worktypeInfo == "ywzx_jtyy") {
643
-          if (this.ruleForm.F_IDNumber == '') {
644
-            this.$message.error('请输入身份证号')
645
-            return;
646
-          }
643
+          // if (this.ruleForm.F_IDNumber == '') {
644
+          //   this.$message.error('请输入身份证号')
645
+          //   return;
646
+          // }
647
         }
647
         }
648
         if (this.iswomanage == 1) {
648
         if (this.iswomanage == 1) {
649
           this.ruleForm.clbm = ''
649
           this.ruleForm.clbm = ''

+ 3 - 3
CallCenterWeb.UI/RMYY/src/store/modules/user.js

105
       })
105
       })
106
     },
106
     },
107
     OAlogin({ commit }, userInfo) {
107
     OAlogin({ commit }, userInfo) {
108
-      const loginid = userInfo.loginid.trim()
109
-      // window.localStorage.setItem('ext', userInfo.extension)
108
+      const loginid = userInfo.loginid
109
+      const oploginid = userInfo.oploginid
110
       return new Promise((resolve, reject) => {
110
       return new Promise((resolve, reject) => {
111
-        OAlogin(loginid)
111
+        OAlogin(loginid, oploginid)
112
           .then(response => {
112
           .then(response => {
113
             setToken(response.data)
113
             setToken(response.data)
114
             commit('SET_TOKEN', response.data)
114
             commit('SET_TOKEN', response.data)

+ 2 - 1
CallCenterWeb.UI/RMYY/src/views/login/index.vue

127
       this.init()
127
       this.init()
128
       this.toggle()
128
       this.toggle()
129
       console.log(window.location.href)
129
       console.log(window.location.href)
130
-      if (window.location.href.indexOf('loginid') != '-1' || window.location.href.indexOf('oploginid') != '-1') {
130
+      if (window.location.href.indexOf('loginid') >= 0 || window.location.href.indexOf('oploginid') >= 0) {
131
+        console.log(window.location.href.indexOf('loginid'),window.location.href.indexOf('oploginid'))
131
         this.handleOAlogin()
132
         this.handleOAlogin()
132
       }
133
       }
133
     },
134
     },