From 4b9a6f3c7ed2a6e94b28459eac5f1f64eb36826d Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 20:44:20 +0800
Subject: [PATCH] 1
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 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..cf8bb56 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -115,9 +115,17 @@
<a-input v-model="queryParam.areaCode" allow-clear placeholder="璇疯緭鍏ュ簱鍖虹紪鍙�" />
</a-form-item>
</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.id">{{ item.areaName
+ }}</a-select-option>
+ </a-select>
+
</a-form-item>
</a-col>
<!-- <a-col :md="8" :sm="24">
@@ -221,9 +229,8 @@
<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>
@@ -234,9 +241,8 @@
<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>
@@ -381,6 +387,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: {
@@ -751,26 +758,26 @@
sorter: true,
dataIndex: 'areaCode'
},
- {
- title: '鎵�鍦ㄥ簱鍖�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'areaId'
- },
+ // {
+ // title: '鎵�鍦ㄥ簱鍖�',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'areaId'
+ // },
// {
// title: '搴撳尯鍚嶇О',
// align: 'center',
@@ -1204,7 +1211,8 @@
placeTypeData: [],
placeStatusData: [],
selectedRowKeys: [],
- selectedRows: []
+ selectedRows: [],
+ WmsAreaData: []
}
},
created() {
@@ -1256,7 +1264,10 @@
},
false
)
-
+ WmsAreaPage().then(res => {
+ this.WmsAreaData = res.data.rows
+ this.$refs.addForm.WmsAreaData = d.data.rows || []
+ })
},
methods: {
moment,
@@ -1349,10 +1360,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