框/扇排序、框统计-框数量、扇统计-扇数量

src/views/production/materialprocurement/modules/materialProcurementAdd.vue

@@ -539,14 +539,14 @@
                     scopedSlots: { customRender: 'framesTang' } 
                 },
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                     scopedSlots: { customRender: 'framesCount' } 
                 },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/materialprocurement/modules/materialProcurementDetail.vue

@@ -301,13 +301,13 @@
                     ellipsis: true,
                 },
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                 },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/mrp/modules/ProRequirements.vue

@@ -241,13 +241,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                 },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/mrp/modules/ProRequirementsDetail.vue

@@ -229,13 +229,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                 },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/mrp/modules/TraRequirements.vue

@@ -187,13 +187,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                 },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/mrp/modules/TraRequirementsDeatail.vue

@@ -182,13 +182,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                 },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/mrp/modules/demand.vue

@@ -212,13 +212,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                  },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/mrp/modules/supply.vue

@@ -187,13 +187,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                  },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/mrp/modules/supplyDemandBalance.vue

@@ -253,13 +253,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                  },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/productionTotalOrder/modules/SurplusMaterials.vue

@@ -400,14 +400,14 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                     scopedSlots: { customRender: 'framesCount' } 
                  },
                  {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/productionTotalOrder/modules/SurplusMaterialsDetail.vue

@@ -212,13 +212,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                  },
                  {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/productionTotalOrder/modules/TemporaryStorageDetail.vue

@@ -108,6 +108,18 @@
                     dataIndex: 'unQuantity',
                     ellipsis: true,
                 },
+                {
+                    title: '框运费',
+                    align:"center",
+                    dataIndex: 'boxFreight',
+                    ellipsis: true,
+                },
+                {
+                    title: '扇运费',
+                    align:"center",
+                    dataIndex: 'fanFreight',
+                    ellipsis: true,
+                },
                 {
                     title: '框数量',
                     align:"center",

src/views/production/productionTotalOrder/modules/materiaWaring.vue

@@ -277,13 +277,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                  },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/productionTotalOrder/modules/material.vue

@@ -401,14 +401,14 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                     scopedSlots: { customRender: 'framesCount' } 
                  },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/productionTotalOrder/modules/materialDetail.vue

@@ -215,13 +215,13 @@
                 },
                 
                 {
-                    title: '框统计',
+                    title: '框数量',
                     align:"center",
                     dataIndex: 'framesCount',
                     ellipsis: true,
                  },
                 {
-                    title: '扇统计',
+                    title: '扇数量',
                     align:"center",
                     dataIndex: 'leafCount',
                     ellipsis: true,

src/views/production/productionTotalOrder/modules/productDetails.vue

@@ -330,13 +330,6 @@
                     scopedSlots: { customRender: 'leafCount' } ,
                     slots:{title:'leafCountTitle'},
                 },
-                {
-                    title: '已入库扇数量',
-                    align:"center",
-                    dataIndex: 'executeInLeaf',
-                    ellipsis: true,
-                    // scopedSlots: { customRender: 'executeInLeaf' } ,
-                },
                 {
                     title: '已入库框数量',
                     align:"center",
@@ -345,11 +338,11 @@
                     // scopedSlots: { customRender: 'executeInFrames' } 
                 },
                 {
-                    title: '已出库扇数量',
+                    title: '已入库扇数量',
                     align:"center",
-                    dataIndex: 'executeOutLeaf',
+                    dataIndex: 'executeInLeaf',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'executeOutLeaf' } 
+                    // scopedSlots: { customRender: 'executeInLeaf' } ,
                 },
                 {
                     title: '已出库框数量',
@@ -358,6 +351,13 @@
                     ellipsis: true,
                     // scopedSlots: { customRender: 'executeOutFrames' } 
                 },
+                {
+                    title: '已出库扇数量',
+                    align:"center",
+                    dataIndex: 'executeOutLeaf',
+                    ellipsis: true,
+                    // scopedSlots: { customRender: 'executeOutLeaf' } 
+                },
                 {
                     title: '规格',
                     align:"center",

src/views/production/productionTotalOrder/modules/productDetailsParticulars.vue

@@ -126,12 +126,6 @@
                     dataIndex: 'leafCount',
                     ellipsis: true,
                 },
-                {
-                    title: '已入库扇数量',
-                    align:"center",
-                    dataIndex: 'executeInLeaf',
-                    ellipsis: true,
-                },
                 {
                     title: '已入库框数量',
                     align:"center",
@@ -139,17 +133,25 @@
                     ellipsis: true,
                 },
                 {
-                    title: '已出库扇数量',
+                    title: '已入库扇数量',
                     align:"center",
-                    dataIndex: 'executeOutLeaf',
+                    dataIndex: 'executeInLeaf',
                     ellipsis: true,
                 },
+                
                 {
                     title: '已出库框数量',
                     align:"center",
                     dataIndex: 'executeOutFrames',
                     ellipsis: true,
                 },
+                {
+                    title: '已出库扇数量',
+                    align:"center",
+                    dataIndex: 'executeOutLeaf',
+                    ellipsis: true,
+                },
+                
                 {
                     title: '规格',
                     align:"center",