From 872362acd0e306bb2150d72cce1b556d272e6ba5 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 25 六月 2025 10:01:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/baseTools/BaseToolsListRight.vue | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index 61d747a..78201e1 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false">
+ <a-card :bordered="false" style="flex: 1;overflow:auto;max-height: 600px; min-height: 600px">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -206,8 +206,8 @@
/* 鍒嗛〉鍙傛暟 */
ipagination:{
current: 1,
- pageSize: 10,
- pageSizeOptions: ['10', '20', '50'],
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '30'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
},
@@ -482,50 +482,32 @@
this.$refs.paraCommonToolModal.edit(record);
this.$refs.paraCommonToolModal.title="璇︽儏";
this.$refs.paraCommonToolModal.disableSubmit = true;
- this.$refs.paraCommonToolModal.disSeach = true;
- if(this.$refs.paraCommonToolModal.removeValidate) {
- this.$refs.paraCommonToolModal.removeValidate()
- }
+
}else if(record.paramaTableName === "2"){
this.$refs.paraHoleToolsModal.edit(record);
this.$refs.paraHoleToolsModal.title="璇︽儏";
this.$refs.paraHoleToolsModal.disableSubmit = true;
- this.$refs.paraHoleToolsModal.disSeach = true;
- if(this.$refs.paraHoleToolsModal.removeValidate) {
- this.$refs.paraHoleToolsModal.removeValidate()
- }
+
}else if(record.paramaTableName === "3"){
this.$refs.paraThreadingToolModal.edit(record);
this.$refs.paraThreadingToolModal.title="璇︽儏";
this.$refs.paraThreadingToolModal.disableSubmit = true;
- this.$refs.paraThreadingToolModal.disSeach = true;
- if(this.$refs.paraThreadingToolModal.removeValidate) {
- this.$refs.paraThreadingToolModal.removeValidate()
- }
+
}else if(record.paramaTableName === "4"){
this.$refs.paraMillToolModal.edit(record);
this.$refs.paraMillToolModal.title="璇︽儏";
this.$refs.paraMillToolModal.disableSubmit = true;
- this.$refs.paraMillToolModal.disSeach = true;
- if(this.$refs.paraMillToolModal.removeValidate) {
- this.$refs.paraMillToolModal.removeValidate()
- }
+
}else if(record.paramaTableName === "5"){
this.$refs.paraTurningToolsModal.edit(record);
this.$refs.paraTurningToolsModal.title="璇︽儏";
this.$refs.paraTurningToolsModal.disableSubmit = true;
- this.$refs.paraTurningToolsModal.disSeach = true;
- if(this.$refs.paraTurningToolsModal.removeValidate) {
- this.$refs.paraTurningToolsModal.removeValidate()
- }
+
}else if(record.paramaTableName === "6"){
this.$refs.paraBladeModal.edit(record);
this.$refs.paraBladeModal.title="璇︽儏";
this.$refs.paraBladeModal.disableSubmit = true;
- this.$refs.paraBladeModal.disSeach = true;
- if(this.$refs.paraBladeModal.removeValidate) {
- this.$refs.paraBladeModal.removeValidate()
- }
+
}
},
//绂佺敤鐘舵�佹牱寮�
@@ -567,7 +549,7 @@
this.selectedRowKeys[0] = res.result.records[0].id
this.onSelectChange(this.selectedRowKeys)
} else {
- this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
+ //this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
this.ipagination.total = 0
}
})
@@ -575,7 +557,7 @@
this.loading = false;
});
} else {
- this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
+ //this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
}
},
onClearSelected() {
--
Gitblit v1.9.3