From a2f13185e18c274d80cadade406e2b47253b038a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 09 十月 2023 11:57:22 +0800
Subject: [PATCH] fix 修复 HeaderSearch组件跳转query参数丢失问题
---
src/views/system/dict/data.vue | 195 +++++++++++++++++++++---------------------------
1 files changed, 86 insertions(+), 109 deletions(-)
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 1bd7a8b..53ed0d2 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -12,11 +12,6 @@
<el-form-item label="瀛楀吀鏍囩" prop="dictLabel">
<el-input v-model="queryParams.dictLabel" placeholder="璇疯緭鍏ュ瓧鍏告爣绛�" clearable style="width: 200px" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="鏁版嵁鐘舵��" clearable style="width: 200px">
- <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
- </el-select>
- </el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
<el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
@@ -54,18 +49,12 @@
<el-table-column label="瀛楀吀缂栫爜" align="center" prop="dictCode" v-if="false" />
<el-table-column label="瀛楀吀鏍囩" align="center" prop="dictLabel">
<template #default="scope">
- <span v-if="scope.row.listClass === '' || scope.row.listClass === 'default'">{{ scope.row.dictLabel }}</span>
- <el-tag v-else :type="scope.row.listClass === 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel
- }}</el-tag>
+ <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
+ <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
</template>
</el-table-column>
<el-table-column label="瀛楀吀閿��" align="center" prop="dictValue" />
<el-table-column label="瀛楀吀鎺掑簭" align="center" prop="dictSort" />
- <el-table-column label="鐘舵��" align="center" prop="status">
- <template #default="scope">
- <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
- </template>
- </el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template #default="scope">
@@ -114,11 +103,6 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-radio-group v-model="form.status">
- <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
- </el-radio-group>
- </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</el-form-item>
@@ -141,7 +125,6 @@
import { DictDataForm, DictDataQuery, DictDataVO } from "@/api/system/dict/data/types";
const { proxy } = getCurrentInstance() as ComponentInternalInstance
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
const route = useRoute();
const dataList = ref<DictDataVO[]>([]);
@@ -159,154 +142,148 @@
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
// 鏁版嵁鏍囩鍥炴樉鏍峰紡
const listClassOptions = ref<Array<{ value: string, label: string }>>([
- { value: "default", label: "榛樿" },
- { value: "primary", label: "涓昏" },
- { value: "success", label: "鎴愬姛" },
- { value: "info", label: "淇℃伅" },
- { value: "warning", label: "璀﹀憡" },
- { value: "danger", label: "鍗遍櫓" }
+ { value: "default", label: "榛樿" },
+ { value: "primary", label: "涓昏" },
+ { value: "success", label: "鎴愬姛" },
+ { value: "info", label: "淇℃伅" },
+ { value: "warning", label: "璀﹀憡" },
+ { value: "danger", label: "鍗遍櫓" }
]);
const initFormData: DictDataForm = {
- dictCode: undefined,
- dictLabel: '',
- dictValue: '',
- cssClass: '',
- listClass: "default",
- dictSort: 0,
- status: "0",
- remark: ''
+ dictCode: undefined,
+ dictLabel: '',
+ dictValue: '',
+ cssClass: '',
+ listClass: "default",
+ dictSort: 0,
+ remark: ''
}
const data = reactive<PageData<DictDataForm, DictDataQuery>>({
- form: { ...initFormData },
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- dictName: '',
- dictType: '',
- status: '',
- dictLabel: ''
- },
- rules: {
- dictLabel: [{ required: true, message: "鏁版嵁鏍囩涓嶈兘涓虹┖", trigger: "blur" }],
- dictValue: [{ required: true, message: "鏁版嵁閿�间笉鑳戒负绌�", trigger: "blur" }],
- dictSort: [{ required: true, message: "鏁版嵁椤哄簭涓嶈兘涓虹┖", trigger: "blur" }]
- }
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ dictName: '',
+ dictType: '',
+ dictLabel: ''
+ },
+ rules: {
+ dictLabel: [{ required: true, message: "鏁版嵁鏍囩涓嶈兘涓虹┖", trigger: "blur" }],
+ dictValue: [{ required: true, message: "鏁版嵁閿�间笉鑳戒负绌�", trigger: "blur" }],
+ dictSort: [{ required: true, message: "鏁版嵁椤哄簭涓嶈兘涓虹┖", trigger: "blur" }]
+ }
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ瀛楀吀绫诲瀷璇︾粏 */
const getTypes = async (dictId: string | number) => {
- const { data } = await getType(dictId);
- queryParams.value.dictType = data.dictType;
- defaultDictType.value = data.dictType;
- getList();
+ const { data } = await getType(dictId);
+ queryParams.value.dictType = data.dictType;
+ defaultDictType.value = data.dictType;
+ getList();
}
/** 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 */
const getTypeList = async () => {
- const res = await getDictOptionselect()
- typeOptions.value = res.data;
+ const res = await getDictOptionselect()
+ typeOptions.value = res.data;
}
/** 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await listData(queryParams.value);
- dataList.value = res.rows;
- total.value = res.total;
- loading.value = false;
+ loading.value = true;
+ const res = await listData(queryParams.value);
+ dataList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- dialog.visible = false;
- reset();
+ dialog.visible = false;
+ reset();
}
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = { ...initFormData };
- dataFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ dataFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 杩斿洖鎸夐挳鎿嶄綔 */
const handleClose = () => {
- const obj = { path: "/system/dict" };
- proxy?.$tab.closeOpenPage(obj);
+ const obj = { path: "/system/dict" };
+ proxy?.$tab.closeOpenPage(obj);
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- queryParams.value.dictType = defaultDictType.value;
- handleQuery();
+ queryFormRef.value?.resetFields();
+ queryParams.value.dictType = defaultDictType.value;
+ handleQuery();
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
- dialog.visible = true;
- dialog.title = "娣诲姞瀛楀吀鏁版嵁";
- nextTick(() => {
- reset();
- form.value.dictType = queryParams.value.dictType;
- })
+ reset();
+ form.value.dictType = queryParams.value.dictType;
+ dialog.visible = true;
+ dialog.title = "娣诲姞瀛楀吀鏁版嵁";
}
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: DictDataVO[]) => {
- ids.value = selection.map(item => item.dictCode);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map(item => item.dictCode);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: DictDataVO) => {
- const dictCode = row?.dictCode || ids.value[0];
- dialog.visible = true;
- dialog.title = "淇敼瀛楀吀鏁版嵁";
- nextTick(async () => {
- const res = await getData(dictCode);
- reset();
- form.value = res.data;
- })
+const handleUpdate = async (row?: DictDataVO) => {
+ reset();
+ const dictCode = row?.dictCode || ids.value[0];
+ const res = await getData(dictCode);
+ Object.assign(form.value, res.data);
+ dialog.visible = true;
+ dialog.title = "淇敼瀛楀吀鏁版嵁";
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- dataFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- form.value.dictCode ? await updateData(form.value) : await addData(form.value);
- useDictStore().removeDict(queryParams.value.dictType);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- dialog.visible = false;
- await getList();
+ dataFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.dictCode ? await updateData(form.value) : await addData(form.value);
+ useDictStore().removeDict(queryParams.value.dictType);
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ await getList();
- }
- });
+ }
+ });
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: DictDataVO) => {
- const dictCodes = row?.dictCode || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栫爜涓�"' + dictCodes + '"鐨勬暟鎹」锛�');
- await delData(dictCodes);
- await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- useDictStore().removeDict(queryParams.value.dictType);
+ const dictCodes = row?.dictCode || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栫爜涓�"' + dictCodes + '"鐨勬暟鎹」锛�');
+ await delData(dictCodes);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ useDictStore().removeDict(queryParams.value.dictType);
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/dict/data/export", {
- ...queryParams.value
- }, `dict_data_${new Date().getTime()}.xlsx`);
+ proxy?.download("system/dict/data/export", {
+ ...queryParams.value
+ }, `dict_data_${new Date().getTime()}.xlsx`);
}
onMounted(() => {
- getTypes(route.params && route.params.dictId as string);
- getTypeList();
+ getTypes(route.params && route.params.dictId as string);
+ getTypeList();
})
</script>
--
Gitblit v1.9.3