From 9a991de2a0079a8f90ed0dfa26abf4d0f95a9bb5 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 28 九月 2023 10:01:29 +0800
Subject: [PATCH] bug修复（5089）
---
src/views/warehouseManage/bussinessType/index.vue | 67 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/src/views/warehouseManage/bussinessType/index.vue b/src/views/warehouseManage/bussinessType/index.vue
index 7eda06b..8c879f7 100644
--- a/src/views/warehouseManage/bussinessType/index.vue
+++ b/src/views/warehouseManage/bussinessType/index.vue
@@ -3,7 +3,7 @@
<div class="top">
<SearchCommonView
:add-title="'鏂板缓'"
- :placeholder="'璇疯緭鍏ュ崟鍙�'"
+ :placeholder="'璇疯緭鍏ュ叆搴撶被鍨�'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
@@ -23,26 +23,26 @@
</div>
</div>
<!-- 鏂板缓/缂栬緫 -->
- <AddScrapDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <AddBussinessType 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 { getOperationTypeList } from "@/api/warehouseManage/warehouse"
// import DetailProduct from "@/views/productManage/product/DetailProduct"
-import AddScrapDialog from "@/views/operate/scrap/AddScrapDialog"
+import AddBussinessType from "@/views/warehouseManage/bussinessType/AddBussinessType"
export default {
name: "WarehouseView",
props: {},
- components: { AddScrapDialog },
+ components: { AddBussinessType },
mixins: [pageMixin],
computed: {},
data() {
return {
tableList: {},
- searchOptions: [],
+ keyword:'',
editConfig: {
visible: false,
title: "鏂板缓",
@@ -77,13 +77,15 @@
let tableColumn = [
{
label: "鍏ュ簱绫诲瀷",
- prop: "id",
+ prop: "name",
isShowColumn: true,
default: true
},
{
label: "浠撳簱",
- prop: "deviceName",
+ propType:'mulitple',
+ propTwo:'name',
+ prop: "warehouse",
isShowColumn: true,
default: true
}
@@ -95,41 +97,60 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
// 璇锋眰鏁版嵁
- async getData(val, content) {
- await getProductList({
- [val]: content,
+ async getData() {
+ await getOperationTypeList({
+ 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"
- }
- })
+ const list = res.data.data
this.tableList.tableInfomation = list || []
this.pagerOptions.totalCount = res.data.data.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 = "缂栬緫"
this.editConfig.infomation = { ...row }
+ this.editConfig.visible = true
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
+ this.editConfig.infomation={
+ name:'',
+ prefix:'',
+ // 浣滀笟绫诲瀷
+ baseOperationType:null,
+ // 閫�璐х被鍨�
+ returnOperationTypeID:null,
+ // 鍒涘缓娆犲崟
+ createBackorder:null,
+ // 浠撳簱
+ warehouseId:null,
+ // 鏄剧ず浣滀笟璇︽儏
+ showOperations:null,
+ earlyOperations:null,
+ // 淇濈暀鏂瑰紡
+ reservationMethod:null,
+ // 榛樿鍘熶綅缃�
+ defaultLocationSrcId:null,
+ // 榛樿鐩爣浣嶇疆
+ defaultLocationDestId:null,
+ }
+ this.editConfig.visible = true
}
}
}
--
Gitblit v1.8.0