xiugai

src/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog.vue

@@ -339,7 +339,7 @@
         entrustedCode: '',
         entrustedId: '',
         entrustedReceiveId: '',
-        entrustedReceiveCode: ''
+        entrustedReceiveCode: '',
         // type: '10'
       };
 
@@ -565,11 +565,7 @@
             prop: 'technicalDrawings',
             label: '技术图纸',
             slot: 'technicalDrawings',
-            formatter: (_row, _column, cellValue) => {
-              return (
-                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
-              );
-            },
+ 
             align: 'center'
           },
           {
@@ -648,7 +644,7 @@
             allcountAmount =
               (this.$refs.inventoryTableref &&
                 this.$refs.inventoryTableref.totalAmount) +
-              Number(this.form.redressAmount);
+              Number(this.form.redressAmount||0);
           }
           if (this.form.type === '40') {
             allcountAmount =
@@ -656,7 +652,7 @@
               this.$refs.inventoryTableref1.getPrice()[0];
           }
           if (this.form.type === '50') {
-            allcountAmount = Number(this.form.redressAmount);
+            allcountAmount = Number(this.form.redressAmount||0);
           }
         } else {
           allcountAmount =

src/views/saleManage/saleOrder/returnGoods/components/detailDialog.vue

@@ -136,11 +136,14 @@
         row-key="id"
       >
       </ele-pro-table>
-      <headerTitle title="退货产品明细"></headerTitle>
+      <headerTitle title="退货产品明细"
+      v-show="!['40', '50'].includes(form.type) || form.returnSourceType != 1"
+      ></headerTitle>
       <ele-pro-table
         ref="table"
         :needPage="false"
         :columns="competAnalysisListcolumns"
+        v-show="!['40', '50'].includes(form.type) || form.returnSourceType != 1"
         :toolkit="[]"
         :datasource="detailData.productList"
         row-key="id"
@@ -435,11 +438,7 @@
             prop: 'technicalDrawings',
             label: '技术图纸',
             slot: 'technicalDrawings',
-            formatter: (_row, _column, cellValue) => {
-              return (
-                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
-              );
-            },
+
             align: 'center'
           },
           {