提交审批

src/layout/components/AppMain.vue

@@ -1,7 +1,8 @@
+<!-- @author ruoyi 20201128 支持三级以上菜单缓存 -->
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
+      <keep-alive :max="20" :exclude="notCacheName">
         <router-view :key="key" />
       </keep-alive>
     </transition>
@@ -9,17 +10,119 @@
 </template>
 
 <script>
+import Global from "@/layout/components/global.js";
+
 export default {
   name: 'AppMain',
   computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+    notCacheName() {
+      var visitedViews = this.$store.state.tagsView.visitedViews;
+      var noCacheViews = [];
+      Object.keys(visitedViews).some((index) => {
+        if (visitedViews[index].meta.noCache) {
+          noCacheViews.push(visitedViews[index].name);
+        }
+      });
+      return noCacheViews;
     },
     key() {
-      return this.$route.path
-    }
-  }
-}
+      return this.$route.path;
+    },
+  },
+  mounted() {
+    // 关闭标签触发
+    Global.$on("removeCache", (name, view) => {
+      this.removeCache(name, view);
+    });
+  },
+  methods: {
+    // 获取有keep-alive子节点的Vnode
+    getVnode() {
+      // 判断子集非空
+      if (this.$children.length == 0) return false;
+      let vnode;
+      for (let item of this.$children) {
+        // 如果data中有key则代表找到了keep-alive下面的子集，这个key就是router-view上的key
+        if (item.$vnode.data.key) {
+          vnode = item.$vnode;
+          break;
+        }
+      }
+      return vnode ? vnode : false;
+    },
+    // 移除keep-alive缓存
+    removeCache(name, view = {}) {
+      let vnode = this.getVnode();
+      if (!vnode) return false;
+      let componentInstance = vnode.parent.componentInstance;
+      // 这个key是用来获取前缀用来后面正则匹配用的
+      let keyStart = vnode.key.split("/")[0];
+      let thisKey = `${keyStart}${view.fullPath}`;
+      let regKey = `${keyStart}${view.path}`;
+
+      this[name]({ componentInstance, thisKey, regKey });
+    },
+    // 移除其他
+    closeOthersTags({ componentInstance, thisKey }) {
+      Object.keys(componentInstance.cache).forEach((key, index) => {
+        if (key != thisKey) {
+          // 销毁实例(这里存在多个key指向一个缓存的情况可能前面一个已经清除掉了所有要加判断)
+          if (componentInstance.cache[key]) {
+            componentInstance.cache[key].componentInstance.$destroy();
+          }
+          // 删除缓存
+          delete componentInstance.cache[key];
+          // 移除key中对应的key
+          componentInstance.keys.splice(index, 1);
+        }
+      });
+    },
+    // 移除所有缓存
+    closeAllTags({ componentInstance }) {
+      // 销毁实例
+      Object.keys(componentInstance.cache).forEach((key) => {
+        if (componentInstance.cache[key]) {
+          componentInstance.cache[key].componentInstance.$destroy();
+        }
+      });
+      // 删除缓存
+      componentInstance.cache = {};
+      // 移除key中对应的key
+      componentInstance.keys = [];
+    },
+    // 移除单个缓存
+    closeSelectedTag({ componentInstance, regKey }) {
+      let reg = new RegExp(`^${regKey}`);
+      Object.keys(componentInstance.cache).forEach((key, i) => {
+        if (reg.test(key)) {
+          // 销毁实例
+          if (componentInstance.cache[key]) {
+            componentInstance.cache[key].componentInstance.$destroy();
+          }
+          // 删除缓存
+          delete componentInstance.cache[key];
+          // 移除key中对应的key
+          componentInstance.keys.splice(i, 1);
+        }
+      });
+    },
+    // 刷新单个缓存
+    refreshSelectedTag({ componentInstance, thisKey }) {
+      Object.keys(componentInstance.cache).forEach((key, index) => {
+        if (null != thisKey && key.replace("/redirect", "") == thisKey) {
+          // 1 销毁实例(这里存在多个key指向一个缓存的情况可能前面一个已经清除掉了所有要加判断)
+          if (componentInstance.cache[key]) {
+            componentInstance.cache[key].componentInstance.$destroy();
+          }
+          // 2 删除缓存
+          delete componentInstance.cache[key];
+          // 3 移除key中对应的key
+          componentInstance.keys.splice(index, 1);
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -31,7 +134,7 @@ export default {
   overflow: hidden;
 }
 
-.fixed-header+.app-main {
+.fixed-header + .app-main {
   padding-top: 50px;
 }
 
@@ -41,7 +144,7 @@ export default {
     min-height: calc(100vh - 84px);
   }
 
-  .fixed-header+.app-main {
+  .fixed-header + .app-main {
     padding-top: 84px;
   }
 }

src/views/purchaseRequest/index.vue

@@ -676,6 +676,9 @@ export default {
       ]
     }
   },
+  activated(){
+    this.homePage()
+  },
   created() {
     let data = {
       tableName: this.queryList.tableName,
@@ -739,6 +742,21 @@ export default {
     this.fCompany(2)
   },
   methods: {
+    homePage(){
+      let date = this.$route.query
+      console.log(date)
+      if (this.$route.query.list){
+        console.log(this.contentButton)
+        this.contentButton.push(JSON.parse(this.$route.query.list))
+        console.log(this.contentButton)
+        let scope = {
+          row:{
+            fId:JSON.parse(this.$route.query.data).billId
+          }
+        }
+        this.viewMethod(scope)
+      }
+    },
     // 查看审批流
     getDataList() {
       this.addOrUpdateVisible = false;
@@ -754,6 +772,12 @@ export default {
         this.$refs.addOrUpdate.init(this.$refs.avatar.form.fId,520);
       });
     },
+    addOrUpdateHand() {
+      this.addOrUpdateVisib = true;
+      this.$nextTick(() => {
+        this.$refs.ApprovalComments.init(this.$refs.avatar.form.fId,520);
+      });
+    },
     //首页审批跳转关闭返回首页
     cancelTwo() {
       this.open = false
@@ -1016,8 +1040,8 @@ export default {
           break
         case '修改':
           this.contentButton.forEach(item =>{
-            if (this.$refs.avatar.form.fBillstatus > 4){
-              if (item.name === '返回列表' || item.name === '修改' || item.name === '生成入库单' || item.name === '生成销售单' || item.name === '查看审批'){
+            if (this.$refs.avatar.form.fBillstatus >= 4){
+              if (item.name === '返回列表' || item.name === '修改' || item.name === '生成入库单' || item.name === '生成销售单' || item.name === '查看审批' || item.name === '审批'){
                 item.disabled = false
               }else {
                 item.disabled = true
@@ -1054,6 +1078,9 @@ export default {
         case '查看审批':
           this.addOrUpdateHandle()
           break
+        case '审批':
+          this.addOrUpdateHand()
+          break
         case '返回列表':
           if (!this.$refs.avatar.form.fId && this.contentList !== 0 || this.$refs.avatar.form.fBillstatus > 3) {
             data = {
@@ -1152,8 +1179,14 @@ export default {
               item.disabled = true
             }
           })
-          this.$refs.avatar.form = res.data.warehouseBills
-          this.contentList = res.data.tWarehousebillsCntrs
+          // this.$refs.avatar.form = res.data.warehouseBills
+          // this.contentList = res.data.tWarehousebillsCntrs
+          let data = {
+            tableName: this.queryList.tableName,
+            userId: Cookies.get('userName')
+          }
+          this.getRow(data)
+          this.query(this.formDataList)
         }
       })
     },

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]: ''