From d6883f7f2dc6f60b4378b6c4d456750de7084c77 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:53:57 +0800
Subject: [PATCH] 修改

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue |   76 ++++++++++++++++++++++---------------
 1 files changed, 45 insertions(+), 31 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 d764dad..1caab29 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')">
@@ -66,7 +66,7 @@
                   </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>
@@ -84,7 +84,7 @@
     </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"
+        :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">
@@ -109,28 +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="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>
           &nbsp;&nbsp;
           </a-popconfirm>
         </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>
@@ -144,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 {
@@ -189,7 +183,7 @@
           customCell: () => {
             return {
               style: {
-                'min-width': '120px'//鏈�灏忓垪瀹借缃�
+                'min-width': '150px'//鏈�灏忓垪瀹借缃�
               }
             }
           },
@@ -197,6 +191,26 @@
           dataIndex: 'ruleCode'
         },
         {
+          title: '鎺у埗灞炴�ц鍒欏悕绉�',
+          align: 'center',
+          customHeaderCell: () => {
+            return {
+              style: {
+                'min-width': '150px'//鏈�灏忓垪瀹借缃�
+              }
+            }
+          },
+          customCell: () => {
+            return {
+              style: {
+                'min-width': '150px'//鏈�灏忓垪瀹借缃�
+              }
+            }
+          },
+          sorter: true,
+          dataIndex: 'ruleName'
+        },
+        {
           title: '鏈�楂樺簱瀛�',
           align: 'center',
           customHeaderCell: () => {

--
Gitblit v1.9.3