From 58ac82fceff96784dd9e16872d1e2316fa2cfdec Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 24 十一月 2023 14:36:12 +0800
Subject: [PATCH] 入库明细报表修改状态进度展示
---
src/views/reportForm/inboundOutboundDetail/index.vue | 68 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index c354af5..0c7cc70 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -23,8 +23,12 @@
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
- <!-- 缂栬緫 -->
- <AddOverviewDialog v-if="editConfig.visible" :edit-common-config="editConfig" :add-name="this.$route.params.name" />
+ <!-- 鏌ョ湅/缂栬緫 -->
+ <AddOverviewDialog
+ v-if="editConfig.visible"
+ :edit-common-config="editConfig"
+ :add-name="this.$route.params.name"
+ />
</div>
</template>
@@ -104,7 +108,7 @@
prop: "date",
isShowColumn: true,
default: true,
- date: true
+ // date: true
},
{
label: "鍗曞彿",
@@ -115,6 +119,12 @@
{
label: "浜у搧",
prop: "productName",
+ isShowColumn: true,
+ default: true
+ },
+ {
+ label: "浜у搧缂栫爜",
+ prop: "productId",
isShowColumn: true,
default: true
},
@@ -147,6 +157,12 @@
{
label: "鍗曚綅",
prop: "unit",
+ isShowColumn: true,
+ default: true
+ },
+ {
+ label: "閲嶉噺",
+ prop: "weight",
isShowColumn: true,
default: true
},
@@ -196,36 +212,31 @@
pageSize: this.pagerOptions.pageSize
}).then((res) => {
if (res.code === 200) {
+ res.data.map((item)=>{
+ let dateObject = new Date(item.date);
+ let formattedDateString = dateObject.toISOString().split('T')[0];
+ item.date=formattedDateString
+ })
this.tableList.tableInfomation = res.data
this.pagerOptions.totalCount = res.total
}
})
} else {
- // await getProductOperatonList({
- // productId: this.params.id,
- // page: this.pagerOptions.currPage,
- // pageSize: this.pagerOptions.pageSize
- // }).then((res) => {
- // if (res.code === 200) {
- // const list = res.data.map((item) => {
- // return {
- // ...item,
- // fromLocation: item.fromLocation.name,
- // toLocation: item.toLocation.name,
- // productName: this.params.name,
- // amount: item.details[0].product.amount,
- // unit: item.details[0].product.unit
- // }
- // })
- // this.tableList.tableInfomation = list || []
- // this.pagerOptions.totalCount = res.total
- // }
- // })
await getHistory({
+ baseOperationType:1,
+ keyWord:this.params.keyWord,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
if (res.code === 200) {
+ res.data.map((item)=>{
+ if(item.status===""){
+ item.status=4
+ }
+ let dateObject = new Date(item.date);
+ let formattedDateString = dateObject.toISOString().split('T')[0];
+ item.date=formattedDateString
+ })
this.tableList.tableInfomation = res.data?res.data:[]
this.pagerOptions.totalCount = res.total
}
@@ -236,15 +247,6 @@
getList(val) {
this.params.keyWord=val;
this.getData()
- // getHistory({
- // page: this.pagerOptions.currPage,
- // pageSize: this.pagerOptions.pageSize
- // }).then((res) => {
- // if (res.code === 200) {
- // this.tableList.tableInfomation = res.data
- // this.pagerOptions.totalCount = res.total
- // }
- // })
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -259,7 +261,7 @@
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val===4?"瀹屾垚":val===5?"宸插彇娑�":" "
}
}
}
--
Gitblit v1.8.0