添加查询条件

src/api/auth.ts

@@ -77,3 +77,6 @@ export function changeUserStatusApi(status: number, id: number) {
 export function getUserNameSpaceList() {
   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[] = [
     index: '/order/list',
     id: 2,
     label: '订单',
+  },{
+    index: '/system/delivery-note',
+    id: 3,
+    label: '发货单',
   },
   {
     index: '',
-    id: 3,
+    id: 4,
     label: '系统设置',
     children: [
       {
@@ -26,11 +30,7 @@ const menu: MenuItem[] = [
         id: 4,
         label: '用户管理',
       },
-      {
-        index: '/system/delivery-note',
-        id: 5,
-        label: '发货单管理',
-      }
+
     ]
   },
   // {

src/types/api/deliveryNote.ts

 export interface DeliveryNoteSearchForm {
   subOrderNumber?: string
   billNumber?: number
+  userMark?: string
   startTime?: string
   endTime?: string
   logisticsTracking?: string

src/views/DeliveryNotePage.vue

@@ -22,14 +22,7 @@
             style="width: 160px"
           />
         </ElFormItem>
-        <ElFormItem label="发货单号">
-          <ElInput
-            v-model="searchForm.billNumber"
-            clearable
-            placeholder="请输入发货单号"
-            style="width: 160px"
-          />
-        </ElFormItem>
+
         <ElFormItem label="订单号">
           <ElInput
             v-model="searchForm.orderNumber"
@@ -38,6 +31,14 @@
             style="width: 160px"
           ></ElInput>
         </ElFormItem>
+        <ElFormItem label="发货单号">
+          <ElInput
+            v-model="searchForm.billNumber"
+            clearable
+            placeholder="请输入发货单号"
+            style="width: 160px"
+          />
+        </ElFormItem>
         <ElFormItem label="收货人">
           <ElInput
             v-model="searchForm.lanshouName"
@@ -57,18 +58,18 @@
             <ElOption label="送货上门" :value="1"></ElOption>
         </ElSelect>
         </ElFormItem>
-        <ElFormItem label="客户名称">
+        <ElFormItem label="客户">
           <ElSelect
-            v-model="searchForm.namespace"
+            v-model="searchForm.userMark"
             clearable
-            placeholder="请选择客户名称"
+            placeholder="请选择客户"
             style="width: 160px"
           >
             <ElOption
               v-for="item in nameSpaceList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
+              :key="item"
+              :label="item"
+              :value="item"
             ></ElOption>
           </ElSelect>
         </ElFormItem>
@@ -254,7 +255,6 @@ import { DocumentCopy } from '@element-plus/icons-vue'
 import {
   DeliveryNoteSearchForm,
   DeliveryNoteData,
-  NameSpaceList,
 } from '@/types/api/deliveryNote'
 import { OrderData } from '@/types/api/order'
 import usePageList from '@/utils/hooks/usePageList'
@@ -264,7 +264,7 @@ import {
   printDeliveryNote,
   getOrderByIdApi,
 } from '@/api/order'
-import { getUserNameSpaceList } from '@/api/auth'
+import { getUserMarkList } from '@/api/auth'
 import { ref, onMounted } from 'vue'
 import { val } from '@/utils'
 import { showError } from '@/utils/ui'
@@ -330,13 +330,13 @@ const {
       pageSize,
     ).then((res) => res.data),
 })
-const nameSpaceList = ref<NameSpaceList[]>([])
+const nameSpaceList = ref<string[]>([])
 onMounted(() => {
   getNameSpaceList()
 })
 const getNameSpaceList = async () => {
   try {
-    const res = await getUserNameSpaceList()
+    const res = await getUserMarkList()
     nameSpaceList.value = res.data
   } catch (e) {
     showError(e)

src/views/order/index.vue

@@ -347,6 +347,12 @@
                     }}</span>
                 </div>
                 <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="value">{{ scope.row.lanshouName }}</span>
                 </div>