修改关闭页面

src/views/project/index1.vue

@@ -1007,9 +1007,10 @@ export default {
     },
     goBack() {
       console.log(this.$route.query)
-      if (this.doNot == true && !this.$route.query) {
+      if (this.doNot == true && !this.$route.query.data) {
         this.mainTabel = false
-      }else if(this.$route.query){
+      }else if(this.$route.query.data){
+        this.cancelTwo()
         this.$router.push({path:'/index'})
       } else{
           this.$confirm('返回列表，是否保存?', '提示', {

src/views/purchaseIssue/index.vue

@@ -783,9 +783,7 @@ export default {
         title: "销售出库"
       }
       this.$router.push({ path: '/index' })
-      this.$store
-        .dispatch('tagsView/delView', view)
-        .then(({ visitedViews }) => {
+      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
           if (this.isActive(view)) {
             this.toLastView(visitedViews, view)
           }
@@ -1093,14 +1091,15 @@ export default {
           })
           break
         case '返回列表':
-          if (!this.$refs.avatar.form.fId && this.contentList !== 0 || this.$refs.avatar.form.fBillstatus >= 4 && !this.$route.query) {
+          if (!this.$refs.avatar.form.fId && this.contentList !== 0 || this.$refs.avatar.form.fBillstatus >= 4 && !this.$route.query.data) {
             data = {
               tableName: this.queryList.tableName,
               userId: Cookies.get('userName')
             }
             this.getRow(data)
             this.query(this.formDataList)
-          } else if(this.$route.query){
+          } else if(this.$route.query.data){
+            this.cancelTwo()
             this.$router.push({path:'/index'})
           }else {
             this.$confirm('当前数据未保存是否保存?', '提示', {

src/views/purchaseRequest/index.vue

@@ -780,17 +780,16 @@ export default {
     },
     //首页审批跳转关闭返回首页
     cancelTwo() {
-      this.open = false
       let view = {
-        fullPath: '/domesticTrade/orderInformation?data=%7B%22fId%22%3A687%7D',
+        fullPath: '/purchaseRequest',
         hash: '',
         matched: Array(2),
         meta: Object,
-        name: 'OrderInformation',
+        name: 'PurchaseRequest',
         params: Object,
-        path: '/domesticTrade/orderInformation',
+        path: '/purchaseRequest',
         query: Object,
-        title: '订单信息'
+        title: '采购申请'
       }
       this.$router.push({ path: '/index' })
       this.$store
@@ -1082,14 +1081,16 @@ export default {
           this.addOrUpdateHand()
           break
         case '返回列表':
-          if (!this.$refs.avatar.form.fId && this.contentList !== 0 || this.$refs.avatar.form.fBillstatus > 3 && !this.$route.query) {
+          console.log(this.$route.query.data)
+          if (!this.$refs.avatar.form.fId && this.contentList !== 0 || this.$refs.avatar.form.fBillstatus > 3 && !this.$route.query.data) {
             data = {
               tableName: this.queryList.tableName,
               userId: Cookies.get('userName')
             }
             this.getRow(data)
             this.query(this.formDataList)
-          } else if(this.$route.query){
+          } else if(this.$route.query.data){
+
             this.$router.push({path:'/index'})
           }else {
             this.$confirm('当前数据未保存是否保存?', '提示', {

vue.config.js

@@ -34,9 +34,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.1.143:9020`,
+        // target: `http://192.168.1.143:9020`,
         // target: `http://localhost:8080`,
-        // target: `https://ap.tubaosoft.com/prod-api/`,
+        target: `https://ap.tubaosoft.com/prod-api/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''