表格组件

src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -118,7 +118,7 @@
     <ele-pro-table
       ref="table"
       :needPage="false"
-      :columns="competAnalysisListcolumns"
+      :columns="columns"
       @columns-change="handleColumnChange"
       :cache-key="cacheKeyUrl"
       :datasource="detailData.productList"
@@ -246,7 +246,7 @@
             align: 'center'
           }
         ],
-        competAnalysisListcolumns: [
+        columns: [
           {
             width: 45,
             type: 'index',

src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/addReturnGoodsDialog.vue

@@ -144,7 +144,7 @@
         </el-col>
       </el-row>
 
-      <headerTitle title="退货产品明细" style="margin-top: 30px"></headerTitle>
+      <headerTitle title="退货物品明细" style="margin-top: 30px"></headerTitle>
       <inventoryTable
         :returnType="form.returnType"
         :returnSourceType="form.returnSourceType"

src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/detailDialog.vue

@@ -68,8 +68,8 @@
           </el-col>
         </el-row>
       </el-form>
-      <headerTitle title="退货产品明细"></headerTitle>
-      <ele-pro-table ref="table" :needPage="false" :columns="competAnalysisListcolumns" :toolkit="[]"
+      <headerTitle title="退货物品明细"></headerTitle>
+      <ele-pro-table ref="table" :needPage="false" :columns="columns" :toolkit="[]"
         :datasource="detailData.productList" row-key="id">
       </ele-pro-table>
     </div>
@@ -89,7 +89,7 @@
     ></detailDialog> -->
     <keep-alive>
       <add ref="add" v-if="activeComp == 'inoutBound'" :form="form" :sourceBizNo="form.returnNo"
-        :detailList="form.productList" :bizType="6" :isMoreProduct="true"></add>
+        :detailList="form.productList.filter(item=>item.packageId)" :saleProductList="form.productList.filter(item=>!item.packageId)" :bizType="6" :isMoreProduct="true"></add>
     </keep-alive>
     <detailDialog v-if="activeComp == 'inoutBoundView'" :businessId="form.receiveNo" ref="detailDialog"></detailDialog>
   </div>
@@ -143,7 +143,7 @@ export default {
       },
       rules: {},
       detailData: {},
-      competAnalysisListcolumns: [
+      columns: [
         {
           width: 45,
           type: 'index',