Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

# Conflicts:
#	src/HDrpManagement/orderManage/details/tabs/productlist.vue

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -849,7 +849,7 @@ export default {
   mounted () {
     this.listData()
     // this.queryStock()
-    this.columnTitle  = []
+    // this.columnTitle  = []
     setTimeout(() => {
       /* 处理宁波站点 */
       let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
@@ -860,14 +860,12 @@ export default {
           if (item.columnname != 'stockname' && item.columnname != 'position' && item.columnname != 'batchno') return item
         })
       }
-
-      this.$refs.multipleTable.$refs.table.$children.forEach(obj => {
-      let columnChild = {'columnname':obj.prop,'filter':0,'rowindex':'','sequence':'','title':obj.label,'width':obj.width}
-      // 存到columnTitle数组中
-      this.columnTitle.push(columnChild)
-
       
-    })
+      // this.$refs.multipleTable.$refs.table.$children.forEach(obj => {
+      //   let columnChild = {'columnname':obj.prop,'filter':0,'rowindex':'','sequence':'','title':obj.label,'width':obj.width}
+      //   // 存到columnTitle数组中
+      //   this.columnTitle.push(columnChild)
+      // })
     },1000)
   },
   created() {

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -639,14 +639,14 @@ export default {
   mounted () {
     this.listData()
     console.log("表结构")
-    this.columnTitle  = []
-    setTimeout(() => {
-      this.$refs.multipleTable.$refs.table.$children.forEach(obj => {
-      let columnChild = {'columnname':obj.prop,'filter':0,'rowindex':'','sequence':'','title':obj.label,'width':obj.width}
-      // 存到columnTitle数组中
-      this.columnTitle.push(columnChild)
-    })
-    },1000)
+    // this.columnTitle  = []
+    // setTimeout(() => {
+    //   this.$refs.multipleTable.$refs.table.$children.forEach(obj => {
+    //   let columnChild = {'columnname':obj.prop,'filter':0,'rowindex':'','sequence':'','title':obj.label,'width':obj.width}
+    //   // 存到columnTitle数组中
+    //   this.columnTitle.push(columnChild)
+    // })
+    // },1000)
   },
   created() {
     this.tablecolsAdd = this.tool.tabelCol(this.$route.name).addProductTable.tablecols

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -667,14 +667,14 @@ export default {
   mounted () {
     this.listData()
     console.log("表结构")
-    this.columnTitle  = []
-    setTimeout(() => {
-      this.$refs.multipleTable.$refs.table.$children.forEach(obj => {
-      let columnChild = {'columnname':obj.prop,'filter':0,'rowindex':'','sequence':'','title':obj.label,'width':obj.width}
-      // 存到columnTitle数组中
-      this.columnTitle.push(columnChild)
-    })
-    },1000)
+    // this.columnTitle  = []
+    // setTimeout(() => {
+    //   this.$refs.multipleTable.$refs.table.$children.forEach(obj => {
+    //   let columnChild = {'columnname':obj.prop,'filter':0,'rowindex':'','sequence':'','title':obj.label,'width':obj.width}
+    //   // 存到columnTitle数组中
+    //   this.columnTitle.push(columnChild)
+    // })
+    // },1000)
     // console.log(this.columnTitle)
   },
   created() {