Merge branch 'dev' into 'master'

Dev

See merge request !163

src/types/api/podCnOrder.ts

@@ -56,6 +56,7 @@ export interface SearchForm {
   blocking?: boolean
   outOfStock?: boolean
   receiverCountry?: string
+  standardDesignImage?: boolean
 }
 export interface PodCnOrderListData {
   id: number
@@ -161,6 +162,7 @@ export interface ProductList {
   sizeType?: number | null
   customTagList?: { name: string }[]
   outOfStock?: boolean
+  standardDesignImage?: 0 | 1 | 2 | null
 }
 export interface cardImages {
   title: string

src/views/logistics/logisticsCompany.vue

@@ -344,19 +344,18 @@ getLogisticsList()
           <el-dialog
             v-model="createData.show"
             :close-on-click-modal="false"
-            width="900px"
+            width="800px"
             :title="createData.title"
           >
             <el-form
               v-if="createData.show"
               ref="formRef"
-              style="padding: 30px"
               label-width="110px"
               :rules="rules"
               :model="form"
               class="el-row"
             >
-              <el-form-item class="el-col-12" label="物流公司编码" prop="code">
+              <el-form-item class="el-col-24" label="物流公司编码" prop="code">
                 <el-select
                   v-model="form.code"
                   clearable
@@ -378,7 +377,7 @@ getLogisticsList()
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item class="el-col-12" label="名称">
+              <el-form-item class="el-col-24" label="名称">
                 <el-input
                   v-model="form.name"
                   clearable
@@ -386,28 +385,28 @@ getLogisticsList()
                   placeholder="选择物流公司编码后展示"
                 ></el-input>
               </el-form-item>
-              <el-form-item class="el-col-12" label="联系人" prop="contact">
+              <el-form-item class="el-col-24" label="联系人" prop="contact">
                 <el-input
                   v-model="form.contact"
                   clearable
                   placeholder="请输入联系人"
                 ></el-input>
               </el-form-item>
-              <el-form-item class="el-col-12" label="电话/手机" prop="phone">
+              <el-form-item class="el-col-24" label="电话/手机" prop="phone">
                 <el-input
                   v-model="form.phone"
                   clearable
                   placeholder="请输入电话/手机"
                 ></el-input>
               </el-form-item>
-              <el-form-item class="el-col-12" label="网址" prop="siteUrl">
+              <el-form-item class="el-col-24" label="网址" prop="siteUrl">
                 <el-input
                   v-model="form.siteUrl"
                   clearable
                   placeholder="请输入网址"
                 ></el-input>
               </el-form-item>
-              <el-form-item class="el-col-12" label="地址" prop="address">
+              <el-form-item class="el-col-24" label="地址" prop="address">
                 <el-input
                   v-model="form.address"
                   clearable
@@ -417,7 +416,7 @@ getLogisticsList()
               <el-form-item
                 v-for="o in otherFields"
                 :key="o"
-                class="el-col-12"
+                class="el-col-24"
                 required
                 :label="o"
                 :prop="`apiData.${o}`"

src/views/order/podCN/index.vue

@@ -573,6 +573,22 @@
                   ></ElOption>
                 </ElSelect>
               </ElFormItem>
+              <ElFormItem label="规范素材">
+                <ElSelect
+                  v-model="searchForm.standardDesignImage"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  style="width: 150px"
+                >
+                  <ElOption
+                    v-for="(_, index) in ['否', '是']"
+                    :key="index"
+                    :value="!!index"
+                    :label="index === 0 ? '否' : '是'"
+                  ></ElOption>
+                </ElSelect>
+              </ElFormItem>
             </ElForm>
             <template #reference>
               <el-button type="warning" @click="searchVisible = !searchVisible">
@@ -1516,8 +1532,11 @@
                       <span class="goods-item-info-item-label"
                         >申报重量(g):</span
                       >
-                      <span :title="item.customsWeight"  class="goods-item-info-item-value">
-                       {{ item.customsWeight }}
+                      <span
+                        :title="item.customsWeight"
+                        class="goods-item-info-item-value"
+                      >
+                        {{ item.customsWeight }}
                       </span>
                     </div>
                     <div class="goods-item-info-item">
@@ -1874,6 +1893,11 @@
               {{ row.failTime?.replace('T', ' ') }}
             </div>
           </template>
+          <template #standardDesignImage="{ row }">
+            <div style="white-space: pre-line">
+              {{ getStandardDesignImageText(row.standardDesignImage) }}
+            </div>
+          </template>
           <template #failReason="{ row }">
             <span style="white-space: pre-line" v-html="row.failReason"></span>
           </template>
@@ -2959,7 +2983,6 @@ import {
 } from '@/api/podCnOrder'
 import { loadWarehouseListApi, getEmployeeListApi } from '@/api/common'
 
-
 // import { logisticsCompanyAllCodelist } from '@/api/logistics.ts'
 import { BaseRespData } from '@/types/api'
 import ChangeWayDialog from './components/ChangeWayDialog.vue'
@@ -3261,6 +3284,10 @@ const pickerOptions = {
     },
   ],
 }
+const getStandardDesignImageText = (value: number): string => {
+  const map: Record<number, string> = { 0: '否', 1: '是', 2: '混合' }
+  return map[value] ?? '-'
+}
 const timeRange = ref<string[]>([])
 const getDateRange = (days = 0, type: 'past' | 'future' = 'past') => {
   const end = dayjs()
@@ -3917,6 +3944,13 @@ const tableColumns = computed(() => {
         },
       },
       {
+        label: '规范素材',
+        minWidth: 180,
+        prop: 'standardDesignImage',
+        slot: 'standardDesignImage',
+        align: 'center',
+      },
+      {
         label: '失败原因',
         minWidth: 250,
         prop: 'failReason',