From bd554a3040ab933a62335175203bfcbb22e9256a Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期四, 19 十月 2023 13:54:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zzq
---
src/views/overview/OverviewListView.vue | 118 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 75 insertions(+), 43 deletions(-)
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index aab7906..2cfd31b 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -3,7 +3,7 @@
<div class="top">
<SearchCommonView
:add-title="'鏂板缓'"
- :placeholder="'璇疯緭鍏ュ崟鍙�'"
+ :placeholder="'璇疯緭鍏ュ崟鍙�/鏉ユ簮鍗曟嵁'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
@@ -11,12 +11,22 @@
</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">
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="100">
+ <template slot-scope="scope">
+ <el-button @click="tableRowClick(scope.row, '鏌ョ湅')" type="text" size="small">鏌ョ湅</el-button>
+ <el-button
+ v-if="scope.row.status !== 4"
+ @click="tableRowClick(scope.row, '缂栬緫')"
+ type="text"
+ size="small"
+ >缂栬緫</el-button
+ >
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
</div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -28,6 +38,7 @@
:work-type="workType"
:edit-common-config="editConfig"
:add-name="this.$route.params.name"
+ :display-edit="displayEdit"
/>
</div>
</template>
@@ -59,19 +70,36 @@
title: "鏂板缓",
infomation: {}
},
- workType: this.$route.params.workType
+ workType: this.$route.params.workType,
+ keyword: "",
+ params: {},
+ displayEdit: false
}
},
created() {
this.setTable()
+ var paramsData = sessionStorage.getItem("paramsData")
+ let params = {}
+ if (paramsData) {
+ params = JSON.parse(sessionStorage.getItem("paramsData"))
+ } else {
+ params = this.$route.params
+ sessionStorage.setItem("paramsData", JSON.stringify(params))
+ }
+ this.params = params
this.getData()
- console.log(this.$route.params.workType)
+ // console.log(this.$route.params.workType)
+ },
+ // 椤甸潰閿�姣佷箣鍓�
+ beforeDestroy() {
+ sessionStorage.removeItem("paramsData")
},
methods: {
setTable() {
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol)
@@ -124,39 +152,39 @@
default: false,
date: true
},
- {
- label: "浜у搧鍙敤鎬�",
- prop: "status",
- isShowColumn: showcol.includes("浜у搧鍙敤鎬�"),
- default: false
- },
- {
- label: "鎴鏃ユ湡",
- prop: "faultTime",
- isShowColumn: showcol.includes("鎴鏃ユ湡"),
- default: false
- },
- {
- label: "瀹為檯鏃ユ湡",
- prop: "shopName",
- isShowColumn: showcol.includes("瀹為檯鏃ユ湡"),
- default: false
- },
+ // {
+ // label: "浜у搧鍙敤鎬�",
+ // prop: "status",
+ // isShowColumn: showcol.includes("浜у搧鍙敤鎬�"),
+ // default: false
+ // },
+ // {
+ // label: "鎴鏃ユ湡",
+ // prop: "faultTime",
+ // isShowColumn: showcol.includes("鎴鏃ユ湡"),
+ // default: false
+ // },
+ // {
+ // label: "瀹為檯鏃ユ湡",
+ // prop: "shopName",
+ // isShowColumn: showcol.includes("瀹為檯鏃ユ湡"),
+ // default: false
+ // },
{
label: "鏉ユ簮鍗曟嵁",
prop: "sourceNumber",
isShowColumn: showcol.includes("鏉ユ簮鍗曟嵁"),
default: false
},
- {
- label: "娆犲崟",
- prop: "status",
- isShowColumn: showcol.includes("娆犲崟"),
- default: false
- },
+ // {
+ // label: "娆犲崟",
+ // prop: "status",
+ // isShowColumn: showcol.includes("娆犲崟"),
+ // default: false
+ // },
{
label: "鍏ュ簱绫诲瀷",
- prop: "faultTime",
+ prop: "operationTypeName",
isShowColumn: showcol.includes("鍏ュ簱绫诲瀷"),
default: false
},
@@ -180,13 +208,14 @@
// 璇锋眰鏁版嵁
async getData() {
await getOperation({
- operationTypeId: this.$route.params.id,
+ number: this.keyword,
+ operationTypeId: this.params.id,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- console.log(res.data.data)
- if (res.data.code === 200) {
- const list = res.data.data.map((item) => {
+ console.log(res.data)
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
return {
...item,
from: item.fromLocation.name,
@@ -194,19 +223,22 @@
}
})
this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.total
+ this.pagerOptions.totalCount = res.total
}
})
},
// 鎼滅储
getList(val) {
console.log(val)
+ this.keyword = val
+ this.pagerOptions.currPage = 1
+ this.getData()
},
- // 琛岀偣鍑�
- tableRowClick(row) {
+ // 鏌ョ湅 缂栬緫
+ tableRowClick(row, val) {
console.log(row)
this.editConfig.visible = true
- this.editConfig.title = "缂栬緫"
+ this.editConfig.title = val
this.editConfig.operationTypeId = this.$route.params.id
this.editConfig.infomation = { ...row }
},
--
Gitblit v1.8.0