Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-05-26 10d4c82e729694bd49a29f589d607690dc4b71f8

 src/views/system/dict/data.vue

@@ -1,8 +1,8 @@
<template>

   <div class="app-container">

      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">

      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">

         <el-form-item label="字典名称" prop="dictType">

            <el-select v-model="queryParams.dictType" size="small">

            <el-select v-model="queryParams.dictType" style="width: 200px">

               <el-option

                  v-for="item in typeOptions"

                  :key="item.dictId"

@@ -16,12 +16,12 @@
               v-model="queryParams.dictLabel"

               placeholder="请输入字典标签"

               clearable

               size="small"

               style="width: 200px"

               @keyup.enter="handleQuery"

            />

         </el-form-item>

         <el-form-item label="状态" prop="status">

            <el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small">

            <el-select v-model="queryParams.status" placeholder="数据状态" clearable style="width: 200px">

               <el-option

                  v-for="dict in sys_normal_disable"

                  :key="dict.value"

@@ -31,8 +31,8 @@
            </el-select>

         </el-form-item>

         <el-form-item>

            <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>

            <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>

            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>

            <el-button icon="Refresh" @click="resetQuery">重置</el-button>

         </el-form-item>

      </el-form>



@@ -42,7 +42,6 @@
               type="primary"

               plain

               icon="Plus"

               size="mini"

               @click="handleAdd"

               v-hasPermi="['system:dict:add']"

            >新增</el-button>

@@ -52,7 +51,6 @@
               type="success"

               plain

               icon="Edit"

               size="mini"

               :disabled="single"

               @click="handleUpdate"

               v-hasPermi="['system:dict:edit']"

@@ -63,7 +61,6 @@
               type="danger"

               plain

               icon="Delete"

               size="mini"

               :disabled="multiple"

               @click="handleDelete"

               v-hasPermi="['system:dict:remove']"

@@ -74,7 +71,6 @@
               type="warning"

               plain

               icon="Download"

               size="mini"

               @click="handleExport"

               v-hasPermi="['system:dict:export']"

            >导出</el-button>

@@ -84,7 +80,6 @@
               type="warning"

               plain

               icon="Close"

               size="mini"

               @click="handleClose"

            >关闭</el-button>

         </el-col>

@@ -96,8 +91,8 @@
         <el-table-column label="字典编码" align="center" prop="dictCode" />

         <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" />

@@ -113,22 +108,10 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>

            </template>

         </el-table-column>

         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">

         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">

            <template #default="scope">

               <el-button

                  size="mini"

                  type="text"

                  icon="Edit"

                  @click="handleUpdate(scope.row)"

                  v-hasPermi="['system:dict:edit']"

               >修改</el-button>

               <el-button

                  size="mini"

                  type="text"

                  icon="Delete"

                  @click="handleDelete(scope.row)"

                  v-hasPermi="['system:dict:remove']"

               >删除</el-button>

               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">修改</el-button>

               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>

            </template>

         </el-table-column>

      </el-table>

@@ -164,7 +147,7 @@
                  <el-option

                     v-for="item in listClassOptions"

                     :key="item.value"

                     :label="item.label"

                     :label="item.label + '(' + item.value + ')'"

                     :value="item.value"

                  ></el-option>

               </el-select>

@@ -174,7 +157,7 @@
                  <el-radio

                     v-for="dict in sys_normal_disable"

                     :key="dict.value"

                     :label="dict.value"

                     :value="dict.value"

                  >{{ dict.label }}</el-radio>

               </el-radio-group>

            </el-form-item>

@@ -193,24 +176,25 @@
</template>



<script setup name="Data">

import { listType, getType } from "@/api/system/dict/type";

import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";

import useDictStore from '@/store/modules/dict'

import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type"

import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data"



const { proxy } = getCurrentInstance();

const { sys_normal_disable } = proxy.useDict("sys_normal_disable");

const { proxy } = getCurrentInstance()

const { sys_normal_disable } = proxy.useDict("sys_normal_disable")



const dataList = ref([]);

const open = ref(false);

const loading = ref(true);

const showSearch = ref(true);

const ids = ref([]);

const single = ref(true);

const multiple = ref(true);

const total = ref(0);

const title = ref("");

const defaultDictType = ref("");

const typeOptions = ref([]);

const route = useRoute();

const dataList = ref([])

const open = ref(false)

const loading = ref(true)

const showSearch = ref(true)

const ids = ref([])

const single = ref(true)

const multiple = ref(true)

const total = ref(0)

const title = ref("")

const defaultDictType = ref("")

const typeOptions = ref([])

const route = useRoute()

// 数据标签回显样式

const listClassOptions = ref([

  { value: "default", label: "默认" }, 

@@ -219,15 +203,15 @@
  { value: "info", label: "信息" },

  { value: "warning", label: "警告" },

  { value: "danger", label: "危险" }

]);

])



const data = reactive({

  form: {},

  queryParams: {

    pageNum: 1,

    pageSize: 10,

    dictName: undefined,

    dictType: undefined,

    dictLabel: undefined,

    status: undefined

  },

  rules: {

@@ -235,39 +219,42 @@
    dictValue: [{ required: true, message: "数据键值不能为空", trigger: "blur" }],

    dictSort: [{ required: true, message: "数据顺序不能为空", trigger: "blur" }]

  }

});

})



const { queryParams, form, rules } = toRefs(data);

const { queryParams, form, rules } = toRefs(data)



/** 查询字典类型详细 */

function getTypes(dictId) {

  getType(dictId).then(response => {

    queryParams.value.dictType = response.data.dictType;

    defaultDictType.value = response.data.dictType;

    getList();

  });

    queryParams.value.dictType = response.data.dictType

    defaultDictType.value = response.data.dictType

    getList()

  })

}



/** 查询字典类型列表 */

function getTypeList() {

  listType().then(response => {

    typeOptions.value = response.rows;

  });

  getDictOptionselect().then(response => {

    typeOptions.value = response.data

  })

}



/** 查询字典数据列表 */

function getList() {

  loading.value = true;

  loading.value = true

  listData(queryParams.value).then(response => {

    dataList.value = response.rows;

    total.value = response.total;

    loading.value = false;

  });

    dataList.value = response.rows

    total.value = response.total

    loading.value = false

  })

}



/** 取消按钮 */

function cancel() {

  open.value = false;

  reset();

  open.value = false

  reset()

}



/** 表单重置 */

function reset() {

  form.value = {

@@ -279,85 +266,97 @@
    dictSort: 0,

    status: "0",

    remark: undefined

  };

  proxy.resetForm("dataRef");

  }

  proxy.resetForm("dataRef")

}



/** 搜索按钮操作 */

function handleQuery() {

  queryParams.value.pageNum = 1;

  getList();

  queryParams.value.pageNum = 1

  getList()

}



/** 返回按钮操作 */

function handleClose() {

  const obj = { path: "/system/dict" };

  proxy.$tab.closeOpenPage(obj);

  const obj = { path: "/system/dict" }

  proxy.$tab.closeOpenPage(obj)

}



/** 重置按钮操作 */

function resetQuery() {

  proxy.resetForm("queryRef");

  queryParams.value.dictType = defaultDictType;

  handleQuery();

  proxy.resetForm("queryRef")

  queryParams.value.dictType = defaultDictType.value

  handleQuery()

}



/** 新增按钮操作 */

function handleAdd() {

  reset();

  open.value = true;

  title.value = "添加字典数据";

  form.value.dictType = queryParams.value.dictType;

  reset()

  open.value = true

  title.value = "添加字典数据"

  form.value.dictType = queryParams.value.dictType

}



/** 多选框选中数据 */

function handleSelectionChange(selection) {

  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

}



/** 修改按钮操作 */

function handleUpdate(row) {

  reset();

  const dictCode = row.dictCode || ids.value;

  reset()

  const dictCode = row.dictCode || ids.value

  getData(dictCode).then(response => {

    form.value = response.data;

    open.value = true;

    title.value = "修改字典数据";

  });

    form.value = response.data

    open.value = true

    title.value = "修改字典数据"

  })

}



/** 提交按钮 */

function submitForm() {

  proxy.$refs["dataRef"].validate(valid => {

    if (valid) {

      if (form.value.dictCode != undefined) {

        updateData(form.value).then(response => {

          proxy.$modal.msgSuccess("修改成功");

          open.value = false;

          getList();

        });

          useDictStore().removeDict(queryParams.value.dictType)

          proxy.$modal.msgSuccess("修改成功")

          open.value = false

          getList()

        })

      } else {

        addData(form.value).then(response => {

          proxy.$modal.msgSuccess("新增成功");

          open.value = false;

          getList();

        });

          useDictStore().removeDict(queryParams.value.dictType)

          proxy.$modal.msgSuccess("新增成功")

          open.value = false

          getList()

        })

      }

    }

  });

  })

}



/** 删除按钮操作 */

function handleDelete(row) {

  const dictCodes = row.dictCode || ids.value;

  const dictCodes = row.dictCode || ids.value

  proxy.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {

    return delData(dictCodes);

    return delData(dictCodes)

  }).then(() => {

    getList();

    proxy.$modal.msgSuccess("删除成功");

  }).catch(() => {});

    getList()

    proxy.$modal.msgSuccess("删除成功")

    useDictStore().removeDict(queryParams.value.dictType)

  }).catch(() => {})

}



/** 导出按钮操作 */

function handleExport() {

  proxy.download("system/dict/data/export", {

    ...queryParams.value

  }, `dict_data_${new Date().getTime()}.xlsx`);

  }, `dict_data_${new Date().getTime()}.xlsx`)

}



getTypes(route.params && route.params.dictId);

getTypeList();

getTypes(route.params && route.params.dictId)

getTypeList()

</script>