Merge remote-tracking branch 'origin/dev' into dev

src/api/podUsOrder.ts

@@ -370,9 +370,13 @@ export function updateSelfLogistics(params: {
 }
 }
 
 
 // 更改物流
 // 更改物流
-export function composingDesignImages(data: number[], type: string) {
+export function composingDesignImages(
+  data: number[],
+  type?: string,
+  templateWidth?: number,
+) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
-    `factory/podJomallOrderUs/composingDesignImages?type=${type}`,
+    `factory/podJomallOrderUs/composingDesignImages?type=${type}&templateWidth=${templateWidth}`,
     data,
     data,
   )
   )
 }
 }
@@ -436,10 +440,14 @@ export function toOutOfStockApi(ids: number[]) {
 }
 }
 
 
 // 排单完成
 // 排单完成
-export function arrangeFinishApi(ids: number[]) {
+export function arrangeFinishApi(params: {
+  productIdList: number[]
+  templateWidth?: number
+  type?: string
+}) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     `factory/podJomallOrderProductUs/arrangeFinish`,
     `factory/podJomallOrderProductUs/arrangeFinish`,
-    ids,
+    params,
   )
   )
 }
 }
 
 
@@ -482,7 +490,11 @@ export function batchDownloadDeleteApi(params: { ids?: string }) {
 }
 }
 
 
 // 批量下载 重新排版
 // 批量下载 重新排版
-export function batchDownloadRecomposingApi(params: { id: number }) {
+export function batchDownloadRecomposingApi(params: {
+  id: number
+  type?: string
+  templateWidth?: number
+}) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
     `factory/podBatchDownload/reComposingDesignImages`,
     `factory/podBatchDownload/reComposingDesignImages`,
     {
     {

src/types/api/podCnOrder.ts

@@ -15,7 +15,8 @@ export interface ExportParams extends SearchForm {
 export interface SearchForm {
 export interface SearchForm {
   timeType?: number | null
   timeType?: number | null
   shopNumber?: string
   shopNumber?: string
-  shipmentType?: string
+  shipmentType?: string | number
+  replaceShipment?: string | number
   userMark?: string
   userMark?: string
   processNumber?: string
   processNumber?: string
   trackingNumber?: string
   trackingNumber?: string

src/types/api/podUsOrder.ts

@@ -33,6 +33,7 @@ export interface SearchForm {
   supplierProductNo?: string
   supplierProductNo?: string
   batchArrangeNumber?: string
   batchArrangeNumber?: string
   craftCode?: string
   craftCode?: string
+  craftCodeArr?: string[]
   thirdStockSku?: string
   thirdStockSku?: string
   interceptStatus?: number | string
   interceptStatus?: number | string
   trackRegisterSelect?: string | number
   trackRegisterSelect?: string | number

src/views/order/orderTracking/index.vue

@@ -493,7 +493,17 @@ const getOrderListFn = async () => {
   const { currentPage, pageSize } = pagination.value
   const { currentPage, pageSize } = pagination.value
   try {
   try {
     const { data } = await getOrderList(
     const { data } = await getOrderList(
-      { ...searchForm.value },
+      {
+        ...searchForm.value,
+        startTime:
+          timeRange.value && timeRange.value.length > 0
+            ? timeRange.value[0]
+            : null,
+        endTime:
+          timeRange.value && timeRange.value.length > 0
+            ? timeRange.value[1]
+            : null,
+      },
       currentPage,
       currentPage,
       pageSize,
       pageSize,
     )
     )

src/views/order/podCN/index.vue

@@ -221,7 +221,46 @@
                   style="width: 150px"
                   style="width: 150px"
                 ></ElInput>
                 ></ElInput>
               </ElFormItem>
               </ElFormItem>
-              <ElFormItem label="物流类型">
+              <ElFormItem label="是否代发">
+                <ElSelect
+                  v-model="searchForm.replaceShipment"
+                  placeholder="是否代发"
+                  clearable
+                  :teleported="false"
+                  style="width: 150px"
+                  @change="changeReplaceShipment"
+                >
+                  <ElOption
+                    v-for="(item, index) in ['不代发', '代发']"
+                    :key="index"
+                    :value="index"
+                    :label="item"
+                  ></ElOption>
+                </ElSelect>
+              </ElFormItem>
+              <ElFormItem
+                v-if="searchForm.replaceShipment === 0"
+                label="物流类型"
+              >
+                <ElSelect
+                  v-model="searchForm.shipmentType"
+                  placeholder="物流类型"
+                  clearable
+                  :teleported="false"
+                  style="width: 150px"
+                >
+                  <ElOption
+                    v-for="(item, index) in ['自提', '快递']"
+                    :key="index"
+                    :value="index"
+                    :label="item"
+                  ></ElOption>
+                </ElSelect>
+              </ElFormItem>
+              <ElFormItem
+                v-if="searchForm.replaceShipment === 1"
+                label="物流类型"
+              >
                 <ElSelect
                 <ElSelect
                   v-model="searchForm.shipmentType"
                   v-model="searchForm.shipmentType"
                   placeholder="物流类型"
                   placeholder="物流类型"
@@ -2299,6 +2338,7 @@ const detailData = ref({})
 const [searchForm, resetSearchForm] = useValue<SearchForm>({
 const [searchForm, resetSearchForm] = useValue<SearchForm>({
   timeType: 1,
   timeType: 1,
   shopNumber: '',
   shopNumber: '',
+  replaceShipment: '',
   shipmentType: '',
   shipmentType: '',
   userMark: '',
   userMark: '',
   processNumber: '',
   processNumber: '',
@@ -2579,6 +2619,9 @@ const updateOrder = async () => {
     loading.close()
     loading.close()
   }
   }
 }
 }
+const changeReplaceShipment = () => {
+  searchForm.value.shipmentType = ''
+}
 const assignOrder = async () => {
 const assignOrder = async () => {
   if (selection.value.length === 0) {
   if (selection.value.length === 0) {
     return ElMessage.warning('请选择数据')
     return ElMessage.warning('请选择数据')