首页修改

SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml

@@ -913,8 +913,11 @@ GROUP BY
         <result property="Number" column="Number"/>
         <!--部门-->
         <result property="FFullName" column="FFullName"/>
-
-        <!--采购总额-->
+        <!--销售磅单数-->
+        <result property="bangdan" column="bangdan"/>
+        <!--销售吨位-->
+        <result property="settlement" column="settlement"/>
+        <!--销售总额-->
         <result property="amout" column="amout"/>
         <!--代付款总额-->
         <result property="notCollectionAmounts" column="notCollectionAmounts"/>
@@ -922,22 +925,40 @@ GROUP BY
         <result property="collectionamounts" column="collectionamounts"/>
     </resultMap>
     <select id="getSalesorderData" resultMap="getSalesorderDataMap">
+
 SET @i = 0;
 SELECT
 	( @i := @i + 1 ) AS 'Number',
 	F_FullName AS FFullName,
-	SUM(price) AS amout,
-	SUM(price)- SUM(amount_collected)  AS notCollectionAmounts,
+	SUM( a.price ) AS amout,
+	bangdan,
+	settlement,
+	SUM( a.price )- SUM( amount_collected ) AS notCollectionAmounts,
 	SUM( amount_collected ) AS collectionamounts
-
 FROM
 	jg_salesorder a
 	LEFT JOIN base_organize z ON a.department_id = z.F_Id
+	LEFT JOIN (
+	SELECT
+		COUNT( b.id ) AS bangdan,
+		SUM(
+		Round( IF ( b.unit = '1', b.settlement / 1000, b.settlement ), 3 )) AS settlement,
+		a.department_id
+	FROM
+		jg_salesorder a
+		LEFT JOIN jg_salesorder_item0 b ON a.id = b.sales_order_id
+		AND b.delete_mark = '0'
 	WHERE
 		to_days( a.creator_time ) = to_days(
 		now())
-	AND
-	a.delete_mark='0'
+		AND a.delete_mark = '0'
+	GROUP BY
+		a.department_id
+	) c ON a.department_id = c.department_id
+WHERE
+	to_days( a.creator_time ) = to_days(
+	now())
+	AND a.delete_mark = '0'
 GROUP BY
 	a.department_id
     </select>

SC-web/src/views/dashboard/admin/components/SaleTodayList.vue

@@ -11,6 +11,8 @@
         <el-table-column prop="Number" width="50px" label="序号">
         </el-table-column>
         <el-table-column prop="FFullName" label="部门"> </el-table-column>
+        <el-table-column prop="bangdan" label="磅单张数"></el-table-column>
+        <el-table-column prop="settlement" label="吨位"></el-table-column>
         <el-table-column prop="amout" label="总额（元）"> </el-table-column>
         <el-table-column prop="notCollectionAmounts" label="待回款总额">
         </el-table-column>
@@ -75,11 +77,15 @@ export default {
               FFullName: "所有部门",
               Number: "合计",
               amout: 0,
+              bangdan: 0,
+              settlement: 0,
               collectionamounts: 0,
               notCollectionAmounts: 0,
             };
             this.list.map((val) => {
               listCount.amout = round(listCount.amout+ val.amout) ;
+              listCount.bangdan = listCount.bangdan + val.bangdan;
+              listCount.settlement = round(listCount.settlement + val.settlement);
               listCount.collectionamounts = round(listCount.collectionamounts+val.collectionamounts);
               listCount.notCollectionAmounts = round(listCount.notCollectionAmounts + val.notCollectionAmounts);
               return val;