Skip to content

F
factory_front
Commit 195a35fa by zhuzhequan
Options

添加查询条件

parent 66366f95
Showing with 34 additions and 24 deletions
src/api/auth.ts
...@@ -77,3 +77,6 @@ export function changeUserStatusApi(status: number, id: number) { ...@@ -77,3 +77,6 @@ export function changeUserStatusApi(status: number, id: number) {
export function getUserNameSpaceList() { export function getUserNameSpaceList() {
return axios.get<never, BaseRespData<NameSpaceList[]>>('dbDiyUser/getList') return axios.get<never, BaseRespData<NameSpaceList[]>>('dbDiyUser/getList')
} }
export function getUserMarkList() {
return axios.get<never, BaseRespData<string[]>>('factory/customJomallOrder/getUserMarkList')
}
src/router/menu.ts
...@@ -15,10 +15,14 @@ const menu: MenuItem[] = [ ...@@ -15,10 +15,14 @@ const menu: MenuItem[] = [
index: '/order/list', index: '/order/list',
id: 2, id: 2,
label: '订单', label: '订单',
},{
index: '/system/delivery-note',
id: 3,
label: '发货单',
}, },
{ {
index: '', index: '',
id: 3, id: 4,
label: '系统设置', label: '系统设置',
children: [ children: [
{ {
...@@ -26,11 +30,7 @@ const menu: MenuItem[] = [ ...@@ -26,11 +30,7 @@ const menu: MenuItem[] = [
id: 4, id: 4,
label: '用户管理', label: '用户管理',
}, },
{
index: '/system/delivery-note',
id: 5,
label: '发货单管理',
}
] ]
}, },
// { // {
......
src/types/api/deliveryNote.ts
export interface DeliveryNoteSearchForm { export interface DeliveryNoteSearchForm {
subOrderNumber?: string subOrderNumber?: string
billNumber?: number billNumber?: number
userMark?: string
startTime?: string startTime?: string
endTime?: string endTime?: string
logisticsTracking?: string logisticsTracking?: string
......
src/views/DeliveryNotePage.vue
...@@ -22,14 +22,7 @@ ...@@ -22,14 +22,7 @@
style="width: 160px" style="width: 160px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="发货单号">
<ElInput
v-model="searchForm.billNumber"
clearable
placeholder="请输入发货单号"
style="width: 160px"
/>
</ElFormItem>
<ElFormItem label="订单号"> <ElFormItem label="订单号">
<ElInput <ElInput
v-model="searchForm.orderNumber" v-model="searchForm.orderNumber"
...@@ -38,6 +31,14 @@ ...@@ -38,6 +31,14 @@
style="width: 160px" style="width: 160px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="发货单号">
<ElInput
v-model="searchForm.billNumber"
clearable
placeholder="请输入发货单号"
style="width: 160px"
/>
</ElFormItem>
<ElFormItem label="收货人"> <ElFormItem label="收货人">
<ElInput <ElInput
v-model="searchForm.lanshouName" v-model="searchForm.lanshouName"
...@@ -57,18 +58,18 @@ ...@@ -57,18 +58,18 @@
<ElOption label="送货上门" :value="1"></ElOption> <ElOption label="送货上门" :value="1"></ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="客户名称"> <ElFormItem label="客户">
<ElSelect <ElSelect
v-model="searchForm.namespace" v-model="searchForm.userMark"
clearable clearable
placeholder="请选择客户名称" placeholder="请选择客户"
style="width: 160px" style="width: 160px"
> >
<ElOption <ElOption
v-for="item in nameSpaceList" v-for="item in nameSpaceList"
:key="item.id" :key="item"
:label="item.name" :label="item"
:value="item.name" :value="item"
></ElOption> ></ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
...@@ -254,7 +255,6 @@ import { DocumentCopy } from '@element-plus/icons-vue' ...@@ -254,7 +255,6 @@ import { DocumentCopy } from '@element-plus/icons-vue'
import { import {
DeliveryNoteSearchForm, DeliveryNoteSearchForm,
DeliveryNoteData, DeliveryNoteData,
NameSpaceList,
} from '@/types/api/deliveryNote' } from '@/types/api/deliveryNote'
import { OrderData } from '@/types/api/order' import { OrderData } from '@/types/api/order'
import usePageList from '@/utils/hooks/usePageList' import usePageList from '@/utils/hooks/usePageList'
...@@ -264,7 +264,7 @@ import { ...@@ -264,7 +264,7 @@ import {
printDeliveryNote, printDeliveryNote,
getOrderByIdApi, getOrderByIdApi,
} from '@/api/order' } from '@/api/order'
import { getUserNameSpaceList } from '@/api/auth' import { getUserMarkList } from '@/api/auth'
import { ref, onMounted } from 'vue' import { ref, onMounted } from 'vue'
import { val } from '@/utils' import { val } from '@/utils'
import { showError } from '@/utils/ui' import { showError } from '@/utils/ui'
...@@ -330,13 +330,13 @@ const { ...@@ -330,13 +330,13 @@ const {
pageSize, pageSize,
).then((res) => res.data), ).then((res) => res.data),
}) })
const nameSpaceList = ref<NameSpaceList[]>([]) const nameSpaceList = ref<string[]>([])
onMounted(() => { onMounted(() => {
getNameSpaceList() getNameSpaceList()
}) })
const getNameSpaceList = async () => { const getNameSpaceList = async () => {
try { try {
const res = await getUserNameSpaceList() const res = await getUserMarkList()
nameSpaceList.value = res.data nameSpaceList.value = res.data
} catch (e) { } catch (e) {
showError(e) showError(e)
......
src/views/order/index.vue
...@@ -347,6 +347,12 @@ ...@@ -347,6 +347,12 @@
}}</span> }}</span>
</div> </div>
<div class="order-detail_item"> <div class="order-detail_item">
<span class="label">稿件生成状态:</span>
<span class="value" :title="scope.row.productionFileStatus">{{
scope.row.productionFileStatus || '--'
}}</span>
</div>
<div class="order-detail_item">
<span class="label">收货人:</span> <span class="label">收货人:</span>
<span class="value">{{ scope.row.lanshouName }}</span> <span class="value">{{ scope.row.lanshouName }}</span>
</div> </div>
......
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