From b8dc4ccc6ee580b084aa860e64af2d90d1cb5979 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 10:11:52 +0800
Subject: [PATCH] feat: 1、首页接口对接 2、部门物品分发
---
admin-web/src/views/dashboard/index.vue | 86 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/admin-web/src/views/dashboard/index.vue b/admin-web/src/views/dashboard/index.vue
index d006b95..1d92ebb 100644
--- a/admin-web/src/views/dashboard/index.vue
+++ b/admin-web/src/views/dashboard/index.vue
@@ -7,24 +7,29 @@
<span class="font-18 font-bold">寰呭姙鍚嶇О</span>
</div>
<div class="f-r f-r-between m-b-10">
- <el-radio-group v-model="waitType" size="medium">
+ <el-radio-group v-model="waitType" size="mini">
<el-radio-button label="1">鍏ㄩ儴</el-radio-button>
</el-radio-group>
<div class="to-more" @click="nav('/stock/transfer/transferissue')">鏌ョ湅鏇村 ></div>
</div>
<el-table :data="waitWorkData" class="top-tb" :show-header="false" size="medium">
- <el-table-column prop="number" align="center"></el-table-column>
- <el-table-column prop="type" align="center" width="100"></el-table-column>
- <el-table-column prop="orgName" align="center" width="100"></el-table-column>
- <el-table-column prop="name" align="center" width="80"></el-table-column>
- <el-table-column prop="createTime" align="center" width="180">
+ <el-table-column prop="businessFormCode" align="center" width="130"></el-table-column>
+ <el-table-column prop="inWarehouseName" align="center" min-width="130">
+ <template slot-scope="{row}">
+ <el-tooltip class="item" effect="dark" :content="row.inWarehouseName " placement="top-start">
+ <div class="font-14 color-333" style="width: 100%;white-space:nowrap;text-overflow: ellipsis;overflow: hidden">{{ row.inWarehouseName }}</div>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ <el-table-column prop="operatorName" align="center" width="80"></el-table-column>
+ <el-table-column prop="createTime" align="center" width="160">
<template slot-scope="scope">
<span class="font-14 color-333">{{ formattTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column prop="date" label="鎿嶄綔" align="center" width="120">
+ <el-table-column prop="date" label="鎿嶄綔" fixed="right" align="center" width="80">
<template slot-scope="scope">
- <el-button @click.native.prevent="aduitThis(scope.row.id)" size="small" type="primary">澶勭悊</el-button>
+ <el-button @click.native.prevent="aduitThis(scope.row.id)" type="primary">澶勭悊</el-button>
</template>
</el-table-column>
</el-table>
@@ -36,7 +41,7 @@
<span class="font-18 font-bold">棰勮閫氱煡</span>
</div>
<div class="f-r f-r-between m-b-10">
- <el-radio-group size="medium" v-model="earlyWarningType" @change="changeEarlyWarning">
+ <el-radio-group size="mini" v-model="earlyWarningType" @change="changeEarlyWarning">
<el-radio-button label="1">鍏ㄩ儴</el-radio-button>
<el-radio-button label="2">缂鸿揣锛�12锛�</el-radio-button>
<el-radio-button label="3">瓒呭嚭锛�3锛�</el-radio-button>
@@ -70,42 +75,44 @@
<div class="f-r f-r-between total-list">
<div class="total-item">
<div class="font-14 color-666">鐗╁搧鏁伴噺</div>
- <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">1200</span></div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.totalNum}}</span></div>
</div>
<div class="total-item">
<div class="font-14 color-666">璧勪骇鎬婚噾棰�</div>
- <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">120.88</span>涓囧厓</div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.totalPrice}}</span>涓囧厓</div>
</div>
<div class="total-item">
<div class="font-14 color-666">鐗╁搧鍗犵敤鐜�</div>
- <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">80%</span></div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.zhanYouPercent}}%</span></div>
</div>
<div class="total-item">
<div class="font-14 color-666">A绫荤墿鍝佹暟閲�</div>
- <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">120</span></div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.aTotalNum}}</span></div>
</div>
<div class="total-item">
<div class="font-14 color-666">B绫荤墿鍝佹暟閲�</div>
- <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">123</span></div>
+ <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.bTotalNum}}</span></div>
</div>
</div>
- <!-- 绫诲埆閲戦缁熻/绫诲埆鏁伴噺缁熻 -->
+ <!-- 绫诲埆閲戦缁熻/绫诲埆鏁伴噺缁熻 -->
<el-row :gutter="20">
<el-col :span="12">
- <LBSLTJ></LBSLTJ>
+ <LBSLTJ :num="goodsNumPrice"></LBSLTJ>
</el-col>
<el-col :span="12">
- <LBJETJ></LBJETJ>
+ <LBJETJ :num="goodsNumPrice"></LBJETJ>
</el-col>
</el-row>
- <!-- 璧勪骇澧為暱/鎶ュ簾缁熻鍥撅紙鏁伴噺锛�-->
+ <!-- 璧勪骇澧為暱/鎶ュ簾缁熻鍥撅紙鏁伴噺锛�-->
<XYZC></XYZC>
</div>
</template>
<script>
+import {getGoodsNumPrice} from '@/api/dashboard'
// 鍒涘缓Context
import {LongToDateTime} from "@/utils/DateFormatter";
+import {transferList} from "@/api/stock/transfer";
const ComponentContext = require.context('./components', false, /\.vue$/i);
let res_components = {};
@@ -119,14 +126,21 @@
components: {...res_components},
data() {
return {
+ goodsNumPrice: {
+ aTotalNum: 0,
+ aTotalPrice: 0,
+ bTotalNum: 0,
+ bTotalPrice: 0,
+ cTotalNum: 0,
+ cTotalPrice: 0,
+ tenantId: 0,
+ totalNum: 0,
+ totalPrice: 0,
+ xiaFaNum: 0,
+ zhanYouPercent: 0,
+ },
waitType: '1',
- waitWorkData: [
- {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 1},
- {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 2},
- {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 3},
- {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 4},
- {number: 'SJQ12345', type: '鐗╁搧鐢抽', orgName: '閲戣瀺涓氬姟閮�', name: '寮犱笁涓�', createTime: 20231127150606, id: 5},
- ], // 寰呭姙宸ヤ綔
+ waitWorkData: [], // 寰呭姙宸ヤ綔
earlyWarningType: '1',
earlyWarningData: [
{type: '鏂戒箰澶嶅嵃鏈虹⒊绮�', name: '鏂戒箰c2201', surplus: 4, createTime: 20231127150606, id: 1},
@@ -137,9 +151,21 @@
};
},
created() {
-
+ this.init()
+ getGoodsNumPrice().then(res => {
+ this.goodsNumPrice = res
+ })
},
methods: {
+ init(){
+ transferList({
+ qryType: 0,
+ pageNum: 1,
+ pageSize: 5,
+ }).then((res) => {
+ this.waitWorkData = res.datas;
+ });
+ },
// 鏍煎紡鍖栨椂闂�
formattTime(time) {
return LongToDateTime(time)
@@ -170,8 +196,8 @@
earlyWarningType: this.earlyWarningType
}
},
- // 璺宠浆
- nav(url){
+ // 璺宠浆
+ nav(url) {
this.$router.push(url)
}
}
@@ -196,9 +222,11 @@
.top-tb {
width: 100%;
}
->>>.el-table__body{
+
+> > > .el-table__body {
min-height: 265px;
}
+
.total-list {
padding: 15px 0;
}
--
Gitblit v1.9.1