Skip to content

T
topsun-baoshen-excel
Commit 23405537 authored by 何远江's avatar 何远江
Browse files
Options

添加字段，及查询条件

parent 2a31a6d9
Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 31 deletions
src/utils/query.ts
View file @ 23405537
......@@ -6,11 +6,15 @@ import type { Recordable } from '@/types/global'
* @param field
*/
export function queryParamsFilter(params: Recordable, field?: string[]) {
const exclude = ['currentPage', 'pageSize', 'total', 'column', 'order'].concat(field || [])
const exclude = ['currentPage', 'pageSize', 'total', 'column', 'order', 'createTime'].concat(field || [])
const p = Object.assign({}, params)
for (const key in params) {
if (!exclude.includes(key)) {
if (key === 'createTime' && p[key]?.length) {
p['createTime_begin'] = p[key][0]
p['createTime_end'] = p[key][1]
delete p[key]
} else if (!exclude.includes(key)) {
p[key] = `*${p[key]}*`
}
}
......
src/views/order/orderChange/OrderChange.vue
View file @ 23405537
......@@ -13,7 +13,7 @@
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="queryParams.createTime" type="date" value-format="YYYY-MM-DD" placeholder="选择创建时间"></el-date-picker>
<el-date-picker v-model="queryParams.createTime" type='daterange' value-format="YYYY-MM-DD" placeholder="选择创建时间"></el-date-picker>
</el-form-item>
<el-form-item label="创建人">
<el-input v-model="queryParams.createby_dict" placeholder="">
......
src/views/order/orderList/OrderList.vue
View file @ 23405537
......@@ -2,11 +2,21 @@
<div class="w-full h-full bg-white p-4">
<p class="font-bold text-lg leading-10 border-b-2">订单文件管理</p>
<el-form class="pt-4" :inline="true" :model="formState">
<el-form-item label="原始文件地址">
<el-input v-model="formState.filePath" placeholder="" clearable />
<el-form-item label="标注文件ID">
<el-input v-model="formState.orderFileId" placeholder="" clearable />
</el-form-item>
<el-form-item label="标注文件地址">
<el-input v-model="formState.mergeFilePath" placeholder="" clearable />
<el-form-item label="模版文件ID">
<el-input v-model="formState.templateFileId" placeholder="" clearable />
</el-form-item>
<el-form-item label="创建人">
<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>
......@@ -33,6 +43,21 @@
:data="tableData"
>
<vxe-column type="checkbox" width="50"></vxe-column>
<vxe-column field="orderFileId" title="标注文件ID" width="180">
<template #default="{ row }">
<el-link target="_blank" :href="'/preview-excel?fileId=' + row.orderFileId">{{
row.orderFileId
}}</el-link>
</template>
</vxe-column>
<vxe-column field="templateFileId" title="模版文件ID" width="180">
<template #default="{ row }">
<el-link target="_blank" :href="'/preview-excel?fileId=' + row.templateFileId">{{
row.templateFileId
}}</el-link>
</template>
</vxe-column>
<vxe-column field="customerId_dictText" title="客户名称" width="120"></vxe-column>
<vxe-column title="原始文件地址" min-width="300">
<template #default="{ row }">
......@@ -45,21 +70,19 @@
>
</template>
</vxe-column>
<vxe-column field="orderFileId" title="标注文件ID" width="180"></vxe-column>
<vxe-column title="标注文件地址" min-width="300">
<template #default="{ row }">
<!-- <template #default="{ row }">
<el-link target="_blank" :href="'/preview-excel?fileId=' + row.orderFileId">{{
row.mergeFilePath
}}</el-link>
</template>
</template> -->
</vxe-column>
<vxe-column field="templateFileId" title="模版文件ID" width="180"></vxe-column>
<vxe-column title="模版文件地址" min-width="300">
<template #default="{ row }">
<!-- <template #default="{ row }">
<el-link target="_blank" :href="'/comment-excel?fileId=' + row.templateFileId">{{
row.templateFileId_dictText
}}</el-link>
</template>
</template> -->
</vxe-column>
<vxe-column field="createTime" title="创建时间" width="180"></vxe-column>
<vxe-column field="action" title="操作" width="80" fixed="right">
......@@ -86,6 +109,8 @@
>
</vxe-pager>
</div>
<UserModal v-model:visible="visibleUserModal" @confirm="confirmUser" />
</div>
</template>
......@@ -96,18 +121,24 @@ import { ElMessage } from 'element-plus'
import type { VxeTableInstance } from 'vxe-table'
import { useRouter } from 'vue-router'
import { queryParamsFilter } from '@/utils/query'
import { MoreFilled } from '@element-plus/icons-vue'
import UserModal from '@/components/UserModal/UserModal.vue'
const router = useRouter()
const loading = ref(false)
const formState = reactive({
filePath: '',
mergeFilePath: '',
orderFileId: '',
templateFileId: '',
createBy: '',
createby_dict: '',
createTime: null,
currentPage: 1,
pageSize: 10,
total: 0,
column: 'createTime',
order: 'desc'
})
const visibleUserModal = ref(false)
const xTable = ref<VxeTableInstance>()
......@@ -123,10 +154,21 @@ const removeRows = async () => {
}
}
const confirmUser = (list: any) => {
const [user] = list
if (user) {
formState.createBy = user.userId
formState.createby_dict = user.nickName
}
}
const onReset = () => {
Object.assign(formState, {
filePath: '',
mergeFilePath: ''
orderFileId: '',
templateFileId: '',
createBy: '',
createby_dict: '',
createTime: null
})
}
const onQuery = async () => {
......
src/views/order/orderList/OrderTempList.vue
View file @ 23405537
......@@ -2,11 +2,26 @@
<div class="w-full h-full bg-white p-4">
<p class="font-bold text-lg leading-10 border-b-2">模版文件管理</p>
<el-form class="pt-4" :inline="true" :model="formState">
<el-form-item label="原始文件地址">
<el-input v-model="formState.filePath" placeholder="" clearable />
<el-form-item label="标注文件ID">
<el-input v-model="formState.orderFileId" placeholder="" clearable />
</el-form-item>
<el-form-item label="标注文件地址">
<el-input v-model="formState.mergeFilePath" placeholder="" clearable />
<el-form-item label="模版文件ID">
<el-input v-model="formState.templateFileId" placeholder="" clearable />
</el-form-item>
<el-form-item label="创建人">
<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>
......@@ -30,6 +45,21 @@
:data="tableData"
>
<vxe-column type="checkbox" width="50"></vxe-column>
<vxe-column field="orderFileId" title="标注文件ID" width="180">
<template #default="{ row }">
<el-link target="_blank" :href="'/preview-excel?fileId=' + row.orderFileId">{{
row.orderFileId
}}</el-link>
</template>
</vxe-column>
<vxe-column field="templateFileId" title="模版文件ID" width="180">
<template #default="{ row }">
<el-link target="_blank" :href="'/preview-excel?fileId=' + row.templateFileId">{{
row.templateFileId
}}</el-link>
</template>
</vxe-column>
<vxe-column field="customerId_dictText" title="客户名称" width="120"></vxe-column>
<vxe-column title="原始文件地址" min-width="300">
<template #default="{ row }">
......@@ -42,21 +72,19 @@
>
</template>
</vxe-column>
<vxe-column title="标注文件ID" field="orderFileId" width="180" />
<vxe-column title="标注文件地址" min-width="300">
<template #default="{ row }">
<!-- <template #default="{ row }">
<el-link target="_blank" :href="'/preview-excel?fileId=' + row.orderFileId">{{
row.mergeFilePath
}}</el-link>
</template>
</template> -->
</vxe-column>
<vxe-column title="模版文件ID" field="templateFileId" width="180" />
<vxe-column title="模版文件地址" min-width="300">
<template #default="{ row }">
<!-- <template #default="{ row }">
<el-link target="_blank" :href="'/comment-excel?fileId=' + row.templateFileId">{{
row.mergeFilePath
}}</el-link>
</template>
</template> -->
</vxe-column>
<vxe-column field="createTime" title="创建时间" width="180"></vxe-column>
<vxe-column field="action" title="操作" width="80" fixed="right">
......@@ -83,6 +111,8 @@
>
</vxe-pager>
</div>
<UserModal v-model:visible="visibleUserModal" @confirm="confirmUser" />
</div>
</template>
......@@ -93,12 +123,17 @@ import { ElMessage } from 'element-plus'
import type { VxeTableInstance } from 'vxe-table'
import { useRouter } from 'vue-router'
import { queryParamsFilter } from '@/utils/query'
import { MoreFilled } from '@element-plus/icons-vue'
import UserModal from '@/components/UserModal/UserModal.vue'
const router = useRouter()
const loading = ref(false)
const formState = reactive({
filePath: '',
mergeFilePath: '',
orderFileId: '',
templateFileId: '',
createBy: '',
createby_dict: '',
createTime: null,
currentPage: 1,
pageSize: 10,
total: 0,
......@@ -106,6 +141,8 @@ const formState = reactive({
order: 'desc'
})
const visibleUserModal = ref(false)
const xTable = ref<VxeTableInstance>()
const tableData = ref([])
......@@ -120,10 +157,21 @@ const removeRows = async () => {
}
}
const confirmUser = (list: any) => {
const [user] = list
if (user) {
formState.createBy = user.userId
formState.createby_dict = user.nickName
}
}
const onReset = () => {
Object.assign(formState, {
filePath: '',
mergeFilePath: ''
orderFileId: '',
templateFileId: '',
createBy: '',
createby_dict: '',
createTime: null
})
}
const onQuery = async () => {
......
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