From 0e394ed580b09329ecaa8476bbb6334f8212b009 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 13:40:31 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
index 627d961..31ca90c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
@@ -12,10 +12,15 @@
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
- <a-form-item label="鏈�楂樺簱瀛�">
- <a-input v-model="queryParam.maxImumqty" allow-clear placeholder="璇疯緭鍏ユ渶楂樺簱瀛�"/>
+ <a-form-item label="鎺у埗灞炴�ц鍒欏悕绉�">
+ <a-input v-model="queryParam.ruleName" allow-clear placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欏悕绉�"/>
</a-form-item>
</a-col><template v-if="advanced">
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鏈�楂樺簱瀛�">
+ <a-input v-model="queryParam.maxImumqty" allow-clear placeholder="璇疯緭鍏ユ渶楂樺簱瀛�"/>
+ </a-form-item>
+ </a-col>
<a-col :md="8" :sm="24">
<a-form-item label="鏈�浣庡簱瀛�">
<a-input v-model="queryParam.minImumqty" allow-clear placeholder="璇疯緭鍏ユ渶浣庡簱瀛�"/>
@@ -212,6 +217,26 @@
dataIndex: 'ruleCode'
},
{
+ title: '鎺у埗灞炴�ц鍒欏悕绉�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'ruleName'
+ },
+ {
title: '鏈�楂樺簱瀛�',
align: 'center',
customHeaderCell: () => {
--
Gitblit v1.9.3