From 1888b426ff2b6a529f5fdef0f0453dadef71824b Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 17 四月 2024 10:17:38 +0800
Subject: [PATCH] 隐藏多单位的问题
---
src/views/reportForm/outboundDetail/index.vue | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/views/reportForm/outboundDetail/index.vue b/src/views/reportForm/outboundDetail/index.vue
index 7040834..02fef43 100644
--- a/src/views/reportForm/outboundDetail/index.vue
+++ b/src/views/reportForm/outboundDetail/index.vue
@@ -14,7 +14,7 @@
</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>
@@ -23,7 +23,9 @@
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",
@@ -33,6 +35,7 @@
computed: {},
data() {
return {
+ workType:2,
tableList: {},
showcol: ["鐘舵��"],
searchOptions: [],
@@ -115,11 +118,11 @@
},
{
label: "涓氬姟绫诲瀷",
- prop: "baseOperationType",
+ prop: "operationTypeName",
isShowColumn: true,
default: true,
- conversion: true,
- getStatus: this.getBaseOperationTypeList
+ // conversion: true,
+ // getStatus: this.getBaseOperationTypeList
},
{
label: "浠�",
@@ -196,15 +199,17 @@
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.code === 200) {
+ 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({
@@ -213,7 +218,7 @@
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.code === 200) {
+ if (res.code === 200&&res.data) {
res.data.map((item) => {
if(item.status===""){
item.status=4
@@ -222,9 +227,11 @@
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
})
}
},
--
Gitblit v1.8.0