Merge branch 'master' of http://git.echepei.com/wengyuwen/anpinjingyuan-ui

src/views/index.vue

@@ -701,7 +701,7 @@ export default {
       }
     },
     jump(res) {
-      this.$router.push({ path: res })
+      this.$router.push({ path: res,query: { open: true}})
     },
     //设置单元格边框
     cellStyle({ row, column, rowIndex, columnIndex }) {

src/views/purchaseIssue/index.vue

@@ -697,8 +697,30 @@ export default {
         }
       ]
     }
-  }, activated() {
+  },
+  activated() {
     this.homePage()
+    if (this.$route.query.open === 'true'){
+      this.contentList = []
+      this.contentButton = this.$options.data().contentButton
+      let data = {
+        tableName: this.purchaseList.tableName,
+        userId: Cookies.get('userName')
+      }
+      this.$refs.avatar.form = {}
+      this.getRow(data)
+
+      this.contentOption.forEach(item => {
+        if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'fBillno') {
+          item.disabled = true
+        } else {
+          item.disabled = false
+        }
+      })
+      this.contentButton.forEach(item => item.disabled = false)
+      this.contentStyle.forEach(item => item.disabled = false)
+      this.$router.push({ query: {} })
+    }
   },
   created() {
     //获取登陆人

src/views/purchaseRequest/index.vue

@@ -733,6 +733,27 @@ export default {
   },
   activated(){
     this.homePage()
+    // console.log(this.$route.query.open)
+    if (this.$route.query.open === 'true'){
+      this.contentList = []
+      let data = {
+        tableName: this.purchaseList.tableName,
+        userId: Cookies.get('userName')
+      }
+      this.$refs.avatar.form = {}
+      this.getRow(data)
+      this.contentOption.forEach(item => {
+        if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {
+          item.disabled = true
+        } else {
+          item.disabled = false
+        }
+      })
+      this.contentButton.forEach(item => item.disabled = false)
+      this.contentStyle.forEach(item => item.disabled = false)
+      this.$refs.avatar.form.createBy = Cookies.get('userName')
+      this.$router.push({ query: {} })
+    }
   },
   created() {
     //获取登陆人

src/views/warehouse/inStock/index.vue

@@ -809,6 +809,31 @@ export default {
       ]
     }
   },
+  activated(){
+    console.log(this.$route.query.open)
+    if (this.$route.query.open === 'true'){
+      this.detailList.columnList = this.detailStyle
+      this.detailForm = {}
+      this.detailData = []
+      this.inDex = this.detailOption.length
+      //从表修改按钮
+      for(let li in this.detailStyle){
+        if(!this.detailStyle[li].doNot){
+          this.detailStyle[li].disabled = false
+        }
+      }
+      for(let item in this.detailOption){
+        if(!this.detailOption[item].doNot){
+          this.detailOption[item].disabled = false
+        }
+      }
+      for(let li in this.detailButton){
+        this.detailButton[li].disabled = false
+      }
+      this.MainTable = true
+      this.$router.push({ query: {} })
+    }
+  },
   created() {
     let data = {
       tableName: this.queryList.tableName,

src/views/warehouse/outStock/index.vue

@@ -800,6 +800,31 @@ export default {
       ]
     }
   },
+  activated(){
+    console.log(this.$route.query.open)
+    if (this.$route.query.open === 'true'){
+      this.detailList.columnList = this.detailStyle
+      this.detailForm = {}
+      this.detailData = []
+      this.inDex = this.detailOption.length
+      //从表修改按钮
+      for(let li in this.detailStyle){
+        if(!this.detailStyle[li].doNot){
+          this.detailStyle[li].disabled = false
+        }
+      }
+      for(let item in this.detailOption){
+        if(!this.detailOption[item].doNot){
+          this.detailOption[item].disabled = false
+        }
+      }
+      for(let li in this.detailButton){
+        this.detailButton[li].disabled = false
+      }
+      this.MainTable = true
+      this.$router.push({ query: {} })
+    }
+  },
   created() {
     let data = {
       tableName: this.queryList.tableName,