Commit b244a2a1 by zhuzhequan

添加查询条件

parent 095ad1c7
...@@ -58,6 +58,13 @@ export function reGenerateScriptUrlApi(ids: number[]) { ...@@ -58,6 +58,13 @@ export function reGenerateScriptUrlApi(ids: number[]) {
) )
} }
export function reCreateScriptUrlApi(ids: number[]) {
return axios.post<never, BaseRespData<never>>(
'factory/customJomallOrder/rebuildFileByOrderIds',
ids,
)
}
// 打印生产单 // 打印生产单
export function printOrder(ids: number[]) { export function printOrder(ids: number[]) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
......
...@@ -104,6 +104,7 @@ export interface ProductionOrder { ...@@ -104,6 +104,7 @@ export interface ProductionOrder {
export interface AccountStatementNote{ export interface AccountStatementNote{
billNumber?:string billNumber?:string
shipmentId?:string shipmentId?:string
userMark?:string
shipmentNum?:string shipmentNum?:string
dataVersion?:string dataVersion?:string
carriageName?:string carriageName?:string
......
...@@ -12,6 +12,21 @@ ...@@ -12,6 +12,21 @@
<template #top> <template #top>
<div class="header-filter-form"> <div class="header-filter-form">
<ElForm :model="searchForm" inline> <ElForm :model="searchForm" inline>
<ElFormItem label="客户">
<ElSelect
v-model="searchForm.userMark"
clearable
placeholder="请选择客户"
style="width: 130px"
>
<ElOption
v-for="item in nameSpaceList"
:key="item"
:label="item"
:value="item"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="创建时间"> <ElFormItem label="创建时间">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
...@@ -31,7 +46,7 @@ ...@@ -31,7 +46,7 @@
v-model="searchForm.billNumber" v-model="searchForm.billNumber"
clearable clearable
placeholder="发货单号" placeholder="发货单号"
style="width: 160px" style="width: 130px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="订单号"> <ElFormItem label="订单号">
...@@ -401,12 +416,13 @@ import { ref, onMounted, watch, nextTick } from 'vue' ...@@ -401,12 +416,13 @@ import { ref, onMounted, watch, nextTick } from 'vue'
import { showError } from '@/utils/ui' import { showError } from '@/utils/ui'
import 'element-plus/dist/index.css' import 'element-plus/dist/index.css'
import { Confirm, CountStatus } from '@/types/api/order.ts' import { Confirm, CountStatus } from '@/types/api/order.ts'
import { getUserMarkList } from '@/api/auth.ts'
interface SummaryMethodProps<T = AccountStatementNote> { interface SummaryMethodProps<T = AccountStatementNote> {
columns: TableColumnCtx<T>[] columns: TableColumnCtx<T>[]
data: T[] data: T[]
} }
const nameSpaceList = ref<string[]>([])
const treeData = ref<Tree[]>([ const treeData = ref<Tree[]>([
{ {
label: '全部', label: '全部',
...@@ -490,12 +506,20 @@ const { ...@@ -490,12 +506,20 @@ const {
}) })
onMounted(() => { onMounted(() => {
getNameSpaceList()
treeRef.value!.setCurrentKey(nodeId.value, true) treeRef.value!.setCurrentKey(nodeId.value, true)
}) })
const dialogVisible = ref<boolean>(false) const dialogVisible = ref<boolean>(false)
const getNameSpaceList = async () => {
try {
const res = await getUserMarkList()
nameSpaceList.value = res.data
} catch (e) {
// showError(e)
}
}
const getTreeNum = async () => { const getTreeNum = async () => {
const res = await getReconciliationAmount() const res = await getReconciliationAmount()
......
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