Jelajahi Sumber

修改字段和合计

Qukatie 8 bulan lalu
induk
melakukan
3465590f15

+ 39 - 4
src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -143,6 +143,41 @@ export default {
                         name: 'profit',
                         type: 'sum',
                         decimals: 2
+                    },
+                    {
+                        name: 'primaryGoodsTotalNum',
+                        type: 'sum',
+                        decimals: 0
+                    },
+                    {
+                        name: 'primaryGoodsTotalMoney',
+                        type: 'sum',
+                        decimals: 2
+                    },
+                    {
+                        name: 'price',
+                        type: 'sum',
+                        decimals: 2
+                    },
+                    {
+                        name: 'outGoodsTotalShipNum',
+                        type: 'sum',
+                        decimals: 0
+                    },
+                    {
+                        name: 'outGoodsTotalShipAmount',
+                        type: 'sum',
+                        decimals: 2
+                    },
+                    {
+                        name: 'surplusNum',
+                        type: 'sum',
+                        decimals: 0
+                    },
+                    {
+                        name: 'surplusAmount',
+                        type: 'sum',
+                        decimals: 2
                     }
                 ],
                 column: [{
@@ -236,12 +271,12 @@ export default {
                 //     overHidden: true,
                 // },
                 {
-                    label: '采购数量',
+                    label: '订单数量',
                     prop: 'primaryGoodsTotalNum',
                     overHidden: true,
                 },
                 {
-                    label: '采购金额',
+                    label: '订单金额',
                     prop: 'primaryGoodsTotalMoney',
                     overHidden: true,
                 },
@@ -366,12 +401,12 @@ export default {
             // 合计的配置项
             commodityLabel: [{
                 id: 1,
-                label: '采购数量',
+                label: '订单数量',
                 prop: 'primaryGoodsTotalNum'
             },
             {
                 id: 2,
-                label: '采购金额',
+                label: '订单金额',
                 prop: 'primaryGoodsTotalMoney'
             },
             // {

+ 28 - 2
src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -786,6 +786,24 @@ export default {
                 }, {
                     name: "returnsAmount",
                     type: "sum"
+                }, {
+                    name: "primaryGoodsTotalNum",
+                    type: "sum"
+                }, {
+                    name: "inventory",
+                    type: "sum"
+                }, {
+                    name: "rebatePrice",
+                    type: "sum",
+                    decimals: 2
+                }, {
+                    name: "rebateCostprie",
+                    type: "sum",
+                    decimals: 2
+                }, {
+                    name: "rebateProfit",
+                    type: "sum",
+                    decimals: 2
                 }],
                 column: [
                     {
@@ -934,6 +952,15 @@ export default {
                         width: 100
                     },
                     {
+                        label: '订单数量',
+                        prop: 'primaryGoodsTotalNum',
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    },
+                    {
                         label: '收货数量',
                         prop: 'sendNum',
                         overHidden: true,
@@ -941,8 +968,7 @@ export default {
                         disabled: true,
                         editDisplay: false,
                         addDisplay: false
-                    }
-                    ,
+                    },
                     {
                         label: '出库数量',
                         prop: 'outGoodsTotalShipNum',

+ 75 - 9
src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -237,15 +237,83 @@ export default {
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
-        sumColumnList: [{
+        sumColumnList: [
+          {
           name: 'goodsTotalNum',
           type: 'sum',
           decimals: 0
-        }, {
+        }, 
+        {
           name: 'totalMoney',
           type: 'sum',
           decimals: 2
-        },],
+        }, 
+        {
+          name: 'fundingAmount',
+          type: 'sum',
+          decimals: 2
+        }, 
+        {
+          name: 'useAdvanceChargeAmount',
+          type: 'sum',
+          decimals: 2
+        }, 
+        {
+          name: 'produceAdvanceChargeAmount',
+          type: 'sum',
+          decimals: 2
+        }, 
+        {
+          name: 'bondAmount',
+          type: 'sum',
+          decimals: 2
+        }, 
+        {
+          name: 'interest',
+          type: 'sum',
+          decimals: 2
+        }, 
+        {
+          name: 'goodsTotalShipNum',
+          type: 'sum',
+          decimals: 0
+        }, 
+        {
+          name: 'goodsTotalShipAmount',
+          type: 'sum',
+          decimals: 2
+        }, 
+        {
+          name: 'outGoodsTotalShipNum',
+          type: 'sum',
+          decimals: 0
+        }, 
+        {
+          name: 'outGoodsTotalShipAmount',
+          type: 'sum',
+          decimals: 2
+        }, 
+        {
+          name: 'surplusShipNum',
+          type: 'sum',
+          decimals: 0
+        }, 
+        {
+          name: 'surplusShipAmount',
+          type: 'sum',
+          decimals: 2
+        }, 
+        {
+          name: 'primaryFundingAmount',
+          type: 'sum',
+          decimals: 2
+        }, 
+        {
+          name: 'primaryGoodsTotalNum',
+          type: 'sum',
+          decimals: 0
+        }
+      ],
         column: [
           {
             label: '供应商',
@@ -312,6 +380,10 @@ export default {
             },
             dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
           }, {
+            label: '订单数量',
+            prop: "primaryGoodsTotalNum",
+            overHidden: true,
+          }, {
             label: '总数量',
             prop: "goodsTotalNum",
             overHidden: true,
@@ -438,12 +510,6 @@ export default {
             overHidden: true,
           },
           {
-            label: '原数量',
-            prop: "primaryGoodsTotalNum",
-            search: true,
-            overHidden: true,
-          },
-          {
             label: "制单人",
             prop: "createUserName",
             searchProp: "createUser",