From cce0383f11f69f818093b1faf7ffab96a47d132a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 12 五月 2025 18:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 1 +
UI-Project/src/lang/py.js | 1 +
UI-Project/src/lang/zh.js | 1 +
UI-Project/src/router/index.js | 2 +-
UI-Project/src/views/User/userpageNo.vue | 45 +++++++++++++++++++++++++++++----------------
5 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 9c7b146..ec50530 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -401,6 +401,7 @@
},
productStock: {
configName: 'configure name',
+ configNamea:'configure name锛�',
configCode: 'Configuration Code',
configValue: 'Configuration value',
addusers: 'Add user',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index ef35afe..b10e566 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -400,6 +400,7 @@
},
productStock: {
configName:'閰嶇疆鍚�',
+ configNamea:'閰嶇疆鍚嶏細',
configCode:'閰嶇疆浠ｇ爜',
configValue:'閰嶇疆鍊�',
addusers: '袛芯斜邪胁褜褌械 锌芯谢褜蟹芯胁邪褌械谢械泄.',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 1453cf1..762e03b 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -402,6 +402,7 @@
addconfigName:'娣诲姞閰嶇疆',
editconfigName:'淇敼閰嶇疆',
configName:'閰嶇疆鍚�',
+ configNamea:'閰嶇疆鍚嶏細',
configCode:'閰嶇疆浠ｇ爜',
configValue:'閰嶇疆鍊�',
configValuea:'閰嶇疆鍊硷細',
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index cdc1ffb..64d7215 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -54,7 +54,7 @@
path: '/Returns/upreturns2',
name: 'upreturns2',
component: () => import('../views/Returns/upreturns2.vue')
- },
+ }
]
},
/*----------- 鎺扮墖/璇嗗埆 ----------------*/
diff --git a/UI-Project/src/views/User/userpageNo.vue b/UI-Project/src/views/User/userpageNo.vue
index 63f5b2a..1ef997c 100644
--- a/UI-Project/src/views/User/userpageNo.vue
+++ b/UI-Project/src/views/User/userpageNo.vue
@@ -12,12 +12,16 @@
let language = ref(localStorage.getItem('lang') || 'zh')
const selectedProjectNoa = ref(null);
const configName = ref('');
+const configNamesearch = ref('');
const configCode = ref('');
+const configCodesearch = ref('');
const tableData = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
const configValue = ref('')
const isEnable = ref('')
+const configValuesearch = ref('')
+const isEnablesearch = ref('')
const listByUserName = async () => {
try {
const response = await request.post('/loadGlass/sys/sysConfig/queryConfigPage',{
@@ -34,8 +38,8 @@
formattedCreateTime: formatTimestamp(record.createTime),
formattedUpdateTime: formatTimestamp(record.updateTime),
}));
- tableData.value = formattedData;
- totalRecords.value = response.data.total/2 || 0
+ tableData.value = formattedData;
+ totalRecords.value = response.data.pages*10
} else {
ElMessage.warning(response.data);
}
@@ -50,11 +54,10 @@
const response = await request.post('/loadGlass/sys/sysConfig/queryConfigPage',{
pageNo: 1,
pageSize: 10,
- configName: configName.value,
- configCode: configCode.value,
- configValue: configValue.value,
- // isEnable: isEnable.value
- isEnable: isEnable.value !== '' ? isEnable.value : -1,
+ configName: configNamesearch.value,
+ configCode: configCodesearch.value,
+ configValue: configValuesearch.value,
+ isEnable: isEnablesearch.value !== '' ? isEnablesearch.value : -1,
});
if (response.code === 200) {
@@ -63,8 +66,8 @@
formattedCreateTime: formatTimestamp(record.createTime),
formattedUpdateTime: formatTimestamp(record.updateTime),
}));
- tableData.value = formattedData;
- totalRecords.value = response.data.total/2 || 0
+ tableData.value = formattedData;
+ totalRecords.value = response.data.pages*10
} else {
ElMessage.warning(response.data);
}
@@ -93,8 +96,8 @@
formattedCreateTime: formatTimestamp(record.createTime),
formattedUpdateTime: formatTimestamp(record.updateTime),
}));
- tableData.value = formattedData;
- totalRecords.value = response.data.total/2 || 0
+ tableData.value = formattedData;
+ totalRecords.value = response.data.pages*10
} else {
ElMessage.warning(response.data);
}
@@ -106,6 +109,7 @@
adda.value = true;
configValue.value = row.configValue
isEnable.value = row.isEnable
+ configName.value = row.configName
window.localStorage.setItem('id', row.id)
window.localStorage.setItem('configName', row.configName)
window.localStorage.setItem('configCode', row.configCode)
@@ -161,10 +165,10 @@
<div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="display: flex;width: 1770px;">
- <el-input v-model="configName" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('productStock.configName')" />
- <el-input v-model="configCode" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputa" :placeholder="$t('productStock.configCode')" />
- <el-input v-model="configValue" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputb" :placeholder="$t('productStock.configValue')" />
- <el-select v-model="isEnable" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('sorter.startstatus')">
+ <el-input v-model="configNamesearch" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('productStock.configName')" />
+ <el-input v-model="configCodesearch" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputa" :placeholder="$t('productStock.configCode')" />
+ <el-input v-model="configValuesearch" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputb" :placeholder="$t('productStock.configValue')" />
+ <el-select v-model="isEnablesearch" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('sorter.startstatus')">
<el-option :label="$t('sorter.start')" value="1"></el-option>
<el-option :label="$t('sorter.disable')" value="0"></el-option>
</el-select>
@@ -212,7 +216,7 @@
</div>
</el-card>
</div>
- <el-dialog v-model="adda" top="23vh" width="37%" :title="$t('productStock.reusername')" >
+ <el-dialog v-model="adda" top="23vh" width="37%" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
<el-form ref="formRef" label-width="150px">
<el-form label-width="120px" label-position="right">
@@ -220,6 +224,15 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
+ <el-form-item :label="$t('productStock.configNamea')" :required="true" style="width: 25vw">
+ <el-input :placeholder="$t('productStock.configName')" disabled v-model="configName" autocomplete="off" style="width: 350px;"/>
+ </el-form-item></div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;margin-bottom: -2px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
<el-form-item :label="$t('productStock.configValuea')" :required="true" style="width: 25vw">
<el-input :placeholder="$t('productStock.configValue')" v-model="configValue" autocomplete="off" style="width: 350px;"/>
</el-form-item></div></div>
--
Gitblit v1.8.0