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 | 86 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 23 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 594c6a6..0c7cc70 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -4,7 +4,7 @@
<SearchCommonView
:add-title="'鏂板缓'"
:showAdd="false"
- :placeholder="'璇疯緭鍏ュ弬鑰�'"
+ :placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
@@ -23,18 +23,22 @@
<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>
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getHistory } from "@/api/reportForm/inventoryRwport"
-import { getProductOperatonList } from "@/api/product/product"
+// import { getProductOperatonList } from "@/api/product/product"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
-
+import { getDataByType } from "@/api/data"
export default {
name: "InboundOutboundDetail",
props: {},
@@ -56,7 +60,8 @@
title: "鏂板缓",
infomation: {}
},
- params: {}
+ params: {},
+ baseOperationTypeList:getDataByType("baseOperationTypeTwo"),
}
},
created() {
@@ -71,7 +76,7 @@
sessionStorage.setItem("paramsList", JSON.stringify(params))
}
this.params = params
- console.log(this.params)
+ console.log(this.params,'====111')
this.getData()
},
// 椤甸潰閿�姣佷箣鍓�
@@ -103,7 +108,7 @@
prop: "date",
isShowColumn: true,
default: true,
- date: true
+ // date: true
},
{
label: "鍗曞彿",
@@ -116,6 +121,20 @@
prop: "productName",
isShowColumn: true,
default: true
+ },
+ {
+ label: "浜у搧缂栫爜",
+ prop: "productId",
+ isShowColumn: true,
+ default: true
+ },
+ {
+ label: "涓氬姟绫诲瀷",
+ prop: "baseOperationType",
+ isShowColumn: true,
+ default: true,
+ conversion: true,
+ getStatus: this.getBaseOperationTypeList
},
{
label: "浠�",
@@ -142,6 +161,12 @@
default: true
},
{
+ label: "閲嶉噺",
+ prop: "weight",
+ isShowColumn: true,
+ default: true
+ },
+ {
label: "鐘舵��",
prop: "status",
width: 120,
@@ -164,6 +189,17 @@
this.showcol = val
this.tableList.tableColumn = this.setTableColumn(val)
},
+ getBaseOperationTypeList(val){
+ let string = "--"
+ if (val) {
+ for (let i in this.baseOperationTypeList) {
+ if (this.baseOperationTypeList[i].id == val) {
+ return this.baseOperationTypeList[i].name
+ }
+ }
+ }
+ return string
+ },
// 搴撳瓨鎶ヨ〃璺宠浆璇锋眰鏁版嵁
async getData() {
if (this.params.name === "鎶ヨ〃") {
@@ -176,28 +212,32 @@
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,
+ await getHistory({
+ baseOperationType:1,
+ keyWord:this.params.keyWord,
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
- }
+ 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 = list || []
+ this.tableList.tableInfomation = res.data?res.data:[]
this.pagerOptions.totalCount = res.total
}
})
@@ -205,11 +245,11 @@
},
// 鎼滅储
getList(val) {
- console.log(val)
+ this.params.keyWord=val;
+ this.getData()
},
// 琛岀偣鍑�
tableRowClick(row) {
- console.log(row, "琛宺ow")
this.editConfig.visible = true
this.editConfig.title = "鏌ョ湅"
this.editConfig.infomation = { ...row }
@@ -221,7 +261,7 @@
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val===4?"瀹屾垚":val===5?"宸插彇娑�":" "
}
}
}
--
Gitblit v1.8.0