From 3946fe3c23ff022b7e1d27c2a29041496ef6d529 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue | 111 +++++++++++++++++++++++++++++--------------------------
1 files changed, 58 insertions(+), 53 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
index 20b3ae4..97a35a0 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -105,18 +105,18 @@
</a-form-item>
</a-col>
- <a-col :md="8" :sm="24">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="搴撳瓨鐜">
<a-input v-model="queryParam.environment" allow-clear placeholder="璇疯緭鍏ュ簱瀛樼幆澧�" />
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :md="8" :sm="24">
<a-form-item label="鎵�鍦ㄥ簱鍖�">
<!-- <a-input v-model="queryParam.areaId" allow-clear placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" /> -->
- <a-select v-model="queryParam.areaCode" style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�">
+ <a-select v-model="queryParam.areaId" style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�">
<a-select-option v-for="(item, index) in WmsAreaData" :key="index"
- :value="item.id">{{ item.areaName
+ :value="item.areaCode">{{ item.areaName
}}</a-select-option>
</a-select>
@@ -127,11 +127,12 @@
<a-input v-model="queryParam.areaName" allow-clear placeholder="璇疯緭鍏ュ簱鍖哄悕绉�" />
</a-form-item>
</a-col> -->
- <a-col :md="8" :sm="24">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="妫�楠岀爜">
<a-input v-model="queryParam.verificationCode" allow-clear placeholder="璇疯緭鍏ユ楠岀爜" />
</a-form-item>
- </a-col><a-col :md="8" :sm="24">
+ </a-col> -->
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="鎺�">
<a-input-number v-model="queryParam.rowNo" style="width: 100%" allow-clear
placeholder="璇疯緭鍏ユ帓" />
@@ -146,13 +147,14 @@
<a-input-number v-model="queryParam.layerNo" style="width: 100%" allow-clear
placeholder="璇疯緭鍏ュ眰" />
</a-form-item>
- </a-col><a-col :md="8" :sm="24">
+ </a-col> -->
+ <a-col :md="8" :sm="24">
<a-form-item label="宸烽亾">
<a-input-number v-model="queryParam.laneNo" style="width: 100%" allow-clear
placeholder="璇疯緭鍏ュ贩閬�" />
</a-form-item>
</a-col>
- <a-col :md="8" :sm="24">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="搴撲綅X鍧愭爣">
<a-input v-model="queryParam.xzb" allow-clear placeholder="璇疯緭鍏ュ簱浣峏鍧愭爣" />
</a-form-item>
@@ -196,7 +198,7 @@
<a-input-number v-model="queryParam.outSequence" style="width: 100%" allow-clear
placeholder="璇疯緭鍏ュ嚭搴撻『搴�" />
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :md="8" :sm="24">
<a-form-item label="鏄惁铏氭嫙">
<a-select :allowClear="true" style="width: 100%" v-model="queryParam.isVirtually"
@@ -219,7 +221,7 @@
<!--骞存湀鏃ユ椂鍒嗙-->
<!--鏃堕棿鑼冨洿-->
- <a-col :md="8" :sm="24">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="鍒涘缓鏃堕棿">
<a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
@@ -227,11 +229,11 @@
@change="onChangecreatedTime" />
</a-form-item>
- </a-col>
+ </a-col> -->
<!--骞存湀鏃ユ椂鍒嗙-->
<!--鏃堕棿鑼冨洿-->
- <a-col :md="8" :sm="24">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="鏇存柊鏃堕棿">
<a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
@@ -250,7 +252,8 @@
<a-form-item label="淇敼浜�">
<a-input v-model="queryParam.updatedUserName" allow-clear placeholder="璇疯緭鍏ヤ慨鏀逛汉" />
</a-form-item>
- </a-col> </template>
+ </a-col> -->
+ </template>
<a-col :md="8" :sm="24">
<span class="table-page-search-submitButtons">
@@ -464,6 +467,46 @@
},
sorter: true,
dataIndex: 'placeAlias'
+ },
+ {
+ title: '鎵�鍦ㄥ簱鍖�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'areaName'
+ },
+ {
+ title: '搴撳尯缂栧彿',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'areaCode'
},
{
title: '搴撲綅绫诲瀷',
@@ -732,26 +775,7 @@
sorter: true,
dataIndex: 'environment'
},
- {
- title: '搴撳尯缂栧彿',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'areaCode'
- },
+
// {
// title: '鎵�鍦ㄥ簱鍖�',
// align: 'center',
@@ -772,26 +796,7 @@
// sorter: true,
// dataIndex: 'areaId'
// },
- // {
- // title: '搴撳尯鍚嶇О',
- // align: 'center',
- // customHeaderCell: () => {
- // return {
- // style: {
- // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- // }
- // }
- // },
- // customCell: () => {
- // return {
- // style: {
- // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- // }
- // }
- // },
- // sorter: true,
- // dataIndex: 'areaName'
- // },
+
{
title: '妫�楠岀爜',
align: 'center',
--
Gitblit v1.9.3