yusheng hai 1 ano
pai
achega
2330d1bc20

+ 7 - 0
src/views/purchasingManage/inquiryManage/components/detailDialog.vue

@@ -210,6 +210,13 @@
             showOverflowTooltip: true,
             align: 'center',
           },
+          {
+            width: 120,
+            prop: 'totalWeight',
+            label: '重量',
+            slot: 'totalWeight',
+            align: 'center'
+          },
           {
             minWidth: 80,
             prop: 'measuringUnit',

+ 8 - 7
src/views/purchasingManage/inquiryManage/components/inventoryTable.vue

@@ -205,6 +205,13 @@ export default {
           slot: 'availableCountBase',
           align: "center"
         },
+        {
+            width: 120,
+            prop: 'totalWeight',
+            label: '重量',
+            slot: 'totalWeight',
+            align: 'center'
+          },
         {
           minWidth: 150,
           prop: 'taskName',
@@ -251,13 +258,7 @@ export default {
         //     slot: 'singleWeight',
         //     align: 'center'
         //   },
-          {
-            width: 120,
-            prop: 'totalWeight',
-            label: '重量',
-            slot: 'totalWeight',
-            align: 'center'
-          },
+     
         {
           minWidth: 120,
           prop: 'imgCode',

+ 16 - 1
src/views/purchasingManage/purchaseOrder/components/addDialog.vue

@@ -1410,7 +1410,22 @@
             (this.$refs.inventoryTable &&
               this.$refs.inventoryTable.getTableValue()) ||
             [];
-          let productList = [...tabList, ...rawDetailList, ...outputDetailList];
+          let productList = [...tabList, ...rawDetailList.map(item=>{
+            item.singlePrice=item.singlePrice||0
+            item.discountSinglePrice=item.discountSinglePrice||0
+            item.totalPrice=item.totalPrice||0
+            item.discountTotalPrice=item.discountTotalPrice||0
+            
+            
+            return item
+          }), ...outputDetailList.map(item=>{
+            item.singlePrice=item.singlePrice||0
+            item.discountSinglePrice=item.discountSinglePrice||0
+            item.discountTotalPrice=item.discountTotalPrice||0
+            item.totalPrice=item.totalPrice||0
+
+            return item
+          })];
           productList.forEach((item) => {});
           let commitData = Object.assign({}, this.form, {
             productList,

+ 7 - 1
src/views/purchasingManage/purchasePlanManage/components/detailDialog.vue

@@ -371,7 +371,13 @@
             label: '待采数量',
             align: 'center'
           },
-        
+          {
+            width: 120,
+            prop: 'totalWeight',
+            label: '重量',
+            slot: 'totalWeight',
+            align: 'center'
+          },
           {
             width: 100,
             prop: 'measuringUnit',

+ 8 - 7
src/views/purchasingManage/purchasePlanManage/components/inventoryTable.vue

@@ -527,6 +527,13 @@
             slot: 'availableCountBase',
             align: 'center'
           },
+          {
+            width: 120,
+            prop: 'totalWeight',
+            label: '重量',
+            slot: 'totalWeight',
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'arrivalWay',
@@ -567,13 +574,7 @@
           //   slot: 'singleWeight',
           //   align: 'center'
           // },
-          {
-            width: 120,
-            prop: 'totalWeight',
-            label: '重量',
-            slot: 'totalWeight',
-            align: 'center'
-          },
+   
 
           {
             width: 160,