From 8b2085e487e014303fca40a3c373b78893c7895e Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 09:48:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
index 67a0000..ec493f5 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
@@ -39,12 +39,12 @@
</a-form-item>
</a-col> -->
<a-col :md="8" :sm="24">
- <a-form-item label="ERP浠ｇ爜">
- <a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏RP浠ｇ爜" />
+ <a-form-item label="ERP搴撳瓨鍦�">
+ <a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏RP搴撳瓨鍦�" />
</a-form-item>
</a-col><a-col :md="8" :sm="24">
<a-form-item label="鎵�灞炰粨搴�">
- <a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseId"
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseCode"
placeholder="璇烽�夋嫨鎵�灞炰粨搴�">
<a-select-option v-for="(item, index) in warehouseIdData" :key="index"
:value="item.code">{{ item.name }}</a-select-option>
@@ -146,13 +146,13 @@
</a-col>
<a-col :md="8" :sm="24">
- <a-form-item label="鍒涘缓鑰呭悕绉�">
- <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤鸿�呭悕绉�" />
+ <a-form-item label="鍒涘缓浜�">
+ <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤轰汉" />
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
- <a-form-item label="淇敼鑰呭悕绉�">
- <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="璇疯緭鍏ヤ慨鏀硅�呭悕绉�" />
+ <a-form-item label="淇敼浜�">
+ <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="璇疯緭鍏ヤ慨鏀逛汉" />
</a-form-item>
</a-col> </template>
@@ -429,7 +429,7 @@
dataIndex: 'areaStatus'
},
{
- title: 'ERP浠ｇ爜',
+ title: 'ERP搴撳瓨鍦�',
align: 'center',
customHeaderCell: () => {
return {
@@ -657,7 +657,7 @@
dataIndex: 'updatedTime'
},
{
- title: '鍒涘缓鑰呭悕绉�',
+ title: '鍒涘缓浜�',
align: 'center',
customHeaderCell: () => {
return {
@@ -677,7 +677,7 @@
dataIndex: 'createdUserName'
},
{
- title: '淇敼鑰呭悕绉�',
+ title: '淇敼浜�',
align: 'center',
customHeaderCell: () => {
return {
--
Gitblit v1.9.3