台账

.env.production

@@ -2,15 +2,15 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = http://192.168.60.99:9004/
+#VUE_APP_BASE_API = http://192.168.60.99:9004/
-VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
+#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
-VUE_APP_OA_URL = http://192.168.60.18:2021
+#VUE_APP_OA_URL = http://192.168.60.18:2021
-VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
+#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
 
-#VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
+VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
-#VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
+VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
-#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
+VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
-#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
+VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
 
 
 

src/api/user.js

@@ -8,6 +8,15 @@ export function login(data) {
   })
 }
 
+export function loginOss(data) {
+  return request({
+    url: '/api/admin/auth/oss-login',
+    method: 'post',
+    data,
+    noloading:true
+  })
+}
+
 export function getInfo(token) {
   return request({
     url: '/api/admin/auth/me',

src/store/modules/user.js

@@ -1,7 +1,8 @@
 import {
   login,
   logout,
-  getInfo
+  getInfo,
+  loginOss
 } from '@/api/user'
 import {
   getToken,
@@ -42,6 +43,36 @@ const mutations = {
 }
 
 const actions = {
+  loginskip({
+    commit
+  }, userInfo) {
+    const {
+      token,
+      tp,
+      loginId
+    } = userInfo
+
+    return new Promise((resolve, reject) => {
+      loginOss({
+        token: token,
+        tp: tp,
+        loginId: loginId
+      }).then(response => {
+
+        //console.log(response)
+        
+        const {
+          data
+        } = response;
+        console.log(response.access_token)
+        commit('SET_TOKEN', response.access_token)
+        setToken(response.access_token)
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
   // user login
   login({
     commit
@@ -105,6 +136,7 @@ const actions = {
     state
   }) {
     return new Promise((resolve, reject) => {
+      console.log("logout",state.token)
       logout(state.token).then(() => {
         removeToken() // must remove  token  first
         resetRouter()

src/views/login/index.vue

@@ -49,21 +49,21 @@
     name: 'Login',
     data() {
       const validateUsername = (rule, value, callback) => {
-        if (!validUsername(value)) {
+        if (false) {
           callback(new Error('请正确输入登录名'))
         } else {
           callback()
         }
       }
       const validatePassword = (rule, value, callback) => {
-        if (value.length < 6) {
+        if (false) {
-          callback(new Error('密码输入错误'))
+          callback(new Error('请正确输入密码'))
         } else {
           callback()
         }
       }
       return {
-        title: "",
+        showLogin: false,
         loginForm: {
           username: '',
           password: ''
@@ -85,6 +85,34 @@
         redirect: undefined
       }
     },
+    beforeCreate() {
+    
+    },
+    created() {
+      this.title = defaultSettings.title;
+      var query = this.$route.query;
+      if (query.tp) {
+        this.showLogin = false;
+      } else {
+        this.showLogin = true;
+      }
+      if (query.token && query.userid && query.tp) {
+        this.loading = true
+        this.$store.dispatch('user/loginskip', {
+          token: query.token,
+          tp: query.tp,
+          loginId: query.loginId
+        }).then(() => {
+          this.$router.push({
+            path: "/"
+          })
+          this.loading = false
+        }).catch((error) => {
+          console.log(error)
+          this.loading = false
+        })
+      }
+    },
     watch: {
       $route: {
         handler: function(route) {
@@ -93,9 +121,6 @@
         immediate: true
       }
     },
-    created() {
-      this.title = defaultSettings.title;
-    },
     methods: {
       showPwd() {
         if (this.passwordType === 'password') {
@@ -107,13 +132,12 @@
           this.$refs.password.focus()
         })
       },
-      //处理登录
       handleLogin() {
         this.$refs.loginForm.validate(valid => {
           if (valid) {
             this.loading = true
             this.$store.dispatch('user/login', this.loginForm).then(() => {
-
+              console.log(this.redirect)
               this.$router.push({
                 path: this.redirect || '/'
               })

src/views/stocks/component/addRuku.vue

@@ -114,7 +114,7 @@
           </div>
           <div class="xy-table-item-content">
             <Button type="primary" icon="md-add" style="margin-bottom: 10px" @click="isShowMingxi=true">新增入库明细</Button>
-            <Button type="primary" icon="md-add" style="margin-bottom: 10px" @click="importsRuku">导入</Button>
+            <Button type="primary" icon="md-add" style="margin-bottom: 10px;margin-left: 10px" @click="importsRuku">导入</Button>
             <xy-table style="width: 60%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
               <template v-slot:btns>
                 <el-table-column label="操作" width="90" header-align="center" align="center">

src/views/stocks/index.vue

@@ -76,7 +76,7 @@
           return:'回库',
           check:'盘点',
           data:"数据校对",
-          testcheck:'模拟盘点'
+          mock:'模拟盘点'
         },
         customForm: {
           customFormId: "",