From fbdb1d15b6cf692d27598806eee6be6f16e1f36d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 22 九月 2023 17:54:55 +0800
Subject: [PATCH] 产品出入库明细接口联调、调拨列表接口联调、出入库搜索功能增加
---
src/views/operate/allot/index.vue | 178 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 94 insertions(+), 84 deletions(-)
diff --git a/src/views/operate/allot/index.vue b/src/views/operate/allot/index.vue
index 042e54b..53dc714 100644
--- a/src/views/operate/allot/index.vue
+++ b/src/views/operate/allot/index.vue
@@ -3,7 +3,7 @@
<div class="top">
<SearchCommonView
:add-title="'鏂板缓'"
- :placeholder="'璇疯緭鍏ュ崟鍙�'"
+ :placeholder="'璇疯緭鍏ュ崟鍙�/鏉ユ簮鍗曟嵁'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
@@ -29,7 +29,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getProductList } from "@/api/product/product"
+import { getAllList } from "@/api/overview/overview"
// import DetailProduct from "@/views/productManage/product/DetailProduct"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
@@ -53,7 +53,8 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ keyword: ""
}
},
created() {
@@ -82,121 +83,123 @@
let tableColumn = [
{
label: "鍗曞彿",
- prop: "id",
+ prop: "number",
isShowColumn: true,
default: true
},
{
label: "浠�",
- prop: "deviceName",
+ prop: "from",
isShowColumn: showcol.includes("浠�"),
default: false
},
{
label: "鑷�",
- prop: "id",
+ prop: "to",
isShowColumn: showcol.includes("鑷�"),
default: false
},
{
label: "鑱旂郴浜�",
- prop: "deviceId",
+ prop: "companyName",
isShowColumn: showcol.includes("鑱旂郴浜�"),
default: false
},
{
label: "璐熻矗浜�",
- prop: "shopName",
+ prop: "contacterName",
isShowColumn: showcol.includes("璐熻矗浜�"),
default: false
},
{
label: "鏃ユ湡",
- prop: "preTime",
+ prop: "operationDate",
isShowColumn: showcol.includes("鏃ユ湡"),
default: false,
date: true
},
- {
- label: "浜у搧鍙敤鎬�",
- prop: "status",
- isShowColumn: showcol.includes("浜у搧鍙敤鎬�"),
- width: 100,
- default: false
- },
- {
- label: "鎴鏃ユ湡",
- prop: "faultTime",
- isShowColumn: showcol.includes("鎴鏃ユ湡"),
- default: false
- },
- {
- label: "瀹為檯鏃ユ湡",
- prop: "shopName",
- isShowColumn: showcol.includes("瀹為檯鏃ユ湡"),
- default: false
- },
+ // {
+ // label: "浜у搧鍙敤鎬�",
+ // prop: "status",
+ // isShowColumn: showcol.includes("浜у搧鍙敤鎬�"),
+ // width: 100,
+ // default: false
+ // },
+ // {
+ // label: "鎴鏃ユ湡",
+ // prop: "faultTime",
+ // isShowColumn: showcol.includes("鎴鏃ユ湡"),
+ // default: false
+ // },
+ // {
+ // label: "瀹為檯鏃ユ湡",
+ // prop: "shopName",
+ // isShowColumn: showcol.includes("瀹為檯鏃ユ湡"),
+ // default: false
+ // },
{
label: "鏉ユ簮鍗曟嵁",
- prop: "faultLevel",
+ 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: "status",
+ // isShowColumn: showcol.includes("鎵胯繍鍟�"),
+ // default: false
+ // },
+ // {
+ // label: "鐩殑鍦�",
+ // prop: "status",
+ // isShowColumn: showcol.includes("鐩殑鍦�"),
+ // default: false
+ // },
+ // {
+ // label: "閲嶉噺",
+ // prop: "status",
+ // isShowColumn: showcol.includes("閲嶉噺"),
+ // default: false
+ // },
+ // {
+ // label: "鐗╂祦閲嶉噺",
+ // prop: "status",
+ // isShowColumn: showcol.includes("鐗╂祦閲嶉噺"),
+ // default: false
+ // },
{
- label: "娆犲崟",
- prop: "status",
- isShowColumn: showcol.includes("娆犲崟"),
- default: false
- },
- {
- label: "杩借釜鍙傝��",
- prop: "status",
- isShowColumn: showcol.includes("杩借釜鍙傝��"),
- default: false
- },
- {
- label: "鎵胯繍鍟�",
- prop: "status",
- isShowColumn: showcol.includes("鎵胯繍鍟�"),
- default: false
- },
- {
- label: "鐩殑鍦�",
- prop: "status",
- isShowColumn: showcol.includes("鐩殑鍦�"),
- default: false
- },
- {
- label: "閲嶉噺",
- prop: "status",
- isShowColumn: showcol.includes("閲嶉噺"),
- default: false
- },
- {
- label: "鐗╂祦閲嶉噺",
- prop: "status",
- isShowColumn: showcol.includes("鐗╂祦閲嶉噺"),
- default: false
- },
- {
- label: "鎿嶄綔绫诲瀷",
- prop: "faultTime",
+ label: "鍏ュ簱绫诲瀷",
+ prop: "operationTypeName",
isShowColumn: showcol.includes("鎿嶄綔绫诲瀷"),
default: false
},
- {
- label: "鍏徃",
- prop: "faultTime",
- isShowColumn: showcol.includes("鍏徃"),
- default: false
- },
+ // {
+ // label: "鍏徃",
+ // prop: "faultTime",
+ // isShowColumn: showcol.includes("鍏徃"),
+ // default: false
+ // },
{
label: "鐘舵��",
prop: "status",
width: 120,
isShowColumn: showcol.includes("鐘舵��"),
default: false,
- status: true
+ status: true,
+ isCallMethod: true,
+ getCallMethod: this.getStatus
}
]
return tableColumn
@@ -206,29 +209,32 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
// 璇锋眰鏁版嵁
- async getData(val, content) {
- await getProductList({
- [val]: content,
+ async getData() {
+ await getAllList({
+ number: this.keyword,
page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
+ pageSize: this.pagerOptions.pageSize,
+ sourceNumber: this.keyword
}).then((res) => {
- if (res.data.code === 200) {
- const list = res.data.data.list.map((item) => {
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
return {
...item,
- supplierNumber: item.supplier.number,
- status: "灏辩华",
- preTime: "2023-09-04 11:20:00"
+ from: item.fromLocation.name,
+ to: item.toLocation.name
}
})
this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.data.total
+ this.pagerOptions.totalCount = res.total
}
})
},
// 鎼滅储
getList(val) {
console.log(val)
+ this.keyword = val
+ this.pagerOptions.currPage = 1
+ this.getData()
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -241,6 +247,10 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
+ },
+ // 鐘舵��
+ getStatus(val) {
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
}
}
}
--
Gitblit v1.8.0