From f02c08d6540d0ea3a72ca3958e0e16d960fbbf8e Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 18 十月 2023 19:55:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/warehouseManage/bussinessType/AddBussinessType.vue | 2 +-
src/views/overview/index.vue | 9 ++++++---
src/router/index.js | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index b4932a3..013fdc1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -113,10 +113,10 @@
if ((to.path === "/overview/overviewList" || to.path === "/productManage/productList") && to.params.name) {
console.log(from, next)
to.meta.title = to.params.name
- document.title = to.meta.title
+ // document.title = to.meta.title
} else if (to.name === "inboundOutboundDetail") {
to.meta.title = "鍑哄叆搴撴槑缁�"
- document.title = to.meta.title
+ // document.title = to.meta.title
}
})
// router.beforeEach((to, from, next) => {
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index ab51daf..baee3a7 100644
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="rightContent">
<div class="top">
- <SearchCommonView :show-add="false" :placeholder="'璇疯緭鍏ヤ骇鍝佸悕绉�'" :amount-view="false" @searchClick="getList" />
+ <SearchCommonView :show-add="false" :placeholder="'璇疯緭鍏ヤ笟鍔＄被鍨�'" :amount-view="false" @searchClick="getList" />
</div>
<div class="content">
<div class="list-view">
@@ -63,7 +63,8 @@
editConfig: {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
+ keyword: ""
}
}
},
@@ -73,6 +74,8 @@
methods: {
getList(val) {
console.log(val)
+ this.keyword = val
+ this.getData()
},
labelClick(item) {
console.log(item)
@@ -83,7 +86,7 @@
},
async getData() {
await getOperationType({
- keyword: "",
+ keyword: this.keyword,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
diff --git a/src/views/warehouseManage/bussinessType/AddBussinessType.vue b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
index 17a84e9..df2d806 100644
--- a/src/views/warehouseManage/bussinessType/AddBussinessType.vue
+++ b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
@@ -36,7 +36,7 @@
<div class="basic-info-view">
<div class="purchase-view">
<div class="left">
- <el-form-item label="涓氬姟绫诲瀷" prop="name">
+ <el-form-item label="鍗曟嵁绫诲瀷" prop="name">
<el-input
v-model="editConfig.infomation.name"
placeholder="璇峰～鍐�"
--
Gitblit v1.8.0