Merge branch 'dev' of 47.122.114.111:qinjianhui/factory_front into wqtwo

auto-imports.d.ts

@@ -6,6 +6,7 @@
 export {}
 export {}
 declare global {
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
   const EffectScope: typeof import('vue')['EffectScope']
+  const ElInput: typeof import('element-plus/es')['ElInput']
   const ElLoading: typeof import('element-plus/es')['ElLoading']
   const ElLoading: typeof import('element-plus/es')['ElLoading']
   const ElMessage: typeof import('element-plus/es')['ElMessage']
   const ElMessage: typeof import('element-plus/es')['ElMessage']
   const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
   const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']

src/api/podUsOrder.ts

@@ -37,6 +37,12 @@ export function getOrderList(
     },
     },
   )
   )
 }
 }
+export function handleExceptionOrderApi(orderIds: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/processExceptionOrders',
+    orderIds,
+  )
+}
 export function getCardOrderList(
 export function getCardOrderList(
   params: SearchForm,
   params: SearchForm,
   currentPage: number,
   currentPage: number,
@@ -80,14 +86,17 @@ export function updateExceptionOrderApi(data: number[]) {
     },
     },
   )
   )
 }
 }
-export function changeExceptionOrderApi(ids: number[], value: string) {
-  return axios.post<never, BaseRespData<never>>(
-    'factory/podJomallOrderUs/exceptionOrders',
-    {
-      orderIds: ids,
-      exceptionReason: value,
-    },
-  )
+export function changeExceptionOrderApi(
+  url: string,
+  ids: number[],
+  type: string,
+  value: string,
+) {
+  return axios.post<never, BaseRespData<never>>(url, {
+    orderIds: ids,
+    exceptionType: type,
+    exceptionReason: value,
+  })
 }
 }
 export function cancelOrderApi(ids: number[], value: string) {
 export function cancelOrderApi(ids: number[], value: string) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
@@ -297,3 +306,19 @@ export function createLogisticsOrderApi(params: {
     params,
     params,
   )
   )
 }
 }
+// 转至待拣胚
+export function updateLogisticsToPickingApi(params: { ids: string }) {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/updateLogisticsToPicking`,
+    {
+      params,
+    },
+  )
+}
+//创建物流订单
+export function createLogisticsOrdersApi(orderIds: (string | number)[]) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/createLogisticsOrders`,
+    orderIds,
+  )
+}

src/types/api/podUsOrder.ts

@@ -16,6 +16,7 @@ export interface SearchForm {
   customizedQuantity: string
   customizedQuantity: string
   startTime: string | null
   startTime: string | null
   endTime: string | null
   endTime: string | null
+  exceptionHandling: number | undefined
 }
 }
 export interface PodUsOrderListData {
 export interface PodUsOrderListData {
   id: number
   id: number

src/views/logistics/logisticsCompany.vue

@@ -297,7 +297,7 @@ getLogisticsList()
               <el-form-item class="el-col-12" label="物流公司编码" prop="code">
               <el-form-item class="el-col-12" label="物流公司编码" prop="code">
                 <el-select v-model="form.code" clearable filterable @change="codeChange">
                 <el-select v-model="form.code" clearable filterable @change="codeChange">
                   <el-option
                   <el-option
-                    v-for="it in logisticsList" :key="it.code" :label="it.basicsName"
+                    v-for="it in logisticsList" :key="it.code" :label="it.code"
                     :value="it.code">
                     :value="it.code">
                     {{ it.code }}
                     {{ it.code }}
                     <span style="font-size: 14px; color: #999; line-height: 24px">
                     <span style="font-size: 14px; color: #999; line-height: 24px">

src/views/logistics/shippingAddress.vue

@@ -250,6 +250,7 @@ const formConfig = computed<IFormConfig[]>(() => [
       options: countryList.value,
       options: countryList.value,
       label: 'countryCode',
       label: 'countryCode',
       value: 'countryCode',
       value: 'countryCode',
+      filterable: true,
       placeholder: '请选择国家代码',
       placeholder: '请选择国家代码',
       onChange: (val: ICountryObj) => {
       onChange: (val: ICountryObj) => {
         editForm.value.countryName = val.nameCn
         editForm.value.countryName = val.nameCn
@@ -265,6 +266,7 @@ const formConfig = computed<IFormConfig[]>(() => [
       options: countryList.value,
       options: countryList.value,
       label: 'nameCn',
       label: 'nameCn',
       value: 'nameCn',
       value: 'nameCn',
+      filterable: true,
       placeholder: '请选择国家名称',
       placeholder: '请选择国家名称',
       onChange: (val: ICountryObj) => {
       onChange: (val: ICountryObj) => {
         editForm.value.countryCode = val.countryCode
         editForm.value.countryCode = val.countryCode

src/views/order/podUs/PodMakeOrder.vue

@@ -11,7 +11,7 @@
     @opened="handleOpened"
     @opened="handleOpened"
     @close="onClose"
     @close="onClose"
   >
   >
-    <template #title>
+    <template #header>
       <div class="title">
       <div class="title">
         <span>POD打单</span>
         <span>POD打单</span>
         <span v-if="socketConnect === 'online'" class="online">[在线]</span>
         <span v-if="socketConnect === 'online'" class="online">[在线]</span>

src/views/order/podUs/components/ResultInfo.vue

@@ -32,7 +32,7 @@
       <div style="margin: 15px 0"></div>
       <div style="margin: 15px 0"></div>
       <el-checkbox-group v-model="selectedList" @change="checkChange">
       <el-checkbox-group v-model="selectedList" @change="checkChange">
         <div style="display: block" v-for="(item, index) in list" :key="index">
         <div style="display: block" v-for="(item, index) in list" :key="index">
-          <el-checkbox :label="item.id">
+          <el-checkbox :value="item.id">
             {{ '店铺编号：' + item.shopNumber + ' ' + item.message }}
             {{ '店铺编号：' + item.shopNumber + ' ' + item.message }}
           </el-checkbox>
           </el-checkbox>
         </div>
         </div>