From 07562e1627ef14d4a946d352739d2f8d17d6360b Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 13:42:29 +0800
Subject: [PATCH] 细节

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 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 7eff19e..272dd71 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
@@ -7,15 +7,20 @@
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
-              <a-form-item label="鎺у埗灞炴�ц鍒橧D">
-                <a-input v-model="queryParam.controlRuleId" allow-clear placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒橧D"/>
+              <a-form-item label="鎺у埗灞炴�ц鍒欑紪鍙�">
+                <a-input v-model="queryParam.ruleCode" allow-clear placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙�"/>
               </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="璇疯緭鍏ユ渶浣庡簱瀛�"/>
@@ -104,7 +109,6 @@
     </a-card>
 	</div>
     <a-card :bordered="false">
-		<!-- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" -->
       <s-table
         ref="table"
         :columns="columns"
@@ -113,7 +117,7 @@
 		@changeTablePage="pageInfo = $event"
 		:scroll="{x: true,y:tableHeight}"
         :rowKey="(record) => record.id"
-        >
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
         <template class="table-operator" slot="operator" v-if="hasPerm('WmsControlRuleDetail:add')" >
 		<div ref="actionBar" class="actionBar">
 			<a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
@@ -193,24 +197,44 @@
 	customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
 	},
 	{
-	title: '鎺у埗灞炴�ц鍒橧D',
+	title: '鎺у埗灞炴�ц鍒欑紪鍙�',
 	align: 'center',
 	customHeaderCell: () => {
 	return {
 	 style: {
-	'min-width': '140px'//鏈�灏忓垪瀹借缃�
+	'min-width': '150px'//鏈�灏忓垪瀹借缃�
 	 }
 	 }
 	},
 	customCell: () => {
 	return {
 	style: {
-	'min-width': '140px'//鏈�灏忓垪瀹借缃�
+	'min-width': '150px'//鏈�灏忓垪瀹借缃�
 	}
 	}
 	},
 	sorter: true,
-	dataIndex: 'controlRuleId'
+	dataIndex: 'ruleCode'
+	},
+	{
+	title: '鎺у埗灞炴�ц鍒欏悕绉�',
+	align: 'center',
+	customHeaderCell: () => {
+	return {
+	 style: {
+	'min-width': '150px'//鏈�灏忓垪瀹借缃�
+	 }
+	 }
+	},
+	customCell: () => {
+	return {
+	style: {
+	'min-width': '150px'//鏈�灏忓垪瀹借缃�
+	}
+	}
+	},
+	sorter: true,
+	dataIndex: 'ruleName'
 	},
 	{
 	title: '鏈�楂樺簱瀛�',

--
Gitblit v1.9.3