From 62dd7a29fb929865cfcd72e8412beb3b5d41a7fc Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期四, 28 九月 2023 15:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/reportForm/inboundOutboundDetail/index.vue | 158 ++++++++++++++++++++++++++++++----------------------
1 files changed, 90 insertions(+), 68 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 31bd7f2..0531503 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -18,18 +18,28 @@
@tableRowClick="tableRowClick"
></TableCommonView>
<div class="btn-pager">
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ <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 pageMixin from "@/components/makepager/pager/mixin/pageMixin";
+import { getHistory } from "@/api/reportForm/inventoryRwport";
+import { getProductOperatonList } from "@/api/product/product";
+
+import AddOverviewDialog from "@/views/overview/AddOverviewDialog";
export default {
name: "InboundOutboundDetail",
@@ -45,15 +55,16 @@
commonDetail: {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
},
editConfig: {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
},
- params: {}
- }
+ productId: this.$route.params.id,
+ productName: this.$route.params.name,
+ };
},
created() {
this.setTable()
@@ -77,128 +88,139 @@
selectBox: true,
showcol: this.showcol,
allcol: [],
- tableColumn: this.setTableColumn(this.showcol)
- }
- let allcol = []
+ tableColumn: this.setTableColumn(this.showcol),
+ };
+ let allcol = [];
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
if (!this.tableList.tableColumn[i].default) {
- const label = this.tableList.tableColumn[i].label
- allcol.push(label)
+ const label = this.tableList.tableColumn[i].label;
+ allcol.push(label);
}
}
- this.tableList.allcol = allcol
+ this.tableList.allcol = allcol;
},
setTableColumn(showcol) {
let tableColumn = [
{
label: "鏃ユ湡",
- prop: "operationDate",
+ prop: this.$route.params.paramsKey.date,
isShowColumn: true,
default: true,
- date: true
+ date: true,
},
{
label: "鍗曞彿",
- prop: "number",
+ prop: this.$route.params.paramsKey.number,
isShowColumn: true,
- default: true
+ default: true,
},
{
label: "浜у搧",
- prop: "productName",
+ prop: this.$route.params.paramsKey.productName,
isShowColumn: true,
- default: true
+ default: true,
},
{
label: "浠�",
- prop: "from",
+ prop: this.$route.params.paramsKey.fromLocation,
isShowColumn: true,
- default: true
+ default: true,
},
{
label: "鑷�",
- prop: "to",
+ prop: this.$route.params.paramsKey.toLocation,
isShowColumn: true,
- default: true
+ default: true,
},
{
label: "鏁伴噺",
- prop: "amount",
+ prop: this.$route.params.paramsKey.amount,
isShowColumn: true,
- default: true
+ default: true,
},
{
label: "鍗曚綅",
- prop: "unit",
+ prop: this.$route.params.paramsKey.unit,
isShowColumn: true,
- default: true
+ default: true,
},
{
label: "鐘舵��",
- prop: "status",
+ prop: this.$route.params.paramsKey.status,
width: 120,
isShowColumn: showcol.includes("鐘舵��"),
default: false,
status: true,
isCallMethod: true,
- getCallMethod: this.getStatus
+ getCallMethod: this.getStatus,
},
{
label: "瀹屾垚鑰�",
- prop: "admin",
+ prop: this.$route.params.paramsKey.contactedName,
isShowColumn: showcol.includes("瀹屾垚鑰�"),
- default: false
- }
- ]
- return tableColumn
+ default: false,
+ },
+ ];
+ return tableColumn;
},
selTableCol(val) {
- this.showcol = val
- this.tableList.tableColumn = this.setTableColumn(val)
+ 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
- }
- })
+ if (this.$route.params.pageName == "浜у搧") {
+ await getProductOperatonList({
+ productId: this.productId,
+ 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.productName,
+ };
+ });
+ this.tableList.tableInfomation = list || [];
+ this.pagerOptions.totalCount = res.total;
+ }
+ });
+ } else if (this.$route.params.pageName == "鎶ヨ〃") {
+ await getHistory(this.$route.params.product).then((res) => {
+ if (res.code === 200) {
+ this.tableList.tableInfomation = res.data;
+ }
+ });
+ }
},
+ //浜у搧璺宠浆璇锋眰鏁版嵁
+
// 鎼滅储
getList(val) {
- console.log(val)
+ console.log(val);
},
// 琛岀偣鍑�
tableRowClick(row) {
- console.log(row)
- this.editConfig.visible = true
- this.editConfig.title = "鏌ョ湅"
- this.editConfig.infomation = { ...row }
+ console.log(row,"琛宺ow")
+ this.editConfig.visible = true;
+ this.editConfig.title = "鏌ョ湅";
+ this.editConfig.infomation = { ...row };
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
- this.editConfig.title = "鏂板缓"
+ // this.editConfig.visible = true
+ this.editConfig.title = "鏂板缓";
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
- }
- }
-}
+ console.log(val,"val鐘舵��")
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚";
+ },
+ },
+};
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
--
Gitblit v1.8.0