排单

src/api/podCnOrder.ts

@@ -38,6 +38,11 @@ export function syncReceiverAddress(data: number[]) {
   )
   )
 }
 }
 
 
+export function getEmployeeListApi() {
+  return axios.get(`/factory/factoryUser/list`)
+}
+
+
 // 播种墙配货 扫码放入箱子
 // 播种墙配货 扫码放入箱子
 export function getPackingCnDataApi(
 export function getPackingCnDataApi(
   code: string,
   code: string,

src/api/podUsOrder.ts

@@ -626,6 +626,11 @@ export function getAccountCodeByFactoryIdApi(params: { token: string }) {
 export function getLogisticsWayApi() {
 export function getLogisticsWayApi() {
   return axios.get(`logisticsWay/usableAllList`)
   return axios.get(`logisticsWay/usableAllList`)
 }
 }
+
+export function getEmployeeListApi() {
+  return axios.get(`/factory/factoryUser/list`)
+}
+
 // 打印拣货单item
 // 打印拣货单item
 export function printPickPdfByBatchNumberApi(params: {
 export function printPickPdfByBatchNumberApi(params: {
   batchArrangeNumber: string
   batchArrangeNumber: string

src/types/api/podCnOrder.ts

@@ -51,6 +51,7 @@ export interface SearchForm {
   downloadStatus?: number
   downloadStatus?: number
   syntheticStatus?: number
   syntheticStatus?: number
   automaticComposing?: number
   automaticComposing?: number
+  employeeId?: number
 }
 }
 export interface PodCnOrderListData {
 export interface PodCnOrderListData {
   id: number
   id: number

src/types/api/podUsOrder.ts

@@ -48,6 +48,7 @@ export interface SearchForm {
   downloadStatus?: number
   downloadStatus?: number
   syntheticStatus?: number
   syntheticStatus?: number
   automaticComposing?: number
   automaticComposing?: number
+  employeeId?: number
 }
 }
 export interface PodUsOrderListData {
 export interface PodUsOrderListData {
   id: number
   id: number

src/views/order/podCN/index.vue

@@ -31,7 +31,24 @@
                   >
                   >
                   </el-date-picker>
                   </el-date-picker>
           </ElFormItem>
           </ElFormItem>
-          
+          <ElFormItem label="创建人"  v-if="
+            status === 'BATCH_DOWNLOAD'
+          ">
+            <ElSelect
+              v-model="searchForm.employeeId"
+              placeholder="请选择"
+              clearable
+              :teleported="false"
+              style="width: 150px"
+            >
+              <ElOption
+                v-for="(item, index) in employeeList"
+                :key="index"
+                :value="item.id"
+                :label="item.account"
+              ></ElOption>
+            </ElSelect>
+          </ElFormItem>
           <ElFormItem label="工艺类型"  v-if="
           <ElFormItem label="工艺类型"  v-if="
             status === 'BATCH_DOWNLOAD'
             status === 'BATCH_DOWNLOAD'
           ">
           ">
@@ -80,7 +97,7 @@
                 style="width: 150px"
                 style="width: 150px"
                 >
                 >
                 <ElOption
                 <ElOption
-                  v-for="(item, index) in ['失败', '成功']"
+                  v-for="(item, index) in ['否', '是']"
                   :key="index"
                   :key="index"
                   :value="index"
                   :value="index"
                   :label="item"
                   :label="item"
@@ -2735,6 +2752,7 @@ import {
   getCustomTagListCnApi,
   getCustomTagListCnApi,
   printNormalPdf,
   printNormalPdf,
   changeLogisticsApi,
   changeLogisticsApi,
+  getEmployeeListApi,
 } from '@/api/podCnOrder'
 } from '@/api/podCnOrder'
 
 
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
@@ -2860,6 +2878,7 @@ const sourceList = [
   },
   },
 ]
 ]
 const sizes = ['FS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', '3XL', '4XL', '5XL']
 const sizes = ['FS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', '3XL', '4XL', '5XL']
+const employeeList = ref<{ account: string; id: number }[]>([])
 
 
 const exportData = () => {
 const exportData = () => {
   exportVisible.value = true
   exportVisible.value = true
@@ -3766,6 +3785,14 @@ const asyncOrderAddress = async () => {
   }
   }
 }
 }
 
 
+
+const getEmployeeList = async () => {
+  const { data } = await getEmployeeListApi()
+  employeeList.value = data
+}
+
+getEmployeeList()
+
 const changeTab = (item: Tab) => {
 const changeTab = (item: Tab) => {
   status.value = item.status || ''
   status.value = item.status || ''
   localStorage.setItem('podCnStatus', item.status as string)
   localStorage.setItem('podCnStatus', item.status as string)

src/views/order/podUs/index.vue

@@ -31,7 +31,24 @@
                   >
                   >
                   </el-date-picker>
                   </el-date-picker>
           </ElFormItem>
           </ElFormItem>
-          
+          <ElFormItem label="创建人"  v-if="
+            status === 'BATCH_DOWNLOAD'
+          ">
+            <ElSelect
+              v-model="searchForm.employeeId"
+              placeholder="请选择"
+              clearable
+              :teleported="false"
+              style="width: 150px"
+            >
+              <ElOption
+                v-for="(item, index) in employeeList"
+                :key="index"
+                :value="item.id"
+                :label="item.account"
+              ></ElOption>
+            </ElSelect>
+          </ElFormItem>
           <ElFormItem label="工艺类型"  v-if="
           <ElFormItem label="工艺类型"  v-if="
             status === 'BATCH_DOWNLOAD'
             status === 'BATCH_DOWNLOAD'
           ">
           ">
@@ -80,7 +97,7 @@
                 style="width: 150px"
                 style="width: 150px"
                 >
                 >
                 <ElOption
                 <ElOption
-                  v-for="(item, index) in ['失败', '成功']"
+                  v-for="(item, index) in ['否', '是']"
                   :key="index"
                   :key="index"
                   :value="index"
                   :value="index"
                   :label="item"
                   :label="item"
@@ -3107,6 +3124,7 @@ import {
   getLogisticsWayApi,
   getLogisticsWayApi,
   printNormalPickPdfApi,
   printNormalPickPdfApi,
   updatePRNDownloadStatus,
   updatePRNDownloadStatus,
+  getEmployeeListApi,
 } from '@/api/podUsOrder'
 } from '@/api/podUsOrder'
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
 
 
@@ -3204,6 +3222,8 @@ const printWarehouseSkuDialogRef = ref()
 const isAuto = ref(true)
 const isAuto = ref(true)
 const countryList = ref([])
 const countryList = ref([])
 const logisticsWayList = ref<{ name: string; id: number }[]>([])
 const logisticsWayList = ref<{ name: string; id: number }[]>([])
+const employeeList = ref<{ account: string; id: number }[]>([])
+
 const craftTypeList = ref<{ name: string; code: string }[]>([
 const craftTypeList = ref<{ name: string; code: string }[]>([
   { name: '烫画', code: 'TH' }
   { name: '烫画', code: 'TH' }
 ])
 ])
@@ -6606,8 +6626,15 @@ const getLogisticsWay = async () => {
   logisticsWayList.value = data
   logisticsWayList.value = data
 }
 }
 
 
+const getEmployeeList = async () => {
+  const { data } = await getEmployeeListApi()
+  employeeList.value = data
+}
+
+
 getPermission()
 getPermission()
 getLogisticsWay()
 getLogisticsWay()
+getEmployeeList()
 
 
 const globalProperties =
 const globalProperties =
   getCurrentInstance()?.appContext.config.globalProperties // 获取全局挂载
   getCurrentInstance()?.appContext.config.globalProperties // 获取全局挂载