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 | 179 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 118 insertions(+), 61 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 31bd7f2..fe60a74 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -4,33 +4,41 @@
<SearchCommonView
:add-title="'鏂板缓'"
:showAdd="false"
- :placeholder="'璇疯緭鍏ュ弬鑰�'"
+ :placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
/>
</div>
<div class="list-view">
- <TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- @selTableCol="selTableCol"
- @tableRowClick="tableRowClick"
- ></TableCommonView>
+ <div class="table">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ @selTableCol="selTableCol"
+ @tableRowClick="tableRowClick"
+ ></TableCommonView>
+ </div>
<div class="btn-pager">
<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 { getProductOperatonList } from "@/api/product/product"
-import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
+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: {},
@@ -52,23 +60,28 @@
title: "鏂板缓",
infomation: {}
},
- params: {}
+ params: {},
+ baseOperationTypeList:getDataByType("baseOperationTypeTwo"),
}
},
created() {
this.setTable()
console.log(this.$route.params)
- var paramsData = sessionStorage.getItem("paramsList")
+ var paramsList = sessionStorage.getItem("paramsList")
let params = {}
- if (paramsData) {
+ if (paramsList) {
params = JSON.parse(sessionStorage.getItem("paramsList"))
} else {
params = this.$route.params
sessionStorage.setItem("paramsList", JSON.stringify(params))
}
this.params = params
- console.log(this.params)
+ console.log(this.params,'====111')
this.getData()
+ },
+ // 椤甸潰閿�姣佷箣鍓�
+ beforeDestroy() {
+ sessionStorage.removeItem("paramsList")
},
methods: {
setTable() {
@@ -92,10 +105,10 @@
let tableColumn = [
{
label: "鏃ユ湡",
- prop: "operationDate",
+ prop: "date",
isShowColumn: true,
default: true,
- date: true
+ // date: true
},
{
label: "鍗曞彿",
@@ -110,14 +123,28 @@
default: true
},
{
+ label: "浜у搧缂栫爜",
+ prop: "productId",
+ isShowColumn: true,
+ default: true
+ },
+ {
+ label: "涓氬姟绫诲瀷",
+ prop: "operationTypeName",
+ isShowColumn: true,
+ default: true,
+ // conversion: true,
+ // getStatus: this.getBaseOperationTypeList
+ },
+ {
label: "浠�",
- prop: "from",
+ prop: "fromLocation",
isShowColumn: true,
default: true
},
{
label: "鑷�",
- prop: "to",
+ prop: "toLocation",
isShowColumn: true,
default: true
},
@@ -134,6 +161,12 @@
default: true
},
{
+ label: "閲嶉噺",
+ prop: "weight",
+ isShowColumn: true,
+ default: true
+ },
+ {
label: "鐘舵��",
prop: "status",
width: 120,
@@ -145,7 +178,7 @@
},
{
label: "瀹屾垚鑰�",
- prop: "admin",
+ prop: "contactedName",
isShowColumn: showcol.includes("瀹屾垚鑰�"),
default: false
}
@@ -156,65 +189,89 @@
this.showcol = val
this.tableList.tableColumn = this.setTableColumn(val)
},
- // 璇锋眰鏁版嵁
- async getData() {
- 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,
- from: item.fromLocation.name,
- to: item.toLocation.name,
- productName: this.params.name
- }
- })
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.total
+ 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 === "鎶ヨ〃") {
+ await getHistory({
+ keyWord:this.params.keyWord,
+ produceId:this.params.produceId,
+ unit:this.params.unit,
+ productName:this.params.productName,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }).then((res) => {
+ 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 getHistory({
+ baseOperationType:1,
+ keyWord:this.params.keyWord,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }).then((res) => {
+ 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)
+ this.params.keyWord=val;
+ this.getData()
},
// 琛岀偣鍑�
- tableRowClick(row) {
- console.log(row)
+ 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() {
- this.editConfig.visible = true
+ // this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val===4?"瀹屾垚":val===5?"宸插彇娑�":" "
}
}
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-// .rightContent {
-// height: 100%;
-// background: #e6ecf2;
-// padding: 10px;
-// .top {
-// margin-bottom: 20px;
-// height: 60px;
-// background: #fff;
-// border-radius: 8px;
-// }
-// .list-view {
-// height: calc(100% - 120px);
-// }
-// }
-</style>
+<style lang="scss" scoped></style>
--
Gitblit v1.8.0