Commit 8a72c861 authored by 何远江's avatar 何远江

添加显示字段,查询条件

parent 80452a41
...@@ -2,11 +2,23 @@ ...@@ -2,11 +2,23 @@
<div class="w-full h-full bg-white p-4"> <div class="w-full h-full bg-white p-4">
<p class="font-bold text-lg leading-10 border-b-2">变量文件管理</p> <p class="font-bold text-lg leading-10 border-b-2">变量文件管理</p>
<el-form class="pt-4" :inline="true" :model="formState"> <el-form class="pt-4" :inline="true" :model="formState">
<el-form-item label="原始文件地址"> <el-form-item label="变量文件ID">
<el-input v-model="formState.filePath" placeholder="" clearable /> <el-input v-model="formState.varFileId" placeholder="" clearable />
</el-form-item> </el-form-item>
<el-form-item label="标注文件地址"> <el-form-item label="创建人">
<el-input v-model="formState.mergeFilePath" placeholder="" clearable /> <el-input v-model="formState.createby_dict" placeholder="">
<template #append>
<el-button :icon="MoreFilled" @click="visibleUserModal = true"></el-button>
</template>
</el-input>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="formState.createTime"
type="daterange"
value-format="YYYY-MM-DD"
placeholder=""
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -16,7 +28,9 @@ ...@@ -16,7 +28,9 @@
</el-form> </el-form>
<div class=""> <div class="">
<p class='text-red-600 text-sm mb-2'>tip:必须通过产品编码进行过滤.如果没有,则需要手动添加一列编码;否则不会进行数据过滤</p> <p class="text-red-600 text-sm mb-2">
tip:必须通过产品编码进行过滤.如果没有,则需要手动添加一列编码;否则不会进行数据过滤
</p>
<vxe-table <vxe-table
ref="xTable" ref="xTable"
size="small" size="small"
...@@ -41,9 +55,11 @@ ...@@ -41,9 +55,11 @@
</vxe-column> </vxe-column>
<vxe-column title="标注文件地址" min-width="300"> <vxe-column title="标注文件地址" min-width="300">
<template #default="{ row }"> <template #default="{ row }">
<el-link target="_blank" :href="'/preview-excel?fileId=' + row.varFileId + '&type=var'">{{ <el-link
row.mergeFilePath target="_blank"
}}</el-link> :href="'/preview-excel?fileId=' + row.varFileId + '&type=var'"
>{{ row.mergeFilePath }}</el-link
>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="createTime" title="创建时间" width="180"></vxe-column> <vxe-column field="createTime" title="创建时间" width="180"></vxe-column>
...@@ -71,6 +87,7 @@ ...@@ -71,6 +87,7 @@
> >
</vxe-pager> </vxe-pager>
</div> </div>
<UserModal v-model:visible="visibleUserModal" @confirm="confirmUser" />
</div> </div>
</template> </template>
...@@ -81,29 +98,44 @@ import { ElMessage } from 'element-plus' ...@@ -81,29 +98,44 @@ import { ElMessage } from 'element-plus'
import type { VxeTableInstance } from 'vxe-table' import type { VxeTableInstance } from 'vxe-table'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { queryParamsFilter } from '@/utils/query' import { queryParamsFilter } from '@/utils/query'
import { MoreFilled } from '@element-plus/icons-vue'
import UserModal from '@/components/UserModal/UserModal.vue'
const router = useRouter() const router = useRouter()
const loading = ref(false) const loading = ref(false)
const formState = reactive({ const formState = reactive({
filePath: '', varFileId: '',
mergeFilePath: '', createBy: '',
createby_dict: '',
createTime: null,
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0
// column: 'createTime', // column: 'createTime',
// order: 'desc' // order: 'desc'
}) })
const visibleUserModal = ref(false)
const xTable = ref<VxeTableInstance>() const xTable = ref<VxeTableInstance>()
const tableData = ref([]) const tableData = ref([])
const onReset = () => { const onReset = () => {
Object.assign(formState, { Object.assign(formState, {
filePath: '', varFileId: '',
mergeFilePath: '' createBy: '',
createby_dict: '',
createTime: null
}) })
} }
const confirmUser = (list: any) => {
const [user] = list
if (user) {
formState.createBy = user.userId
formState.createby_dict = user.nickName
}
}
const onQuery = async () => { const onQuery = async () => {
loading.value = true loading.value = true
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment