Merge branch 'dev_delivery_remark' into 'dev'

Dev delivery remark

See merge request !266

src/types/api/podMakeOrder.ts

@@ -18,6 +18,7 @@ export interface OrderData {
   orderStatus?: number
   orderStatus?: number
   fromUser?: string | number
   fromUser?: string | number
   salesPlatform?: string
   salesPlatform?: string
+  platform?: string
   logisticsCompanyId?: number
   logisticsCompanyId?: number
   blocked?: boolean
   blocked?: boolean
   logisticsCompanyName?: string
   logisticsCompanyName?: string

src/views/order/factoryOrderNew/index.vue

@@ -1891,6 +1891,12 @@ const mainColumns = computed(() => [
     },
     },
   },
   },
   {
   {
+    prop: 'shipmentsNote',
+    label: '客户发货备注',
+    width: 140,
+    align: 'center',
+  },
+  {
     prop: 'logisticsWayName',
     prop: 'logisticsWayName',
     label: '物流类型',
     label: '物流类型',
     width: 140,
     width: 140,

src/views/order/podUs/PodMakeOrder.vue

@@ -123,9 +123,12 @@
             <span>物流方式：</span>
             <span>物流方式：</span>
             <span></span>
             <span></span>
           </div> -->
           </div> -->
-          <div class="basic-info-item">
-            <span>发货备注：</span>
-            <span>{{ podOrderDetailsData?.remark }}</span>
+          <div
+            class="basic-info-item"
+            :title="podOrderDetailsData?.shipmentsNote"
+          >
+            <span>客户发货备注：</span>
+            <span>{{ podOrderDetailsData?.shipmentsNote }}</span>
           </div>
           </div>
           <div class="basic-info-item">
           <div class="basic-info-item">
             <span>订单号：</span>
             <span>订单号：</span>
@@ -176,6 +179,31 @@
               ?.warehouseName || '')
               ?.warehouseName || '')
           }}
           }}
         </div>
         </div>
+        <div class="platform-filter">
+          <span>平台</span>
+          <ElSelect
+            v-model="platform"
+            placeholder="请选择"
+            clearable
+            filterable
+            style="width: 250px"
+          >
+            <ElOption
+              v-for="(item, index) in platformList"
+              :key="index"
+              :label="item.type"
+              :value="item.type"
+            >
+              <img
+                :src="`/images/icon/${item.icon.split('/').pop()}`"
+                style="height: 20px; margin: 5px 10px 0 0"
+              />
+              <span :title="item.type">{{ item.type }}</span>
+            </ElOption>
+          </ElSelect>
+          <ElButton type="primary" @click="handlePlatformChange">查询</ElButton>
+          <ElButton @click="resetPlatform">重置</ElButton>
+        </div>
         <div class="flex right-panel-body">
         <div class="flex right-panel-body">
           <div class="middle-content">
           <div class="middle-content">
             <div class="box-top">
             <div class="box-top">
@@ -282,6 +310,10 @@
                 :class="{
                 :class="{
                   active: item.box && boxIndex == item.box,
                   active: item.box && boxIndex == item.box,
                   isNull: !item.data,
                   isNull: !item.data,
+                  'platform-matched':
+                    platformMatchedBoxes &&
+                    item.box &&
+                    platformMatchedBoxes.includes(item.box),
                 }"
                 }"
                 @click="handleBoxClick(item)"
                 @click="handleBoxClick(item)"
               >
               >
@@ -343,6 +375,7 @@ import { ElButton, ElIcon, ElTag } from 'element-plus'
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
 import type { SortingList } from '@/types/api/order'
 import type { SortingList } from '@/types/api/order'
 import { showError } from '@/utils/ui.ts'
 import { showError } from '@/utils/ui.ts'
+import platformJson from '../../../json/platform.json'
 
 
 const { getCLodop } = useLodop()
 const { getCLodop } = useLodop()
 
 
@@ -539,6 +572,7 @@ watch(visible, async (value: boolean) => {
   if (value) {
   if (value) {
     podOrderDetailsData.value = {}
     podOrderDetailsData.value = {}
     currentCode = ''
     currentCode = ''
+    resetPlatform()
     if (props.wallType === 'sort') {
     if (props.wallType === 'sort') {
       await getSortingAreaList()
       await getSortingAreaList()
     }
     }
@@ -865,6 +899,7 @@ const initPrintDevice = () => {
 //   }
 //   }
 // }
 // }
 const handleSearch = () => {
 const handleSearch = () => {
+  resetPlatform()
   const code = productionOrder.value
   const code = productionOrder.value
   if (!code) {
   if (!code) {
     ElMessage.warning('请输入生产单号')
     ElMessage.warning('请输入生产单号')
@@ -1533,6 +1568,7 @@ const handleSortingAreaChange = (
     sortingAreaId: sortingAreaId.value,
     sortingAreaId: sortingAreaId.value,
   })
   })
   initOrderDetailBox(type)
   initOrderDetailBox(type)
+  resetPlatform()
 }
 }
 // 手动切换仓库
 // 手动切换仓库
 const handleWarehouseChange = (value: string | number) => {
 const handleWarehouseChange = (value: string | number) => {
@@ -1553,6 +1589,7 @@ const handleWarehouseChange = (value: string | number) => {
   })
   })
   _warehouseId.value = value
   _warehouseId.value = value
   initOrderDetailBox()
   initOrderDetailBox()
+  resetPlatform()
 }
 }
 
 
 const printNormal = async () => {
 const printNormal = async () => {
@@ -1609,6 +1646,36 @@ const getSortingAreaList = async () => {
   if (res.code !== 200) return
   if (res.code !== 200) return
   sortingAreaList.value = res.data.records
   sortingAreaList.value = res.data.records
 }
 }
+
+// 筛选查询平台
+const platformList = computed(
+  () => platformJson.filter((item) => item.type === 'TIKTOK'),
+  // platformJson,
+)
+const platform = ref<string>('')
+const queriedPlatform = ref<string>('')
+const platformMatchedBoxes = computed(() => {
+  if (!queriedPlatform.value) return null
+  return (podBoxList.value || [])
+    .filter(
+      (item) =>
+        item.data?.platform?.toUpperCase() ===
+        queriedPlatform.value.toUpperCase(),
+    )
+    .map((item) => item.box)
+    .filter((box): box is number => box != null && box !== 0)
+})
+const handlePlatformChange = () => {
+  if (!platform.value) {
+    ElMessage.warning('请选择平台')
+    return
+  }
+  queriedPlatform.value = platform.value
+}
+const resetPlatform = () => {
+  platform.value = ''
+  queriedPlatform.value = ''
+}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
@@ -1654,11 +1721,21 @@ const getSortingAreaList = async () => {
   flex: 1;
   flex: 1;
   min-height: 0;
   min-height: 0;
   overflow: hidden;
   overflow: hidden;
+
+  .platform-filter {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    width: 100%;
+    margin-bottom: 5px;
+  }
+
+  .right-panel-body {
+    min-height: 0;
+    overflow: hidden;
+  }
 }
 }
-.right-panel-body {
-  min-height: 0;
-  overflow: hidden;
-}
+
 .sorting-area-content {
 .sorting-area-content {
   border: 2px solid #666;
   border: 2px solid #666;
   padding: 10px;
   padding: 10px;
@@ -1791,6 +1868,10 @@ const getSortingAreaList = async () => {
     background: #ff9900;
     background: #ff9900;
     color: #fff;
     color: #fff;
   }
   }
+  &.platform-matched {
+    background: rgb(177, 19, 19);
+    color: #fff;
+  }
 
 
   &.badge::after {
   &.badge::after {
     position: absolute;
     position: absolute;