From 643f51141b9a046f74e444f47a0539496a27d6e4 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:01:24 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue | 235 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 125 insertions(+), 110 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
index fb153d0..430833b 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -23,33 +23,43 @@
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="鐗╂枡绫诲瀷鍚嶇О">
- <a-input v-model="queryParam.materialTypeName" allow-clear
- placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" />
+ <!-- <a-input v-model="queryParam.materialTypeName" allow-clear
+ placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" /> -->
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷"
+ v-model="queryParam.materialTypeName">
+ <a-select-option v-for="(item, index) in materialTypeData" :key="index"
+ :value="item.materialTypeName">{{
+ item.materialTypeName }}</a-select-option>
+ </a-select>
</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.materialTypeDescr" 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.materialType" style="width: 100%" 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.materialGroup" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑粍" />
</a-form-item>
</a-col>
- <a-col :md="8" :sm="24">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="ABC鍒嗙被鍚嶇О">
<a-input v-model="queryParam.abcClassName" allow-clear placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О" />
</a-form-item>
- </a-col><a-col :md="8" :sm="24">
+ </a-col> -->
+ <a-col :md="8" :sm="24">
<a-form-item label="ABC鍒嗙被">
- <a-input-number v-model="queryParam.abcClass" style="width: 100%" allow-clear
+ <a-input-number v-model="queryParam.abcClassName" style="width: 100%" allow-clear
placeholder="璇疯緭鍏BC鍒嗙被" />
</a-form-item>
</a-col>
@@ -70,7 +80,7 @@
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="閲囪喘鍗曚綅">
- <a-input v-model="queryParam.pOUnit" allow-clear placeholder="璇疯緭鍏ラ噰璐崟浣�" />
+ <a-input v-model="queryParam.poUnit" allow-clear placeholder="璇疯緭鍏ラ噰璐崟浣�" />
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -85,7 +95,7 @@
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="鏍囧寘鏁伴噺">
- <a-input v-model="queryParam.sNP" allow-clear placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" />
+ <a-input v-model="queryParam.snp" allow-clear placeholder="璇疯緭鍏ユ爣鍖呮暟閲�" />
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -98,11 +108,11 @@
<a-input v-model="queryParam.batchRuleId" 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.controlRuleId" 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.isDisabled"
@@ -124,9 +134,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>
@@ -137,21 +146,20 @@
<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>
@@ -224,7 +232,7 @@
<script>
import { STable } from '@/components'
import moment from 'moment'
-import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
+import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel ,materialTypeDataList} from '@/api/modular/main/WmsBase/WmsMaterialManage'
//鑷畾涔塼able楂樺害
import setTableHtMixin from '@/mixins/handleTableHt.js'
import addForm from './addForm.vue'
@@ -339,46 +347,46 @@
sorter: true,
dataIndex: 'materialTypeName'
},
- {
- title: '鐗╂枡绫诲瀷鎻忚堪',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'materialTypeDescr'
- },
- {
- title: '鐗╂枡绫诲瀷',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'materialType'
- },
+ // {
+ // title: '鐗╂枡绫诲瀷鎻忚堪',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'materialTypeDescr'
+ // },
+ // {
+ // title: '鐗╂枡绫诲瀷',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'materialType'
+ // },
{
title: '鐗╂枡缁�',
align: 'center',
@@ -399,26 +407,26 @@
sorter: true,
dataIndex: 'materialGroup'
},
- {
- title: 'ABC鍒嗙被鍚嶇О',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'abcClassName'
- },
+ // {
+ // title: 'ABC鍒嗙被鍚嶇О',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'abcClassName'
+ // },
{
title: 'ABC鍒嗙被',
align: 'center',
@@ -517,7 +525,7 @@
}
},
sorter: true,
- dataIndex: 'pOUnit'
+ dataIndex: 'poUnit'
},
{
title: '棰滆壊',
@@ -577,7 +585,7 @@
}
},
sorter: true,
- dataIndex: 'sNP'
+ dataIndex: 'snp'
},
{
title: '鎹㈢畻鐜�',
@@ -619,26 +627,26 @@
sorter: true,
dataIndex: 'batchRuleId'
},
- {
- title: '鎺у埗灞炴�ц鍒�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'controlRuleId'
- },
+ // {
+ // title: '鎺у埗灞炴�ц鍒�',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'controlRuleId'
+ // },
{
title: '鏄惁绂佺敤',
align: 'center',
@@ -721,7 +729,7 @@
dataIndex: 'updatedTime'
},
{
- title: '鍒涘缓鑰呭悕绉�',
+ title: '鍒涘缓浜�',
align: 'center',
customHeaderCell: () => {
return {
@@ -741,7 +749,7 @@
dataIndex: 'createdUserName'
},
{
- title: '淇敼鑰呭悕绉�',
+ title: '淇敼浜�',
align: 'center',
customHeaderCell: () => {
return {
@@ -769,7 +777,8 @@
})
},
selectedRowKeys: [],
- selectedRows: []
+ selectedRows: [],
+ materialTypeData:[]
}
},
created() {
@@ -805,7 +814,11 @@
},
false
)
+ materialTypeDataList().then((d) => {
+ this.materialTypeData = d.data || []
+ }).catch(() => {
+ })
},
methods: {
moment,
@@ -898,10 +911,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