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

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

@@ -29,12 +29,12 @@
         stripe
         border
         @selection-change	="selectionChange">
-        <!-- <el-table-column
+        <el-table-column
           type="selection"
           width="55"
           fixed="left"
           align="center">
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column
           prop="rowno"
           width="100px"

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -29,11 +29,11 @@
       size="small"
       stripe
       border>
-      <!-- <el-table-column
+      <el-table-column
         type="selection"
         width="55"
         align="center">
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column
         prop="rowno"
         width="100px"

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -29,11 +29,11 @@
       size="small"
       stripe
       border>
-      <!-- <el-table-column
+      <el-table-column
         type="selection"
         width="55"
         align="center">
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column
         prop="rowno"
         width="100px"