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

gaoluyang

2025-05-26 10d4c82e729694bd49a29f589d607690dc4b71f8

 src/views/system/dict/index.vue

@@ -6,7 +6,6 @@
               v-model="queryParams.dictName"

               placeholder="请输入字典名称"

               clearable

               size="small"

               style="width: 240px"

               @keyup.enter="handleQuery"

            />

@@ -16,7 +15,6 @@
               v-model="queryParams.dictType"

               placeholder="请输入字典类型"

               clearable

               size="small"

               style="width: 240px"

               @keyup.enter="handleQuery"

            />

@@ -26,7 +24,6 @@
               v-model="queryParams.status"

               placeholder="字典状态"

               clearable

               size="small"

               style="width: 240px"

            >

               <el-option

@@ -37,11 +34,9 @@
               />

            </el-select>

         </el-form-item>

         <el-form-item label="创建时间">

         <el-form-item label="创建时间" style="width: 308px">

            <el-date-picker

               v-model="dateRange"

               size="small"

               style="width: 240px"

               value-format="YYYY-MM-DD"

               type="daterange"

               range-separator="-"

@@ -50,8 +45,8 @@
            ></el-date-picker>

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



@@ -61,7 +56,6 @@
               type="primary"

               plain

               icon="Plus"

               size="mini"

               @click="handleAdd"

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

            >新增</el-button>

@@ -71,7 +65,6 @@
               type="success"

               plain

               icon="Edit"

               size="mini"

               :disabled="single"

               @click="handleUpdate"

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

@@ -82,7 +75,6 @@
               type="danger"

               plain

               icon="Delete"

               size="mini"

               :disabled="multiple"

               @click="handleDelete"

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

@@ -93,7 +85,6 @@
               type="warning"

               plain

               icon="Download"

               size="mini"

               @click="handleExport"

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

            >导出</el-button>

@@ -103,7 +94,6 @@
               type="danger"

               plain

               icon="Refresh"

               size="mini"

               @click="handleRefreshCache"

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

            >刷新缓存</el-button>

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

            </template>

         </el-table-column>

         <el-table-column label="操作" align="center" 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>

@@ -175,7 +153,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>

@@ -194,21 +172,22 @@
</template>



<script setup name="Dict">

import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";

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

import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"



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 typeList = 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 dateRange = ref([]);

const typeList = 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 dateRange = ref([])



const data = reactive({

  form: {},

@@ -223,24 +202,26 @@
    dictName: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],

    dictType: [{ required: true, message: "字典类型不能为空", trigger: "blur" }]

  },

});

})



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

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



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

function getList() {

  loading.value = true;

  loading.value = true

  listType(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {

    typeList.value = response.rows;

    total.value = response.total;

    loading.value = false;

  });

    typeList.value = response.rows

    total.value = response.total

    loading.value = false

  })

}



/** 取消按钮 */

function cancel() {

  open.value = false;

  reset();

  open.value = false

  reset()

}



/** 表单重置 */

function reset() {

  form.value = {

@@ -249,84 +230,94 @@
    dictType: undefined,

    status: "0",

    remark: undefined

  };

  proxy.resetForm("dictRef");

  }

  proxy.resetForm("dictRef")

}



/** 搜索按钮操作 */

function handleQuery() {

  queryParams.value.pageNum = 1;

  getList();

  queryParams.value.pageNum = 1

  getList()

}



/** 重置按钮操作 */

function resetQuery() {

  dateRange.value = [];

  proxy.resetForm("queryRef");

  handleQuery();

  dateRange.value = []

  proxy.resetForm("queryRef")

  handleQuery()

}



/** 新增按钮操作 */

function handleAdd() {

  reset();

  open.value = true;

  title.value = "添加字典类型";

  reset()

  open.value = true

  title.value = "添加字典类型"

}



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

function handleSelectionChange(selection) {

  ids.value = selection.map(item => item.dictId);

  single.value = selection.length != 1;

  multiple.value = !selection.length;

  ids.value = selection.map(item => item.dictId)

  single.value = selection.length != 1

  multiple.value = !selection.length

}



/** 修改按钮操作 */

function handleUpdate(row) {

  reset();

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

  reset()

  const dictId = row.dictId || ids.value

  getType(dictId).then(response => {

    form.value = response.data;

    open.value = true;

    title.value = "修改字典类型";

  });

    form.value = response.data

    open.value = true

    title.value = "修改字典类型"

  })

}



/** 提交按钮 */

function submitForm() {

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

    if (valid) {

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

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

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

          open.value = false;

          getList();

        });

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

          open.value = false

          getList()

        })

      } else {

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

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

          open.value = false;

          getList();

        });

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

          open.value = false

          getList()

        })

      }

    }

  });

  })

}



/** 删除按钮操作 */

function handleDelete(row) {

  const dictIds = row.dictId || ids.value;

  const dictIds = row.dictId || ids.value

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

    return delType(dictIds);

    return delType(dictIds)

  }).then(() => {

    getList();

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

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

    getList()

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

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

}



/** 导出按钮操作 */

function handleExport() {

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

    ...queryParams.value

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

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

}



/** 刷新缓存按钮操作 */

function handleRefreshCache() {

  refreshCache().then(() => {

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

  });

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

    useDictStore().cleanDict()

  })

}



getList();

getList()

</script>