From ca77daf544d73c04fd2378cda22430ab38113db5 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:10:37 +0800
Subject: [PATCH] 库位页面查询调整
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue | 162 +++++++++++++++++++++++++++++-------------------------
1 files changed, 87 insertions(+), 75 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 c72b86a..8a35244 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -105,19 +105,21 @@
</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 :md="8" :sm="24">
- <a-form-item label="搴撳尯缂栧彿">
- <a-input v-model="queryParam.areaCode" 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-input v-model="queryParam.areaId" allow-clear placeholder="璇疯緭鍏ユ墍鍦ㄥ簱鍖�" /> -->
+ <a-select v-model="queryParam.areaCode" style="width: 100%" placeholder="璇烽�夋嫨鎵�鍦ㄥ簱鍖�">
+ <a-select-option v-for="(item, index) in WmsAreaData" :key="index"
+ :value="item.areaCode">{{ item.areaName
+ }}</a-select-option>
+ </a-select>
+
</a-form-item>
</a-col>
<!-- <a-col :md="8" :sm="24">
@@ -125,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="璇疯緭鍏ユ帓" />
@@ -144,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>
@@ -194,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"
@@ -217,40 +221,39 @@
<!--骞存湀鏃ユ椂鍒嗙-->
<!--鏃堕棿鑼冨洿-->
- <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')]
- }"
- v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime" />
+ }" v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
+ @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')]
- }"
- v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime" />
+ }" v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
+ @change="onChangeupdatedTime" />
</a-form-item>
</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>
+ </a-col> -->
+ </template>
<a-col :md="8" :sm="24">
<span class="table-page-search-submitButtons">
@@ -381,6 +384,7 @@
import { downloadFile } from '@/utils/util'
import editForm from './editForm.vue'
import excelForm from './excelForm.vue'
+import { WmsAreaPage, WmsAreaDelete, WmsAreaToExcel } from '@/api/modular/main/WmsBase/WmsAreaManage'
export default {
mixins: [setTableHtMixin],
components: {
@@ -463,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: '搴撲綅绫诲瀷',
@@ -731,48 +775,9 @@
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',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'areaId'
- },
+
// {
- // title: '搴撳尯鍚嶇О',
+ // title: '鎵�鍦ㄥ簱鍖�',
// align: 'center',
// customHeaderCell: () => {
// return {
@@ -789,8 +794,9 @@
// }
// },
// sorter: true,
- // dataIndex: 'areaName'
+ // dataIndex: 'areaId'
// },
+
{
title: '妫�楠岀爜',
align: 'center',
@@ -1154,7 +1160,7 @@
dataIndex: 'updatedTime'
},
{
- title: '鍒涘缓鑰呭悕绉�',
+ title: '鍒涘缓浜�',
align: 'center',
customHeaderCell: () => {
return {
@@ -1174,7 +1180,7 @@
dataIndex: 'createdUserName'
},
{
- title: '淇敼鑰呭悕绉�',
+ title: '淇敼浜�',
align: 'center',
customHeaderCell: () => {
return {
@@ -1204,7 +1210,8 @@
placeTypeData: [],
placeStatusData: [],
selectedRowKeys: [],
- selectedRows: []
+ selectedRows: [],
+ WmsAreaData: []
}
},
created() {
@@ -1256,7 +1263,10 @@
},
false
)
-
+ WmsAreaPage().then(d => {
+ this.WmsAreaData = d.data.rows
+ this.$refs.addForm.WmsAreaData = d.data.rows || []
+ })
},
methods: {
moment,
@@ -1349,10 +1359,12 @@
}
}
</script>
-<style lang="less">.table-operator {
+<style lang="less">
+.table-operator {
margin-bottom: 18px;
}
button {
margin-right: 8px;
-}</style>
+}
+</style>
--
Gitblit v1.9.3