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

src/combination/listComponent.vue

@@ -273,7 +273,8 @@ export default {
         if (res.code == 200) {
           this.showSetting = false;
           this.listStyle.forEach(item=>item.checked = 0)
-          this.queryList.columnList = this.setRowList =this.listStyle;
+          this.queryList.columnList = this.setRowList = this.listStyle;
+          console.log(this.listStyle)
         }
       });
     },

src/views/purchaseRequest/index.vue

@@ -65,7 +65,7 @@
         :tatolLabel="tatolLabel"
         :isItHidden="isItHidden"
         :customButton="contentButton"
-        :listStyle="listStyle"
+        :listStyle="contentStyle"
         :queryList="purchaseList"
         :setRowList="setRowList"
         :listData="listData"
@@ -173,6 +173,7 @@ export default {
         fFeeunitid: [],
         fStltypeid: []
       },
+      setTimeout:'',
       searchWhether: true,
       pageDisplay: true,
       dataList: {
@@ -763,8 +764,7 @@ export default {
       })
     },
     //查询列数据
-    getRow(data) {
-      console.log(data.tableName)
+    getRow(data,list) {
       select(data).then((res) => {
         console.log(res)
         if (data.tableName === '采购申请详情') {
@@ -799,6 +799,11 @@ export default {
           this.isItHidden = true
           this.inDex = 4
         }
+        this.$refs.avatar.form = {}
+        if (list){
+          this.$refs.avatar.form = list.warehouseBills
+          this.contentList = list.tWarehousebillsfees
+        }
       })
     },
     returnToForm(row) {
@@ -815,10 +820,12 @@ export default {
             tableName: this.purchaseList.tableName,
             userId: Cookies.get('userName')
           }
+          let list ={
+            warehouseBills:res.data.warehouseBills,
+            tWarehousebillsfees:res.data.tWarehousebillsfees
+          }
           this.$refs.avatar.form = {}
-          this.getRow(data)
-          this.$refs.avatar.form = res.data.warehouseBills
-          this.contentList = res.data.tWarehousebillsfees
+          this.getRow(data,list)
         }
       })
     },
@@ -841,10 +848,7 @@ export default {
               type: 'success',
               message: '删除成功!'
             })
-            let list = {
-              fBilltype: 'SQ'
-            }
-            this.query(list)
+            this.query(this.formDataList)
           })
         }).catch(() => {
           this.$message({
@@ -953,17 +957,14 @@ export default {
           })
           break
         case '返回列表':
-          if (!this.$refs.avatar.form || this.contentList !== 0) {
+          console.log(this.$refs.avatar.form,this.contentList)
+          if (!this.$refs.avatar.form.fId && this.contentList !== 0) {
             data = {
               tableName: this.queryList.tableName,
               userId: Cookies.get('userName')
             }
-            this.$refs.avatar.form = {}
             this.getRow(data)
-            let list = {
-              fBilltype: 'SQ'
-            }
-            this.query(list)
+            this.query(this.formDataList)
           } else {
             this.$confirm('当前数据未保存是否保存?', '提示', {
               confirmButtonText: '保存',
@@ -971,22 +972,18 @@ export default {
               type: 'warning'
             }).then(() => {
               this.submitAndSave()
-              console.log('111112')
             }).catch(() => {
               data = {
                 tableName: this.queryList.tableName,
                 userId: Cookies.get('userName')
               }
-              this.$refs.avatar.form = {}
               this.getRow(data)
-              let list = {
-                fBilltype: 'SQ'
-              }
-              this.query(list)
-              console.log('333')
+              this.query(this.formDataList)
             })
           }
           break
+        case '请核':
+          
         default:
           this.$message.error('该按钮暂无功能')
       }