bug

src/views/saleManage/saleOrder/accountstatement/components/inventoryTable.vue

@@ -8,9 +8,9 @@
             <span>销售订单：</span>
             <span>{{ item.orderNo }}</span>
             <el-divider direction="vertical"></el-divider>
-            <span>计价方式：</span>
-            <span> {{ item.pricingWay == 1 ? '按数量计费' : '按重量计费' }}</span>
-            <el-divider direction="vertical"></el-divider>
+            <!-- <span>计价方式：</span>
+            <span> {{ item.pricingWay == 1 ? '按数量计费' : '按重量计费' }}</span> -->
+            <!-- <el-divider direction="vertical"></el-divider> -->
             <span>总金额：</span>
             <span>{{item.amountTotalPrice}}</span>
             <el-divider direction="vertical"></el-divider>
@@ -27,7 +27,7 @@
           <div  v-for="(j,i) in item.subList" :key="i">
             <ele-pro-table :show-summary="true" :summary-method="getSummaries" ref="table" row-key="id" :needPage="false"
                            :columns="getColumns(j)" max-height="500px" style="margin-bottom: 10px"
-                           :sub-title="subTypeList[j.subType]+j.statementSubOrderCode" :toolkit="[]" :datasource="j.detailList"
+                           :sub-title="getTitle(j)" :toolkit="[]" :datasource="j.detailList"
                            cache-key="systemRoleTable17-11121" class="time-form">
               <template v-slot:action="{ row,$index }">
                 <el-popconfirm class="ele-action" title="确定要删除吗？" @confirm="remove(index,$index,'line')">
@@ -128,6 +128,18 @@ export default {
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            minWidth: 140,
+            prop: 'subType',
+            label: '退货产品类型',
+            slot: 'subType',
+            align: 'center',
+            show:j.subType==11,
+            showOverflowTooltip: true,formatter(_row, _column, cellValue){
+              return cellValue==11?'原货':'实物赔偿'
+            }
+          },
+          
           {
             minWidth: 100,
             prop: 'specification',
@@ -207,19 +219,31 @@ export default {
             slot: 'weightUnit',
             align: "center"
           },
-          // {
-          //   minWidth: 90,
-          //   prop: 'singlePrice',
-          //   label: '单价',
-          //   align: 'center',
-          //   slot: 'singlePrice'
-          // },
+          {
+            minWidth: 90,
+            prop: 'singlePrice',
+            label: '单价',
+            align: 'center',
+            slot: 'singlePrice',
+            show:j.subType==11
+          },
           {
             minWidth: 100,
             prop: 'discountSinglePrice',
             label: '单价',
             align: 'center',
-            slot: 'discountSinglePrice'
+            slot: 'discountSinglePrice',
+            show:j.subType!=11
+
+          },
+          {
+            minWidth: 120,
+            prop: 'totalPrice',
+            label: '合计金额',
+            slot: 'totalPrice',
+            align: 'center',
+            show:j.subType==11
+
           },
           {
             minWidth: 120,
@@ -227,7 +251,10 @@ export default {
             label: '合计金额',
             slot: 'discountTotalPrice',
             align: 'center',
+            show:j.subType!=11
+
           },
+    
           // {
           //   minWidth: 100,
           //   prop: 'discountTotalPrice',
@@ -356,6 +383,29 @@ export default {
         return basicFields
       }
     },
+    getTitle(){
+        return (j)=>{
+          let title=this.subTypeList[j.subType]+(j.statementSubOrderCode||'')+' '
+          if(j.subType==11&&j.returnType){
+                 if(j.returnType=='10'){
+                  title=title+' 退货方式：全部原货 '
+                 }
+                 if(j.returnType=='20'){
+                  title=title+' 退货方式：部分原货+实物赔偿'
+                 }
+                 if(j.returnType=='30'){
+                  title=title+' 退货方式：部分原货+现金赔偿 '+' 赔偿金额：'+j.amountPayablePrice
+                 }
+                 if(j.returnType=='40'){
+                  title=title+' 退货方式：全部实物赔偿'
+                 }
+                 if(j.returnType=='50'){
+                  title=title+' 退货方式：全部现金赔偿  '+' 赔偿金额：'+j.amountPayablePrice
+                 }
+          }
+          return title
+        }
+      }
   },
   data() {
     return {
@@ -364,6 +414,7 @@ export default {
       subTypeList:{
         10:'发货单：',
         11:'退货单：',
+        12:'实物赔偿清单：',
       },
       subColumnsTypeList:{
         10:'发货日期',

src/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue

@@ -475,6 +475,10 @@
         this.dialogType = type;
         if (type !== 'add') {
           this.getReturnInfo(row);
+        } else {
+          if (row?.id) {
+            this.getReturnOrderInfo(row);
+          }
         }
       },
       listChange(key, value) {

src/views/saleManage/saleOrder/invoiceConfirm/components/addInvoiceDialog.vue

@@ -842,11 +842,11 @@
               item['pricingWay'] = item.pricingWay||val.pricingWay || 1;
 
               if (item.pricingWay == 1) {
-                item.totalPrice = item.singlePrice * item.totalCount;
+                item.totalPrice = item.singlePrice * item.packingQuantity;
               }
               if (item.pricingWay == 2) {
                 item.totalPrice =
-                  item.singlePrice * item.totalCount * item.sendTotalWeight;
+                  item.singlePrice * item.packingQuantity * item.sendTotalWeight;
               }
             }
           });

src/views/saleManage/saleOrder/returnGoods/index.vue

@@ -161,7 +161,7 @@
     <!--  客户真实退货单  -->
     <customer-return-order-dialog
       v-if="customerReturnOrderDialogFlag"
-      :customer-return-order-dialog-flag.sync="customerReturnOrderDialogFlag"
+      :addOrEditDialogFlag.sync="customerReturnOrderDialogFlag"
       ref="customerReturnOrderDialogRef"
     >
     </customer-return-order-dialog>
@@ -188,7 +188,7 @@
   import sendDetailDialog from '@/views/saleManage/saleOrder/invoice/components/detailDialog.vue';
   import orderDetailDialog from '@/views/saleManage/saleOrder/components/detailDialog.vue';
   import popModal from '@/components/pop-modal';
-  import customerReturnOrderDialog from '@/views/saleManage/saleOrder/returnGoods/components/customerReturnOrderDialog.vue';
+  import customerReturnOrderDialog from '@/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue';
   import { reviewStatusEnum } from '@/enum/dict';
   import {
     getReturnTableList,