From bac077fc7f67a1002b4dafa64e069cbbaabc646a Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 11:00:00 +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 | 154 ++++++++++++++++++++++++++++++---------------------
1 files changed, 90 insertions(+), 64 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 f53e721..69d1eb8 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -23,10 +23,18 @@
</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-form-item label="鐗╂枡绫诲瀷鎻忚堪">
<a-input v-model="queryParam.materialTypeDescr" allow-clear
@@ -44,17 +52,25 @@
<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
- placeholder="璇疯緭鍏BC鍒嗙被" />
+ <!-- <a-input-number v-model="queryParam.abcClassName" style="width: 100%" allow-clear
+ placeholder="璇疯緭鍏BC鍒嗙被" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨ABC鍒嗙被" v-model="queryParam.abcClass" >
+ <a-select-option v-for="(item, index) in materialTypeData2" :key="index" :value="item.code">{{
+ item.name }}</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.materialSpec" allow-clear placeholder="璇疯緭鍏ョ墿鏂欒鏍�" />
</a-form-item>
@@ -98,7 +114,7 @@
<a-form-item label="鎵规灞炴�ц鍒�">
<a-input v-model="queryParam.batchRuleId" 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.controlRuleId" allow-clear placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒�" />
@@ -114,14 +130,15 @@
</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.materialDesc" allow-clear placeholder="璇疯緭鍏ユ弿杩�" />
</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')]
@@ -129,11 +146,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')]
@@ -144,15 +161,16 @@
</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">
@@ -223,7 +241,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'
@@ -398,28 +416,8 @@
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鍒嗙被',
+ title: 'ABC鍒嗙被鍚嶇О',
align: 'center',
customHeaderCell: () => {
return {
@@ -436,8 +434,28 @@
}
},
sorter: true,
- dataIndex: 'abcClass'
+ dataIndex: 'abcClassName'
},
+ // {
+ // title: 'ABC鍒嗙被',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'abcClass'
+ // },
{
title: '鐗╂枡瑙勬牸',
align: 'center',
@@ -598,26 +616,26 @@
sorter: true,
dataIndex: 'translateRate'
},
- {
- title: '鎵规灞炴�ц鍒�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'batchRuleId'
- },
+ // {
+ // title: '鎵规灞炴�ц鍒�',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'batchRuleId'
+ // },
// {
// title: '鎺у埗灞炴�ц鍒�',
// align: 'center',
@@ -720,7 +738,7 @@
dataIndex: 'updatedTime'
},
{
- title: '鍒涘缓鑰呭悕绉�',
+ title: '鍒涘缓浜�',
align: 'center',
customHeaderCell: () => {
return {
@@ -740,7 +758,7 @@
dataIndex: 'createdUserName'
},
{
- title: '淇敼鑰呭悕绉�',
+ title: '淇敼浜�',
align: 'center',
customHeaderCell: () => {
return {
@@ -768,7 +786,8 @@
})
},
selectedRowKeys: [],
- selectedRows: []
+ selectedRows: [],
+ materialTypeData:[]
}
},
created() {
@@ -796,6 +815,9 @@
const isDisabledOption = this.$options
this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
+ const materialTypeOption = this.$options
+ this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class_type')
+
this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
window.addEventListener(
'resize',
@@ -804,7 +826,11 @@
},
false
)
+ materialTypeDataList().then((d) => {
+ this.materialTypeData = d.data || []
+ }).catch(() => {
+ })
},
methods: {
moment,
--
Gitblit v1.9.3