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/outboundDetail/index.vue | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/views/reportForm/outboundDetail/index.vue b/src/views/reportForm/outboundDetail/index.vue
index 02183b3..02fef43 100644
--- a/src/views/reportForm/outboundDetail/index.vue
+++ b/src/views/reportForm/outboundDetail/index.vue
@@ -1,39 +1,31 @@
<template>
<div class="rightContent">
<div class="top">
- <SearchCommonView
- :add-title="'鏂板缓'"
- :showAdd="false"
- :placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
- :amount-view="false"
- @addCommonClick="addBtnClick"
- @searchClick="getList"
- />
+ <SearchCommonView :add-title="'鏂板缓'" :showAdd="false" :placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'" :amount-view="false"
+ @addCommonClick="addBtnClick" @searchClick="getList" />
</div>
<div class="list-view">
<div class="table">
- <TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- @selTableCol="selTableCol"
- @tableRowClick="tableRowClick"
- ></TableCommonView>
+ <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 :workType="workType" 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/reportForm/outboundDetail/AddOutboundDetailDialog.vue"
+// import AddOverviewDialog from "@/views/reportForm/outboundDetail/AddOutboundDetailDialog.vue"
+import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
+
import { getDataByType } from "@/api/data"
export default {
name: "outboundDetail",
@@ -43,6 +35,7 @@
computed: {},
data() {
return {
+ workType:2,
tableList: {},
showcol: ["鐘舵��"],
searchOptions: [],
@@ -57,7 +50,7 @@
infomation: {}
},
params: {},
- baseOperationTypeList:getDataByType("baseOperationTypeTwo"),
+ baseOperationTypeList: getDataByType("baseOperationTypeTwo"),
}
},
created() {
@@ -72,7 +65,6 @@
sessionStorage.setItem("paramsList", JSON.stringify(params))
}
this.params = params
- console.log(this.params,'====111')
this.getData()
},
// 椤甸潰閿�姣佷箣鍓�
@@ -126,11 +118,11 @@
},
{
label: "涓氬姟绫诲瀷",
- prop: "baseOperationType",
+ prop: "operationTypeName",
isShowColumn: true,
default: true,
- conversion: true,
- getStatus: this.getBaseOperationTypeList
+ // conversion: true,
+ // getStatus: this.getBaseOperationTypeList
},
{
label: "浠�",
@@ -185,7 +177,7 @@
this.showcol = val
this.tableList.tableColumn = this.setTableColumn(val)
},
- getBaseOperationTypeList(val){
+ getBaseOperationTypeList(val) {
let string = "--"
if (val) {
for (let i in this.baseOperationTypeList) {
@@ -200,53 +192,61 @@
async getData() {
if (this.params.name === "鎶ヨ〃") {
await getHistory({
- keyWord:this.params.keyWord,
- produceId:this.params.produceId,
- unit:this.params.unit,
- productName:this.params.productName,
+ 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.map((item)=>{
- let dateObject = new Date(item.date);
- let formattedDateString = dateObject.toISOString().split('T')[0];
- item.date=formattedDateString
+ 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
- this.pagerOptions.totalCount = res.total
+ this.tableList.tableInfomation = res.data||[]
+ }else{
+ this.tableList.tableInfomation = res.data||[]
}
+ this.pagerOptions.totalCount = res.total
})
} else {
await getHistory({
- keyWord:this.params.keyWord,
- baseOperationType:2,
+ keyWord: this.params.keyWord,
+ baseOperationType: 2,
page: this.pagerOptions.currPage,
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
+ 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?res.data:[]
- this.pagerOptions.totalCount = res.total
+ this.tableList.tableInfomation = res.data || []
+ }else{
+ this.tableList.tableInfomation = res.data || []
}
+ this.pagerOptions.totalCount = res.total
})
}
},
// 鎼滅储
getList(val) {
- this.params.keyWord=val;
+ this.params.keyWord = val;
this.getData()
},
// 琛岀偣鍑�
- tableRowClick(row) {
- console.log(row,"鐪嬬湅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() {
@@ -255,7 +255,7 @@
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val === 4 ? "瀹屾垚" : val === 5 ? "宸插彇娑�":""
}
}
}
--
Gitblit v1.8.0