|
@@ -57,7 +57,9 @@
|
|
</el-form>
|
|
</el-form>
|
|
<!-- 表格 -->
|
|
<!-- 表格 -->
|
|
<el-table
|
|
<el-table
|
|
- size="large"
|
|
|
|
|
|
+ tooltip-effect="dark"
|
|
|
|
+ ref="tableRef"
|
|
|
|
+ size="large"
|
|
:data="tableData"
|
|
:data="tableData"
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
:row-class-name="tableRowClassName"
|
|
:row-class-name="tableRowClassName"
|
|
@@ -79,6 +81,7 @@
|
|
v-for="column in columns"
|
|
v-for="column in columns"
|
|
:key="column.prop"
|
|
:key="column.prop"
|
|
:prop="column.prop"
|
|
:prop="column.prop"
|
|
|
|
+ show-overflow-tooltip
|
|
align="center"
|
|
align="center"
|
|
:label="column.label"
|
|
:label="column.label"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
@@ -136,7 +139,7 @@
|
|
</el-upload>
|
|
</el-upload>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item
|
|
<el-form-item
|
|
- :label="dialogData.title == '' ? '分组' : '修改分组'"
|
|
|
|
|
|
+ :label="dialogData.title == '上传' ? '分组' : '修改分组'"
|
|
:label-width="formLabelWidth"
|
|
:label-width="formLabelWidth"
|
|
>
|
|
>
|
|
<el-select style="width: 180px" v-model="addForm.dictId" placeholder="请选择分组">
|
|
<el-select style="width: 180px" v-model="addForm.dictId" placeholder="请选择分组">
|
|
@@ -182,15 +185,15 @@
|
|
<el-dialog v-model="dialogData.fzshow" title="分组管理" width="500">
|
|
<el-dialog v-model="dialogData.fzshow" title="分组管理" width="500">
|
|
<el-form :model="form" label-width="50">
|
|
<el-form :model="form" label-width="50">
|
|
<el-form-item label="分组" :label-width="formLabelWidth">
|
|
<el-form-item label="分组" :label-width="formLabelWidth">
|
|
- <el-input v-model="dialogData.fzName" style="width: 300px;" />
|
|
|
|
|
|
+ <el-input v-model="dialogData.fzName" maxLength="100" style="width: 300px;" />
|
|
<el-button style="margin-left: 20px" @click="handlefzAdd" type="primary">新增</el-button>
|
|
<el-button style="margin-left: 20px" @click="handlefzAdd" type="primary">新增</el-button>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<div class="itemTitle">
|
|
<div class="itemTitle">
|
|
<p>分组列表</p>
|
|
<p>分组列表</p>
|
|
<div class="itemTitleList">
|
|
<div class="itemTitleList">
|
|
<div class="itemTitle-list" v-for="(item, index) in dictIdList" :key="index">
|
|
<div class="itemTitle-list" v-for="(item, index) in dictIdList" :key="index">
|
|
- <span>{{ item.dictName }}</span>
|
|
|
|
- <span @click="hanleFzDle(item)">删除</span>
|
|
|
|
|
|
+ <span class="name">{{ item.dictName }}</span>
|
|
|
|
+ <span class="del" @click="hanleFzDle(item)">删除</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -198,7 +201,7 @@
|
|
<template #footer>
|
|
<template #footer>
|
|
<div class="dialog-footer">
|
|
<div class="dialog-footer">
|
|
<el-button @click="dialogData.fzshow = false">取消</el-button>
|
|
<el-button @click="dialogData.fzshow = false">取消</el-button>
|
|
- <el-button type="primary" @click="handleuploadAdd">
|
|
|
|
|
|
+ <el-button type="primary" @click="dialogData.fzshow = false">
|
|
确定
|
|
确定
|
|
</el-button>
|
|
</el-button>
|
|
</div>
|
|
</div>
|
|
@@ -210,7 +213,7 @@
|
|
<script setup>
|
|
<script setup>
|
|
import { Search } from "@element-plus/icons-vue";
|
|
import { Search } from "@element-plus/icons-vue";
|
|
import { ref, watch, onMounted } from "vue";
|
|
import { ref, watch, onMounted } from "vue";
|
|
-import { getByKeyList, getfzdel, getdictFiledel, getaddOrUpdate } from "@/store/case";
|
|
|
|
|
|
+import { getByKeyList, getfzdel, getdictFiledel, getaddOrUpdate, setFileaddOrUpdate, uploadFile } from "@/store/case";
|
|
import dayjs from "dayjs";
|
|
import dayjs from "dayjs";
|
|
import obj from "@/assets/images/obj.jpg";
|
|
import obj from "@/assets/images/obj.jpg";
|
|
import osgb from "@/assets/images/osgb.jpg";
|
|
import osgb from "@/assets/images/osgb.jpg";
|
|
@@ -286,6 +289,8 @@ const removeFile = () => {
|
|
};
|
|
};
|
|
const handleAdd = () => {
|
|
const handleAdd = () => {
|
|
addForm.value.dictId = '';
|
|
addForm.value.dictId = '';
|
|
|
|
+ addForm.value.dictId = '';
|
|
|
|
+ fileList.value = [];
|
|
dialogData.value = {
|
|
dialogData.value = {
|
|
show: true,
|
|
show: true,
|
|
title: "上传",
|
|
title: "上传",
|
|
@@ -310,11 +315,35 @@ const handleAddfz = () => {
|
|
dialogData.value.fzshow = true;
|
|
dialogData.value.fzshow = true;
|
|
};
|
|
};
|
|
|
|
|
|
-const handleuploadAdd = () => {
|
|
|
|
- if (file.value) {
|
|
|
|
|
|
+const handleuploadAdd = async () => {
|
|
|
|
+ console.log('formData', dialogData.value.title);
|
|
|
|
+ if (dialogData.value.title != '上传'){
|
|
|
|
+ await setFileaddOrUpdate({
|
|
|
|
+ id: dialogData.value.data?.id,
|
|
|
|
+ dictId: addForm.value.dictId,
|
|
|
|
+ })
|
|
|
|
+ initData();
|
|
|
|
+ dialogData.value.show = false
|
|
|
|
+ dialogData.value.title = ''
|
|
|
|
+ ElMessage({
|
|
|
|
+ type: "success",
|
|
|
|
+ message: "操作成功",
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
const formData = new FormData();
|
|
const formData = new FormData();
|
|
- formData.append("file", file.value);
|
|
|
|
|
|
+ formData.append("file", URL.createObjectURL(fileList.value && fileList.value[0]));
|
|
formData.append("dictId", addForm.value.dictId);
|
|
formData.append("dictId", addForm.value.dictId);
|
|
|
|
+ uploadFile(formData).then((res) => {
|
|
|
|
+ console.log(res);
|
|
|
|
+ if (res) {
|
|
|
|
+ initData();
|
|
|
|
+ dialogData.value.show = false;
|
|
|
|
+ ElMessage({
|
|
|
|
+ type: "success",
|
|
|
|
+ message: "上传成功",
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ });
|
|
console.log(formData);
|
|
console.log(formData);
|
|
}
|
|
}
|
|
};
|
|
};
|
|
@@ -541,6 +570,18 @@ initData();
|
|
line-height: 30px;
|
|
line-height: 30px;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
|
|
+ position: relative;
|
|
|
|
+ cursor: pointer;
|
|
|
|
+ .name{
|
|
|
|
+ width: 350px;
|
|
|
|
+ overflow: hidden; //超出的文本隐藏
|
|
|
|
+ text-overflow: ellipsis; //溢出用省略号显示
|
|
|
|
+ white-space: nowrap; //溢出不换行
|
|
|
|
+ }
|
|
|
|
+ .del{
|
|
|
|
+ color: red;
|
|
|
|
+ cursor: pointer;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|