xiugai

CallCenterWeb.UI/RMYY/src/api/login.js

@@ -24,12 +24,13 @@ export function Dinglogin(code) {
 }
 
 // OA登录
-export function OAlogin(loginid) {
+export function OAlogin(loginid, oploginid) {
   return request({
     url: 'Home/OAlogin',
     method: 'post',
     data: {
-      loginid
+      loginid,
+      oploginid
     }
   })
 }

CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -640,10 +640,10 @@
           return
         }
         if (this.worktypeInfo == "ywzx_jtyy") {
-          if (this.ruleForm.F_IDNumber == '') {
-            this.$message.error('请输入身份证号')
-            return;
-          }
+          // if (this.ruleForm.F_IDNumber == '') {
+          //   this.$message.error('请输入身份证号')
+          //   return;
+          // }
         }
         if (this.iswomanage == 1) {
           this.ruleForm.clbm = ''

CallCenterWeb.UI/RMYY/src/store/modules/user.js

@@ -105,10 +105,10 @@ const user = {
       })
     },
     OAlogin({ commit }, userInfo) {
-      const loginid = userInfo.loginid.trim()
-      // window.localStorage.setItem('ext', userInfo.extension)
+      const loginid = userInfo.loginid
+      const oploginid = userInfo.oploginid
       return new Promise((resolve, reject) => {
-        OAlogin(loginid)
+        OAlogin(loginid, oploginid)
           .then(response => {
             setToken(response.data)
             commit('SET_TOKEN', response.data)

CallCenterWeb.UI/RMYY/src/views/login/index.vue

@@ -127,7 +127,8 @@
       this.init()
       this.toggle()
       console.log(window.location.href)
-      if (window.location.href.indexOf('loginid') != '-1' || window.location.href.indexOf('oploginid') != '-1') {
+      if (window.location.href.indexOf('loginid') >= 0 || window.location.href.indexOf('oploginid') >= 0) {
+        console.log(window.location.href.indexOf('loginid'),window.location.href.indexOf('oploginid'))
         this.handleOAlogin()
       }
     },