yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改首页的经营、采购销售数据

Browse Source
product
bawei 1 year ago
parent 6ec4e586c1
commit 4c54cd41df
4 changed files with 60 additions and 75 deletions
Show Stats Download Patch File Download Diff File

93
SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml
Unescape View File

@ -505,28 +505,11 @@
FROM FROM
( (
SELECT SELECT
count(*) poundNum, count(*) bangdannum,
IFNULL( IFNULL(
ROUND( SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ), 6 ), ROUND( SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ), 6 ),
0 0
) buckleWeightSum, ) buckleWeightSum
IFNULL(
ROUND(
SUM(
CASE
a.unit
WHEN '0' THEN
( CASE a.is_Invoicing WHEN '1' THEN a.settlement ELSE 0 END )
WHEN '1' THEN
( CASE a.is_Invoicing WHEN '1' THEN a.settlement ELSE 0 END ) / 1000
END
),
6
),
0
) settlementSum,
IFNULL( ROUND( SUM( a.settlement * a.purchase_price ), 6 ), 0 ) purchaseAmountSum,
IFNULL( ROUND( SUM( a.settlement * a.sales_price ), 6 ), 0 ) salesAmountSum
FROM FROM
jg_poundlist a jg_poundlist a
WHERE WHERE
@ -855,34 +838,35 @@ SET @i = 0;
SELECT SELECT
( @i := @i + 1 ) AS Number, ( @i := @i + 1 ) AS Number,
F_FullName AS FFullName, F_FullName AS FFullName,
COUNT( id ) AS bangdan, COUNT( b.id ) AS bangdan,
IFNULL( SUM(
ROUND( SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ), 6 ), Round( IF ( b.unit = '1', b.settlement / 1000, b.settlement ), 6 )) AS settlement,
0 SUM( b.amount ) AS amout,
) settlement, SUM( b.amount ) - c.pay_price AS notPaypalAmounts,
IFNULL( c.pay_price AS paypalamounts
ROUND(
SUM( purchase_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
2
),
0
) amout,
IF(is_pay='0',ROUND(
SUM( purchase_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
2
),0) AS notPaypalAmounts,
IF(is_pay='1',ROUND(
SUM( purchase_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
2
),0) AS paypalamounts
FROM FROM
jg_poundlist a jg_purchaseorder a
LEFT JOIN jg_purchaseorder_item0 b ON a.id = b.purchaseorder_id
AND b.delete_mark = '0'
LEFT JOIN (
SELECT
SUM( amount ) - SUM( pay_price ) AS notPaypalAmounts,
SUM( pay_price ) AS pay_price,
department_id
FROM
jg_purchaseorder
WHERE
to_days( creator_time ) = to_days(
now())
AND delete_mark = '0'
GROUP BY
department_id
) c ON a.department_id = c.department_id
LEFT JOIN base_organize z ON a.department_id = z.F_Id LEFT JOIN base_organize z ON a.department_id = z.F_Id
WHERE WHERE
to_days( a.pound_date ) = to_days( to_days( a.creator_time ) = to_days(
now()) now())
AND delete_mark = '0' AND a.delete_mark = '0'
GROUP BY GROUP BY
a.department_id a.department_id
</select> </select>
@ -901,28 +885,19 @@ GROUP BY
<result property="collectionamounts" column="collectionamounts"/> <result property="collectionamounts" column="collectionamounts"/>
</resultMap> </resultMap>
<select id="getSalesorderData" resultMap="getSalesorderDataMap"> <select id="getSalesorderData" resultMap="getSalesorderDataMap">
SET @i = 0; SET @i = 0;
SELECT SELECT
( @i := @i + 1 ) AS 'Number', ( @i := @i + 1 ) AS 'Number',
F_FullName AS FFullName,-- SUM( sales_price ) / COUNT( id ) AS asda, F_FullName AS FFullName,
ROUND( SUM(price) AS amout,
SUM( sales_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ), SUM(price)- SUM(amount_collected) AS notCollectionAmounts,
2 SUM(amount_collected) AS collectionamounts
) amout ,
IF(is_collection='0',ROUND(
SUM( sales_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
2
),0) AS notCollectionAmounts,
IF(is_collection='1',ROUND(
SUM( sales_price * CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
2
),0) AS collectionamounts
FROM FROM
jg_poundlist a jg_salesorder a
LEFT JOIN base_organize z ON a.department_id = z.F_Id LEFT JOIN base_organize z ON a.department_id = z.F_Id
WHERE WHERE
to_days( a.pound_date ) = to_days( to_days( a.creator_time ) = to_days(
now()) now())
AND AND
a.delete_mark='0' a.delete_mark='0'

10
SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue
Unescape View File

@ -9,13 +9,13 @@
<div> <div>
<el-table :data="list" style="width: 100%"> <el-table :data="list" style="width: 100%">
<el-table-column prop="Number" width="50px" label="序号"> <el-table-column prop="Number" width="50px" label="序号">
</el-table-column>上货量(吨)
<el-table-column prop="FFullName" width="110px" label="部门"> </el-table-column>
<el-table-column prop="bangdan" label="磅单张数">
</el-table-column> </el-table-column>
<el-table-column prop="FFullName" label="部门"> </el-table-column> <el-table-column prop="settlement" label="吨位">
<el-table-column prop="bangdan" label="磅单上传数(张)">
</el-table-column> </el-table-column>
<el-table-column prop="settlement" label="吨位(吨)"> <el-table-column prop="amout" label="总额（元）"> </el-table-column>
</el-table-column>
<el-table-column prop="amout" label="总额"> </el-table-column>
<el-table-column prop="notPaypalAmounts" label="待付款总额"> <el-table-column prop="notPaypalAmounts" label="待付款总额">
</el-table-column> </el-table-column>
<el-table-column prop="paypalamounts" label="已付款总额"> <el-table-column prop="paypalamounts" label="已付款总额">

4
SC-web/src/views/dashboard/admin/components/SaleTodayList.vue
Unescape View File

@ -11,10 +11,10 @@
<el-table-column prop="Number" width="50px" label="序号"> <el-table-column prop="Number" width="50px" label="序号">
</el-table-column> </el-table-column>
<el-table-column prop="FFullName" label="部门"> </el-table-column> <el-table-column prop="FFullName" label="部门"> </el-table-column>
<el-table-column prop="amout" label="销售总额"> </el-table-column> <el-table-column prop="amout" label="总额（元）"> </el-table-column>
<el-table-column prop="notCollectionAmounts" label="待回款总额"> <el-table-column prop="notCollectionAmounts" label="待回款总额">
</el-table-column> </el-table-column>
<el-table-column prop="collectionamounts" label="进入回款额"> <el-table-column prop="collectionamounts" label="已回款总额">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>

28
SC-web/src/views/dashboard/admin/index.vue
Unescape View File

@ -8,24 +8,19 @@
</div> </div>
<ul class="sale_items"> <ul class="sale_items">
<li> <li>
<span>磅单张数(张)</span> <span>磅单上传张数</span>
<p class="nums"> <p class="nums">
<count-to :start-val="0" :end-val="tadayPoundist.poundNum" :duration="2600" class="card-panel-num" /> <count-to :start-val="0" :end-val="tadayPoundist.poundNum" :duration="2600" class="card-panel-num" />
</p> </p>
<!-- <span>+2.34%</span> --> <!-- <span>+2.34%</span> -->
</li> </li>
<li> <li>
<span>上货量(吨)</span> <span>总净重(吨)</span>
<p class="nums">
<count-to :start-val="0" :end-val="tadayPoundist.buckleWeightSum" :duration="3600" class="card-panel-num" />
</p>
<!-- <span>-0.3%</span> -->
</li>
<li>
<span>总结算重量(吨)</span>
<span>{{tadayPoundist.settlementSum}}</span> <span>{{tadayPoundist.settlementSum}}</span>
<!-- <span>活动时间48小时</span> --> <!-- <span>活动时间48小时</span> -->
</li> </li>
<li> <li>
<span>采购总额(元)</span> <span>采购总额(元)</span>
<p class="nums"> <p class="nums">
@ -39,6 +34,20 @@
<count-to :start-val="0" :end-val="tadayPoundist.salesAmountSum" :duration="2600" class="card-panel-num" /> <count-to :start-val="0" :end-val="tadayPoundist.salesAmountSum" :duration="2600" class="card-panel-num" />
</p> </p>
</li> </li>
<li>
<span>今日磅单张数</span>
<p class="nums">
<count-to :start-val="0" :end-val="tadayPoundist.bangdannum" :duration="3600" class="card-panel-num" />
</p>
<!-- <span>-0.3%</span> -->
</li>
<li>
<span>上货量(吨)</span>
<p class="nums">
<count-to :start-val="0" :end-val="tadayPoundist.buckleWeightSum" :duration="3600" class="card-panel-num" />
</p>
<!-- <span>-0.3%</span> -->
</li>
</ul> </ul>
</div> </div>
<panel-group /> <panel-group />
@ -223,6 +232,7 @@ export default {
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.tadayPoundist.buckleWeightSum = res.data.buckleWeightSum; this.tadayPoundist.buckleWeightSum = res.data.buckleWeightSum;
this.tadayPoundist.bangdannum = res.data.bangdannum;
} }
}).catch(() => { }).catch(() => {
}) })

Write Preview
Loading…
Cancel
Save