From 4d59bb7ee1f03ff16a5bc7f81db165ff68b6f665 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 17 三月 2026 18:01:16 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材
---
src/views/basicData/parameterMaintenance/index.vue | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/src/views/basicData/parameterMaintenance/index.vue b/src/views/basicData/parameterMaintenance/index.vue
index 67ed7ef..4b2669e 100644
--- a/src/views/basicData/parameterMaintenance/index.vue
+++ b/src/views/basicData/parameterMaintenance/index.vue
@@ -31,10 +31,10 @@
:column="tableColumn"
:tableData="tableData"
:page="page"
- height="calc(100vh - 280px)"
+ height="calc(100vh - 320px)"
:tableLoading="tableLoading"
:isSelection="false"
- :isShowPagination="false"
+ :isShowPagination="true"
@pagination="pagination">
</PIMTable>
</div>
@@ -108,13 +108,6 @@
<el-option label="YYYY-MM-DD HH:mm:ss"
value="YYYY-MM-DD HH:mm:ss" />
</el-select>
- </el-form-item>
- <el-form-item label="鏄惁蹇呭～"
- prop="isRequired">
- <el-radio-group v-model="formData.isRequired">
- <el-radio label="1">鏄�</el-radio>
- <el-radio label="0">鍚�</el-radio>
- </el-radio-group>
</el-form-item>
<el-form-item label="澶囨敞"
prop="remark">
@@ -263,17 +256,6 @@
},
},
{
- label: "鏄惁蹇呭～",
- prop: "isRequired",
- dataType: "tag",
- formatType: params => {
- return params === 1 ? "danger" : "info";
- },
- formatData: val => {
- return val === 1 ? "鏄�" : "鍚�";
- },
- },
- {
label: "澶囨敞",
prop: "remark",
},
@@ -324,7 +306,6 @@
paramType: "",
valueMode: "1",
unit: "",
- isRequired: "0",
remark: "",
});
const rules = reactive({
@@ -461,12 +442,16 @@
const getList = () => {
tableLoading.value = true;
// 璋冪敤鏂版帴鍙� /baseParam/list
- getBaseParamList({ paramName: searchForm.paramName })
+ getBaseParamList({
+ paramName: searchForm.paramName,
+ current: page.current,
+ size: page.size,
+ })
.then(res => {
tableLoading.value = false;
if (res.code === 200) {
- tableData.value = res.data || [];
- page.total = res.data?.length || 0;
+ tableData.value = res.data?.records || [];
+ page.total = res.data?.total || 0;
} else {
ElMessage.error(res.msg || "鏌ヨ澶辫触");
}
@@ -496,7 +481,6 @@
formData.paramType = "";
formData.valueMode = "1";
formData.unit = "";
- formData.isRequired = "0";
formData.remark = "";
dialogVisible.value = true;
};
@@ -512,8 +496,6 @@
formData.valueMode =
row.valueMode !== undefined ? String(row.valueMode) : "1";
formData.unit = row.unit || "";
- formData.isRequired =
- row.isRequired !== undefined ? String(row.isRequired) : "0";
formData.remark = row.remark || "";
dialogVisible.value = true;
};
--
Gitblit v1.9.3