From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/warehouseManage/warehouse/index.vue | 88 ++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/src/views/warehouseManage/warehouse/index.vue b/src/views/warehouseManage/warehouse/index.vue
index 53637d9..03e589f 100644
--- a/src/views/warehouseManage/warehouse/index.vue
+++ b/src/views/warehouseManage/warehouse/index.vue
@@ -3,7 +3,7 @@
<div class="top">
<SearchCommonView
:add-title="'鏂板缓'"
- :placeholder="'璇疯緭鍏ュ崟鍙�'"
+ :placeholder="'璇疯緭鍏ヤ粨搴�'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
@@ -15,34 +15,51 @@
ref="tableListRef"
:table-list="tableList"
:show-checkcol="false"
- @tableRowClick="tableRowClick"
- ></TableCommonView>
+ >
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="120" fixed="right">
+ <template slot-scope="scope">
+ <el-button
+ @click="tableRowClick(scope.row,'edit')"
+ type="text"
+ size="small"
+ >缂栬緫</el-button
+ >
+ <el-button
+ type="text"
+ size="small"
+ @click="tableRowClick(scope.row,'look')"
+ >鏌ョ湅</el-button
+ >
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
</div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
<!-- 鏂板缓/缂栬緫 -->
- <AddScrapDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <AddDialog v-if="editConfig.visible" @refresh="refresh" :edit-common-config="editConfig" />
</div>
</template>
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getProductList } from "@/api/product/product"
-// import DetailProduct from "@/views/productManage/product/DetailProduct"
-import AddScrapDialog from "@/views/operate/scrap/AddScrapDialog"
+import { getWarehouseList } from "@/api/warehouseManage/warehouse"
+import AddDialog from "@/views/warehouseManage/warehouse/AddDialog"
export default {
name: "WarehouseView",
props: {},
- components: { AddScrapDialog },
+ components: { AddDialog },
mixins: [pageMixin],
computed: {},
data() {
return {
tableList: {},
- searchOptions: [],
+ keyword:'',
editConfig: {
visible: false,
title: "鏂板缓",
@@ -58,7 +75,8 @@
setTable() {
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol)
@@ -77,19 +95,19 @@
let tableColumn = [
{
label: "浠撳簱",
- prop: "id",
+ prop: "name",
isShowColumn: true,
default: true
},
{
label: "搴撳瓨浣嶇疆",
- prop: "deviceName",
+ prop: "warehouseLocation",
isShowColumn: true,
default: true
},
{
label: "鍦板潃",
- prop: "id",
+ prop: "address",
isShowColumn: true,
default: true
}
@@ -101,39 +119,45 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
// 璇锋眰鏁版嵁
- async getData(val, content) {
- await getProductList({
- [val]: content,
+ async getData() {
+ await getWarehouseList({
+ keyword: this.keyword,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.data.code === 200) {
- const list = res.data.data.list.map((item) => {
- return {
- ...item,
- supplierNumber: item.supplier.number,
- status: "鑽夌",
- preTime: "2023-09-04 11:20:00"
- }
- })
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.data.total
+ if (res.code == 200) {
+ const list = res.data?res.data:[]
+ this.tableList.tableInfomation = list
+ this.pagerOptions.totalCount = res.total
}
})
},
+ refresh(){
+ this.pagerOptions.currPage=1
+ this.getData()
+ },
// 鎼滅储
getList(val) {
- console.log(val)
+ this.keyword=val;
+ this.pagerOptions.currPage=1
+ this.getData()
},
// 琛岀偣鍑�
- tableRowClick(row) {
- console.log(row)
- this.editConfig.visible = true
- this.editConfig.title = "缂栬緫"
+ tableRowClick(row,val) {
+ this.editConfig.title = val=='look'?'鏌ョ湅':"缂栬緫"
this.editConfig.infomation = { ...row }
+ this.editConfig.visible = true
},
// 鏂板缓
addBtnClick() {
+ this.editConfig.infomation={
+ address:'',
+ buyToResupply:null,
+ code:'',
+ name:'',
+ inboundTransportation:1,
+ outboundTransportation:1,
+ }
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
}
--
Gitblit v1.8.0