From f45b159864ad79f326884ab3644269ef9eb7ee9d Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期四, 04 一月 2024 11:49:16 +0800
Subject: [PATCH] 出入库bug修复，调整仓库位置字段绑定，编辑时列表绑定源位置
---
src/views/reportForm/inboundOutboundDetail/index.vue | 120 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 71 insertions(+), 49 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index a38bdc0..fe60a74 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -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 { getHistory,getOperationInfo } from "@/api/reportForm/inventoryRwport"
// 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: "鍗曞彿",
@@ -118,10 +123,18 @@
default: true
},
{
- label: "涓氬姟绫诲瀷",
- prop: "baseOperationType",
+ label: "浜у搧缂栫爜",
+ prop: "productId",
isShowColumn: true,
default: true
+ },
+ {
+ label: "涓氬姟绫诲瀷",
+ prop: "operationTypeName",
+ isShowColumn: true,
+ default: true,
+ // conversion: true,
+ // getStatus: this.getBaseOperationTypeList
},
{
label: "浠�",
@@ -148,6 +161,12 @@
default: true
},
{
+ label: "閲嶉噺",
+ prop: "weight",
+ isShowColumn: true,
+ default: true
+ },
+ {
label: "鐘舵��",
prop: "status",
width: 120,
@@ -170,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 === "鎶ヨ〃") {
@@ -181,62 +211,54 @@
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.code === 200) {
- this.tableList.tableInfomation = res.data
- this.pagerOptions.totalCount = res.total
+ if (res.code === 200&&res.data) {
+ 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||[]
+ }else{
+ 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) {
- this.tableList.tableInfomation = res.data
- this.pagerOptions.totalCount = res.total
+ if (res.code === 200&&res.data) {
+ 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||[]
+ }else{
+ this.tableList.tableInfomation = res.data||[]
}
+ this.pagerOptions.totalCount = res.total
})
}
},
// 鎼滅储
getList(val) {
- console.log(val)
- // 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
- // }
- // })
+ this.params.keyWord=val;
+ this.getData()
},
// 琛岀偣鍑�
- tableRowClick(row) {
- console.log(row, "琛宺ow")
+ async tableRowClick(row) {
+ await getOperationInfo(row.operationId).then((res)=>{
+ this.editConfig.infomation = { ...res.data }
+ })
this.editConfig.visible = true
this.editConfig.title = "鏌ョ湅"
- this.editConfig.infomation = { ...row }
},
// 鏂板缓
addBtnClick() {
@@ -245,7 +267,7 @@
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val===4?"瀹屾垚":val===5?"宸插彇娑�":" "
}
}
}
--
Gitblit v1.8.0