Merge branch 'wang' into orderChange

src/views/business/stockOrderNewSelectProduct.vue

@@ -100,6 +100,11 @@
                         prop="qxlb"
                         show-overflow-tooltip
                     ></el-table-column>
+                    <el-table-column
+                        label="配送企业"
+                        prop="companyName"
+                        show-overflow-tooltip
+                    ></el-table-column>
                     <el-table-column label="操作" fixed="right" width="160">
                         <template slot-scope="scope">
                             <el-button

src/views/inventory/invMAOrderAudit.vue

@@ -44,10 +44,7 @@
                             >查询
                             </el-button
                             >
-                            <el-button type="primary" icon="search" @click="addMAOrder"
+
-                            >新增养护记录
-                            </el-button
-                            >
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -209,14 +206,12 @@ export default {
             this.getList();
         },
         onSubmit() {
-            this.getList();
+            this.getList1();
         },
         handleCurrentChange(val) {
             this.filterQuery.page = val;
-            this.getList();
+                 this.getList();
-            if(val==2){
+
-                 this.getList1();
-            }
 
 
         },