Merge branch 'dev' into sit

src/views/stock/goodsRepertory/columns.js

@@ -127,7 +127,7 @@ const listCol = [
     width: "85px",
   },
   {
-    prop: "market_price",
+    prop: "sale_price",
     label: "售价",
     width: "70px",
   },

src/views/stock/stockCount/components/dataWeido/index.vue

@@ -269,8 +269,8 @@ export default {
       const { code } = e;
       this.parmValue.stock_code = code ? [code] : [];
       this.stock_code = code || "";
-      this.parmValue.stock_code = [];
-      this.stock_code = "";
+      // this.parmValue.stock_code = [];
+      // this.stock_code = "";
       this.parmValue.page = 1;
       this.pageInfo.curr = 1;
       await this.searchList();