From 9b49da3312241a0af84823d35b7763e64d320b19 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:01:18 +0800
Subject: [PATCH] 调整查询条件
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue | 305 ++++++++++++++++++++++++++++++++------------------
1 files changed, 197 insertions(+), 108 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
index bf80dc2..fe74e81 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
@@ -1,6 +1,6 @@
锘�<template>
<!-- 鎺у埗灞炴�ц鍒� -->
- <div ref="boxOutWrap" class="boxOutWrap">
+ <div ref="boxOutWrap">
<div ref="boxForm" class="boxForm">
<a-card :bordered="false" :bodyStyle="tstyle">
<div class="table-page-search-wrapper" v-if="hasPerm('WmsControlRule:page')">
@@ -14,8 +14,7 @@
<a-col :md="8" :sm="24">
<a-form-item label="瑙勫垯鍚嶇О">
<a-input v-model="queryParam.ruleName" allow-clear placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
- </a-form-item> </a-col
- ><template v-if="advanced">
+ </a-form-item> </a-col><template v-if="advanced">
<a-col :md="8" :sm="24">
<a-form-item label="瑙勫垯鎻忚堪">
<a-input v-model="queryParam.ruleDesc" allow-clear placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
@@ -23,12 +22,8 @@
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="鏄惁绂佺敤">
- <a-select
- :allowClear="true"
- style="width: 100%"
- v-model="queryParam.isDisabled"
- placeholder="璇烽�夋嫨鏄惁绂佺敤"
- >
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled"
+ placeholder="璇烽�夋嫨鏄惁绂佺敤">
<a-select-option v-for="(item, index) in isDisabledData" :key="index" :value="item.code">{{
item.name
}}</a-select-option>
@@ -40,18 +35,11 @@
<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"
- />
+ <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" />
</a-form-item>
</a-col>
<!--骞存湀鏃ユ椂鍒嗙-->
@@ -59,33 +47,26 @@
<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"
- />
+ <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" />
</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 :md="8" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" @click="$refs.table.refresh(true)">鏌ヨ</a-button>
@@ -102,16 +83,9 @@
</a-card>
</div>
<a-card :bordered="false">
- <s-table
- ref="table"
- :columns="columns"
- :data="loadData"
- :alert="true"
- @changeTablePage="pageInfo = $event"
- :scroll="{ x: true, y: tableHeight }"
- :rowKey="record => record.id"
- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
- >
+ <s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
+ :scroll="{ x: true }" :rowKey="record => record.id"
+ :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
<template class="table-operator" slot="operator" v-if="hasPerm('WmsControlRule:add')">
<!-- <div ref="actionBar" class="actionBar">
<a-button
@@ -135,29 +109,31 @@
>
</div> -->
</template>
- <span slot="isDisabledscopedSlots" slot-scope="text">
- <div v-if="text === true">
- <a-tag color="green">鏄�</a-tag>
- </div>
- <div v-else-if="text == false">
- <a-tag color="volcano">鍚�</a-tag>
- </div>
- <div v-else=""></div>
- </span>
- <span slot="action" slot-scope="text, record">
- <!-- 鑷畾涔� -->
+ <span slot="isNotChekscopedSlots" slot-scope="text">
+ <div v-if="text===true ">
+ <a-tag color="green">鏄�</a-tag>
+ </div>
+ <div v-else-if="text==false">
+ <a-tag color="volcano">鍚�</a-tag>
+ </div>
+ <div v-else=""></div>
+ </span>
+ <span slot="isDisabledscopedSlots" slot-scope="text">
+ <div v-if="text===true ">
+ <a-tag color="green">鏄�</a-tag>
+ </div>
+ <div v-else-if="text==false">
+ <a-tag color="volcano">鍚�</a-tag>
+ </div>
+ <div v-else=""></div>
+ </span>
+
+ <!-- <span slot="action" slot-scope="text, record">
<a v-if="hasPerm('WmsControlRule:getdetail')" @click="$refs.detailForm.edit(record)">璇︽儏</a>
</a-popconfirm>
- </span>
+ </span> -->
</s-table>
- <add-form ref="addForm" @ok="handleOk" />
- <edit-form ref="editForm" @ok="handleOk" />
- <excel-form ref="excelForm" @ok="handleOk" />
-
- <!-- 鑷畾涔� -->
- <detail-form ref="detailForm" @ok="handleOk" />
-
</a-card>
</div>
</template>
@@ -171,22 +147,13 @@
} from '@/api/modular/main/WmsBase/WmsControlRuleManage'
//鑷畾涔塼able楂樺害
import setTableHtMixin from '@/mixins/handleTableHt.js'
-import addForm from './addForm.vue'
import { exportExcel } from '@/utils/exportToExcel'
import { downloadFile } from '@/utils/util'
-import editForm from './editForm.vue'
-import excelForm from './excelForm.vue'
-import detailForm from './details.vue'
-
export default {
- mixins: [setTableHtMixin],
+ // mixins: [setTableHtMixin],
components: {
- STable,
- addForm,
- editForm,
- excelForm,
- detailForm
+ STable
},
data() {
return {
@@ -204,19 +171,19 @@
customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
},
{
- title: '瑙勫垯缂栧彿',
+ title: '鎺у埗灞炴�ц鍒欑紪鍙�',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -224,19 +191,19 @@
dataIndex: 'ruleCode'
},
{
- title: '瑙勫垯鍚嶇О',
+ title: '鎺у埗灞炴�ц鍒欏悕绉�',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '150px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -244,24 +211,145 @@
dataIndex: 'ruleName'
},
{
- title: '瑙勫垯鎻忚堪',
+ title: '鏈�楂樺簱瀛�',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
sorter: true,
- dataIndex: 'ruleDesc'
+ dataIndex: 'maxImumqty'
+ },
+ {
+ title: '鏈�浣庡簱瀛�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'minImumqty'
+ },
+ {
+ title: '瀹夊叏搴撳瓨',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'safeImumqty'
+ },
+ {
+ title: '鏈�灏忓簱榫�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'minStorageAge'
+ },
+ {
+ title: '鏈�澶у簱榫�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'maxStorageAge'
+ },
+ {
+ title: '鏄惁鍏嶆',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'isNotChek',
+ scopedSlots: { customRender: 'isNotChekscopedSlots' }
+ },
+ {
+ title: '淇濊川鏈熷ぉ鏁�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'shelfLifeDays'
},
{
title: '鏄惁绂佺敤',
@@ -269,14 +357,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -290,14 +378,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -310,14 +398,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -325,19 +413,19 @@
dataIndex: 'updatedTime'
},
{
- title: '鍒涘缓鑰呭悕绉�',
+ title: '鍒涘缓浜�',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -345,19 +433,19 @@
dataIndex: 'createdUserName'
},
{
- title: '淇敼鑰呭悕绉�',
+ title: '淇敼浜�',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px' //鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -377,14 +465,14 @@
}
},
created() {
- if (this.hasPerm('WmsControlRule:edit') || this.hasPerm('WmsControlRule:delete')) {
- this.columns.push({
- title: '鎿嶄綔',
- width: '150px',
- dataIndex: 'action',
- scopedSlots: { customRender: 'action' }
- })
- }
+ // if (this.hasPerm('WmsControlRule:edit') || this.hasPerm('WmsControlRule:delete')) {
+ // this.columns.push({
+ // title: '鎿嶄綔',
+ // width: '150px',
+ // dataIndex: 'action',
+ // scopedSlots: { customRender: 'action' }
+ // })
+ // }
const path = this.$route.path
const columnStr = window.localStorage.getItem(path)
if (columnStr) {
@@ -506,6 +594,7 @@
.table-operator {
margin-bottom: 18px;
}
+
button {
margin-right: 8px;
}
--
Gitblit v1.9.3