Merge branch 'v3.0-dev-before' into v3.0

src/views/purchaseIn/purchaseOrder/columns.js

@@ -15,11 +15,17 @@ const columns = [
     label: '采购单编号',
     width: '155px'
   },
+
   {
     prop: 'orderCode',
     label: '订单编号',
     width: '155px'
   },
+  {
+    prop: 'bkcode',
+    label: '备库单编号',
+    width: '152px'
+  },
   {
     prop: 'has_account',
     label: '供应商端',

src/views/purchaseIn/purchaseOrder/index.vue

@@ -224,7 +224,7 @@
                     <el-option label="订单编号" value="8"></el-option>
                     <!-- <el-option label="入库单编号" value="2"></el-option> -->
                     <!-- 列表未渲染备库编号，注释 -->
-                    <!-- <el-option label="备库编号" value="3"></el-option> -->
+                    <el-option label="备库编号" value="3"></el-option>
                     <el-option label="商品成本编号" value="4"></el-option>
                     <el-option label="商品名称" value="5"></el-option>
                     <!-- <el-option label="供应商负责人" value="6"></el-option> -->

src/views/supplierPurchaseIn/supplierPurchaseOrder/columns.js

@@ -20,6 +20,11 @@ const columns = [
     label: '订单编号',
     width: '155px'
   },
+  {
+    prop: 'bkcode',
+    label: '备库单编号',
+    width: '152px'
+  },
   // {
   //   prop: "bkcode",
   //   label: "备库单编号",

src/views/supplierPurchaseIn/supplierPurchaseOrder/index.vue

@@ -212,7 +212,7 @@
                     <el-option label="订单编号" value="8"></el-option>
                     <!-- <el-option label="入库单编号" value="2"></el-option> -->
                     <!-- 列表未渲染备库编号，注释 -->
-                    <!-- <el-option label="备库编号" value="3"></el-option> -->
+                    <el-option label="备库编号" value="3"></el-option>
                     <el-option label="商品成本编号" value="4"></el-option>
                     <el-option label="商品名称" value="5"></el-option>
                     <el-option label="商品创建人" value="6"></el-option>