From b6fd2a89f69c406acb00196b2865b12e839360e6 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 09:51:56 +0800
Subject: [PATCH] 1
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 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 7c3cb10..db67a5c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
@@ -27,23 +27,24 @@
<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.areaDesc" 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.areaStatus" style="width: 100%" allow-clear
placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�" />
</a-form-item>
- </a-col>
+ </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="搴撳瓨鍦扮紪鐮�">
+ <a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏ュ簱瀛樺湴缂栫爜" />
</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>
@@ -122,40 +123,40 @@
<!--骞存湀鏃ユ椂鍒嗙-->
<!--鏃堕棿鑼冨洿-->
- <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">
@@ -283,6 +284,9 @@
import { downloadFile } from '@/utils/util'
import editForm from './editForm.vue'
import excelForm from './excelForm.vue'
+
+import { WmsWarehousePage, WmsWarehouseDelete, WmsWarehouseToExcel } from '@/api/modular/main/WmsBase/WmsWarehouseManage'
+
export default {
mixins: [setTableHtMixin],
components: {
@@ -427,7 +431,7 @@
dataIndex: 'areaStatus'
},
{
- title: 'ERP浠ｇ爜',
+ title: '搴撳瓨鍦扮紪鐮�',
align: 'center',
customHeaderCell: () => {
return {
@@ -655,7 +659,7 @@
dataIndex: 'updatedTime'
},
{
- title: '鍒涘缓鑰呭悕绉�',
+ title: '鍒涘缓浜�',
align: 'center',
customHeaderCell: () => {
return {
@@ -675,7 +679,7 @@
dataIndex: 'createdUserName'
},
{
- title: '淇敼鑰呭悕绉�',
+ title: '淇敼浜�',
align: 'center',
customHeaderCell: () => {
return {
@@ -729,8 +733,8 @@
}
});
}
- const warehouseIdOption = this.$options
- this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
+ // const warehouseIdOption = this.$options
+ // this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
const isBarcodeLevelControlOption = this.$options
this.isBarcodeLevelControlData = isBarcodeLevelControlOption.filters['dictData']('yes_true_false')
const isFIFOOption = this.$options
@@ -754,6 +758,14 @@
},
false
)
+
+
+ WmsWarehousePage().then((d) => {
+ this.warehouseIdData = d.data.rows || []
+ this.$refs.addForm.warehouseIdData = d.data.rows || []
+ }).catch(() => {
+ })
+
},
methods: {
@@ -847,10 +859,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