From d04215ea7783dd9a893529e2cdc5ae7bd696abf0 Mon Sep 17 00:00:00 2001
From: hezidan <2033098269@qq.com>
Date: Fri, 29 Mar 2024 17:34:33 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                 |  9 +++++----
 src/router/index.js         |  2 +-
 src/views/fapiao/Fapiao.vue |  7 +++++++
 src/views/fapiao/edit.vue   | 28 ++++++++++++++++++----------
 src/views/login.vue         |  2 +-
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/main.js b/src/main.js
index 348c7bb..6d93581 100644
--- a/src/main.js
+++ b/src/main.js
@@ -36,8 +36,9 @@ Object.keys(custom).forEach(key => {
 // 路由拦截器
 router.beforeEach((to, from, next) => {
     if (to.matched.length != 0) {
-        if (to.meta.requireAuth) { // 判断该路由是否需要登录权限
-            if (Boolean(localStorage.getItem("userInfo"))) { // 通过vuex state获取当前的user是否存在
+      if (to.meta.requireAuth) { // 判断该路由是否需要登录权限
+        console.log(Boolean(localStorage.getItem("userInfo")))
+        if (Boolean(localStorage.getItem("userInfo"))) { // 通过vuex state获取当前的user是否存在
                 next();
             } else {
                 next({
@@ -46,8 +47,8 @@ router.beforeEach((to, from, next) => {
                 })
             }
         } else {
-            if (Boolean(localStorage.getItem("userInfo"))) { // 判断是否登录
-                if (to.path != "/" && to.path != "/login") { //判断是否要跳到登录界面
+        if (Boolean(localStorage.getItem("userInfo"))) { // 判断是否登录
+          if (to.path == "/" || to.path == "/login") { //判断是否要跳到登录界面
                     next();
                 } else {
                     /**
diff --git a/src/router/index.js b/src/router/index.js
index c24f2b4..471cd67 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,7 +46,7 @@ export default new Router({
 
     {
         path: '/login',
-        name: '登录',
+        name: 'login',
         component: login,
         hidden: true,
         meta: {
diff --git a/src/views/fapiao/Fapiao.vue b/src/views/fapiao/Fapiao.vue
index 9521d7c..4068257 100644
--- a/src/views/fapiao/Fapiao.vue
+++ b/src/views/fapiao/Fapiao.vue
@@ -219,6 +219,10 @@ export default {
       FapiaoList(parameter)
         .then(res => {
           this.loading = false
+          console.log(res)
+          if(res.code==null){
+            this.$router.push({ name: 'login' });//跳转到查询界面
+          }
           if (res.code!=0) {
             this.$message({
               type: 'info',
@@ -277,6 +281,9 @@ export default {
           this.loading = false
           FapiaoSave(this.editForm)
             .then(res => {
+              if(res.code==null){
+                this.$router.push({ name: 'login' });//跳转到查询界面
+              }
               this.editFormVisible = false
               this.loading = false
               console.log(res.success)
diff --git a/src/views/fapiao/edit.vue b/src/views/fapiao/edit.vue
index bfccfec..356aa37 100644
--- a/src/views/fapiao/edit.vue
+++ b/src/views/fapiao/edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 800px;width: 100%;">
+  <div style="height: 600px;width: 100%;">
     <div style="height: 100px;width: 100%;">
     <!-- 面包屑导航 -->
     <el-breadcrumb separator-class="el-icon-arrow-right">
@@ -8,7 +8,7 @@
     </el-breadcrumb>
     </div>
     <div style="height: 300px;width: 100%;">
-      <div style="height: 100%;width: 40%;float: left">
+      <div style="height: 80%;width: 30%;float: left">
         <el-form label-width="120px" :model="DataForm" ref="DataForm" :rules="rules">
           <el-form-item label="发票号" prop="billnum">
             <el-input size="small" v-model="DataForm.billnum" auto-complete="off" placeholder="请输入发票号"></el-input>
@@ -19,13 +19,18 @@
           <el-form-item label="报销金额" prop="amount">
             <el-input size="small" v-model="DataForm.amount" auto-complete="off" placeholder="请输入报销金额"></el-input>
           </el-form-item>
+          <el-form-item label="图片地址" prop="imageurl" v-show="false">
+            <el-input size="small" v-model="DataForm.imageurl" auto-complete="off" placeholder="请输入图片地址"></el-input>
+          </el-form-item>
           <el-form-item>
             <el-button size="small" @click='closeDialog("edit")'>取消</el-button>
             <el-button size="small" type="primary" :loading="loading" class="title" @click="submitForm('DataForm')">保存</el-button>
           </el-form-item>
         </el-form>
       </div>
-      <div style="height: 100%;width: 59%;float: right">
+      <div style="height: 80%;width: 2%;float: left">
+      </div>
+      <div style="height: 80%;width: 59%;float: left">
         <div style="height: 100%;width: 100%;margin: auto" v-if="imageUrl">
 <!--          <imageUpload v-model="fileList" @dataFromChild="handleChildData" />-->
           <el-upload
@@ -68,13 +73,6 @@
           >
             <i class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
-          <!-- 上传提示 -->
-          <div class="el-upload__tip" slot="tip" v-if="showTip">
-            请上传
-            <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-            <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
-            的文件
-          </div>
         </div>
       </div>
     </div>
@@ -102,6 +100,7 @@ export default {
         baoxiaoname:'',
         billnum:'',
         amount:'',
+        imageurl:'',
       },
       // rules 表单验证
       rules: {
@@ -130,6 +129,8 @@ export default {
     this.DataForm.baoxiaoname = this.$route.params.baoxiaoname;
     this.DataForm.billnum = this.$route.params.billnum;
     this.DataForm.amount = this.$route.params.amount;
+    this.DataForm.imageurl = this.$route.params.imageurl;
+
   },
 
   methods: {
@@ -149,6 +150,9 @@ export default {
           FapiaoSave(this.DataForm)
             .then(res => {
               console.log(res.success)
+              if(res.code==null){
+                this.$router.push({ name: 'login' });//跳转到查询界面
+              }
               if (res.code===0) {
                 // this.getdata(this.formInline)
                 this.$message({
@@ -173,10 +177,14 @@ export default {
       this.loading = false
     },
     handleSuccess(res, file) {
+      if(res.code==null){
+        this.$router.push({ name: 'login' });//跳转到查询界面
+      }
       // 上传成功后的处理逻辑
       if (res.code === 0) {
         this.DataForm.amount = res.data.amount;
         this.DataForm.billnum = res.data.billnum;
+        this.DataForm.imageurl = res.data.imageurl;
         this.fileList.push({ name: res.data.imageurl, url: res.data.imageurl });
         this.imageUrl = this.baseUrl+res.data.imageurl;
         console.log(this.imageUrl)
diff --git a/src/views/login.vue b/src/views/login.vue
index 11ec4b9..2906634 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -111,7 +111,7 @@ export default {
                 // 缓存用户个人信息
                 localStorage.setItem('userdata', JSON.stringify(res.data))
                 this.$store.commit('login', 'true')
-                this.$router.push({ path: '/goods/Goods' })
+                this.$router.push({ path: '/fapiao/Fapiao' })
               }, 1000)
             } else {
               this.$message.error(res.msg)
-- 
Gitee