Merge branch 'dev' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_log_test

# Conflicts: # src/api/axios.ts

Merge branch 'dev' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_log_test
# Conflicts: # src/api/axios.ts
a92a5e10 · zhuzhequan · b05ed9f6 · 591b3659 · a92a5e10 · a92a5e10
Commit a92a5e10 authored Mar 30, 2026 by zhuzhequan
9 changed files
--- a/src/types/api/podCnOrder.ts
+++ b/src/types/api/podCnOrder.ts
@@ -15,6 +15,8 @@ export interface ExportParams extends SearchForm {
 }
 export interface SearchForm {
  timeType?: number | null
+  newStandard?: number | string
+  standardDesignImage?:0 | 1 | 2 | null
  shopNumber?: string
  productMark?: string
  shipmentType?: string | number
@@ -57,7 +59,6 @@ export interface SearchForm {
  blocking?: boolean
  outOfStock?: boolean
  receiverCountry?: string
-  standardDesignImage?: boolean
 }
 export interface PodCnOrderListData {
  id: number

--- a/src/views/logistics/logisticsTracking.vue
+++ b/src/views/logistics/logisticsTracking.vue
@@ -102,7 +102,7 @@
                        <div>{{ getStatus(row.orderStatus) }}</div>
                      </template>
                      <template #shipmentType="{ row }">
-                        {{ ['自有物流', '工厂物流'][row.shipmentType] }}
+                        {{ ['自有物流', '九猫统筹物流'][row.shipmentType] }}
                      </template>
                      <template #shippingAge="{ row }">
                        {{ getShippingAge(row) }}

--- a/src/views/order/orderTracking/index.vue
+++ b/src/views/order/orderTracking/index.vue
@@ -879,7 +879,7 @@ onMounted(() => {
              style="width: 150px"
            >
              <ElOption
-                v-for="(item, index) in ['自有物流', '工厂物流']"
+                v-for="(item, index) in ['自有物流', '九猫统筹物流']"
                :key="index"
                :value="index"
                :label="item"
@@ -1175,7 +1175,7 @@ onMounted(() => {
                    <div>{{ getStatus(row.status) }}</div>
                  </template>
                  <template #shipmentType="{ row }">
-                    {{ ['自有物流', '工厂物流'][row.shipmentType] }}
+                    {{ ['自有物流', '九猫统筹物流'][row.shipmentType] }}
                  </template>
                </TableView>
              </div>

--- a/src/views/order/orderTracking/indexcn.vue
+++ b/src/views/order/orderTracking/indexcn.vue
@@ -1156,7 +1156,7 @@ onMounted(() => {
                    <ElOption
                      v-for="(item, index) in searchForm.replaceShipment === 0
                        ? ['自提', '快递']
-                        : ['自有物流', '工厂物流']"
+                        : ['自有物流', '九猫统筹物流']"
                      :key="index"
                      :value="index"
                      :label="item"
@@ -1267,7 +1267,7 @@ onMounted(() => {
                    {{
                      (row.replaceShipment === 0
                        ? ['自提', '快递']
-                        : ['自有物流', '工厂物流'])[row.shipmentType]
+                        : ['自有物流', '九猫统筹物流'])[row.shipmentType]
                    }}
                  </template>
                  <template #replaceShipment="{ row }">

--- a/src/views/order/podCN/FastProduction.vue
+++ b/src/views/order/podCN/FastProduction.vue
@@ -221,7 +221,7 @@ const historyData = ref<HistoryDataItem[]>([])
 const placeholderText = ref('')
 const sendNum = ref(0)
 const isDownloadImage = ref(false)
-const isAutoSure = ref(false)
+const isAutoSure = ref(true)
 const detail = ref<PodOrderRes>({
  id: -1,
  podJomallOrderCnId: -1,
@@ -290,7 +290,7 @@ watch(
      trackingNumberRef.value && trackingNumberRef.value.focus()
      TrackingNumber.value = ''
-      isAutoSure.value = false
+      isAutoSure.value = true
      sendNum.value = 0
    }
  },

--- a/src/views/order/podCN/PodMakeOrder.vue
+++ b/src/views/order/podCN/PodMakeOrder.vue
@@ -194,7 +194,7 @@
          <div class="box-top-item-btn">
            <ElButton
              type="primary"
-              @click="podOrderDetailsData && print(podOrderDetailsData, true)"
+              @click="manualPrint"
              >手动打印
            </ElButton>
            <ElButton type="primary" @click="printNormal">普货拣货 </ElButton>
@@ -603,6 +603,14 @@ const messageChange = (data: WebSocketMessage) => {
    setPodBoxList(more)
  }
 }
+const manualPrint = ()=>{
+  if(podOrderDetailsData.value){
+    print(podOrderDetailsData.value, true )
+    productionOrderRef.value.focus()
+  }
+}
 const setPodBoxList = (data: WebSocketMessage) => {
  const obj = data.txt
  if (obj && typeof obj === 'string') {
@@ -634,7 +642,9 @@ const printNormal = async () => {
  }
  const res = await printNormalPdf(arr.join())
  ElMessage.success('操作成功')
+  productionOrderRef.value.focus()
  window.open(filePath + res.message)
 }
 const initPrintDevice = () => {
  const lodop = getCLodop(null, null)

--- a/src/views/order/podCN/index.vue
+++ b/src/views/order/podCN/index.vue
@@ -186,6 +186,23 @@
            style="width: 150px"
          />
        </ElFormItem>
+        <ElFormItem v-if="status === 'BATCH_DOWNLOAD'" label="规范素材">
+          <ElSelect
+            v-model="searchForm.standardDesignImage"
+            placeholder="请选择"
+            clearable
+            filterable
+            :teleported="false"
+            style="width: 150px"
+          >
+            <ElOption
+              v-for="(_, index) in ['否', '是','混合']"
+              :key="index"
+              :value="index"
+              :label="['否', '是','混合'][index]"
+            ></ElOption>
+          </ElSelect>
+        </ElFormItem>
        <ElFormItem v-if="status !== 'BATCH_DOWNLOAD'" label="生产单号">
          <ElInput
            v-model.trim="searchForm.factorySubOrderNumber"
@@ -458,7 +475,7 @@
                  style="width: 150px"
                >
                  <ElOption
-                    v-for="(item, index) in ['自有物流', '工厂物流']"
+                    v-for="(item, index) in ['自有物流', '九猫统筹物流']"
                    :key="index"
                    :value="index"
                    :label="item"
@@ -574,19 +591,22 @@
                  ></ElOption>
                </ElSelect>
              </ElFormItem>
-              <ElFormItem label="规范素材">
+              <ElFormItem
+                label="规范素材"
+              >
                <ElSelect
-                  v-model="searchForm.standardDesignImage"
+                  v-model="searchForm.newStandard"
                  placeholder="请选择"
                  clearable
                  filterable
+                  :teleported="false"
                  style="width: 150px"
                >
                  <ElOption
                    v-for="(_, index) in ['否', '是']"
                    :key="index"
-                    :value="!!index"
+                    :value="index"
-                    :label="index === 0 ? '否' : '是'"
+                    :label="['否', '是'][index]"
                  ></ElOption>
                </ElSelect>
              </ElFormItem>
@@ -786,7 +806,7 @@
                  >
                </ElDropdownMenu>
              </template> -->
-              <!-- 代发:0.自有物流 1.工厂物流; 不代发: 0.自提 1.快递-->
+              <!-- 代发:0.自有物流 1.九猫统筹物流; 不代发: 0.自提 1.快递-->
              <template
                v-if="
                  status === 'CREATE_LOGISTICS' || status === 'WAIT_SHIPMENT'
@@ -1624,7 +1644,7 @@
                >
                  {{
                    row.replaceShipment === 1
-                      ? ['自有物流', '工厂物流'][row.shipmentType]
+                      ? ['自有物流', '九猫统筹物流'][row.shipmentType]
                      : ['自提', '快递'][row.shipmentType]
                  }}
                </span>
@@ -3214,6 +3234,7 @@ const detailData = ref({})
 const [searchForm, resetSearchForm] = useValue<SearchForm>({
  timeType: 1,
  shopNumber: '',
+  newStandard: '',
  replaceShipment: '',
  productMark: '',
  shipmentType: '',
@@ -3952,12 +3973,11 @@ const tableColumns = computed(() => {
      },
      {
        label: '规范素材',
-        minWidth: 180,
+        minWidth: 130,
        prop: 'standardDesignImage',
        slot: 'standardDesignImage',
        align: 'center',
-      },
+      },{
-      {
        label: '失败原因',
        minWidth: 250,
        prop: 'failReason',
@@ -4209,6 +4229,7 @@ const {
    baseparams.tagsIdArr && delete baseparams.tagsIdArr
    // 批量下载
    if (status.value === 'BATCH_DOWNLOAD') {
+      delete baseparams.newStandard
      return batchDownloadApi(
        {
          ...baseparams,

--- a/src/views/order/podUs/index.vue
+++ b/src/views/order/podUs/index.vue
@@ -425,7 +425,7 @@
                        shipmentList=['自提','快递']
                        searchForm.shipmentType=0
                      }else{
-                        shipmentList=['自有物流', '工厂物流']
+                        shipmentList=['自有物流', '九猫统筹物流']
                        searchForm.shipmentType=''
                      }
                    }
@@ -1695,7 +1695,7 @@
                  {{
                    row.shipmentType == 0 && row.replaceShipment == 0
                      ? '自提'
-                      : ['自有物流', '工厂物流'][row.shipmentType]
+                      : ['自有物流', '九猫统筹物流'][row.shipmentType]
                  }}
                </span>
              </div>
@@ -3759,7 +3759,7 @@ const handleBatchDelete = async (type: string, id?: string) => {
  }
 }
-const shipmentList = ref(['自有物流', '工厂物流'])
+const shipmentList = ref(['自有物流', '九猫统筹物流'])
 // 批量下载 重新排版
 const handleReComposingDesign = async () => {

--- a/src/views/podUsBillOrder/index.vue
+++ b/src/views/podUsBillOrder/index.vue
@@ -777,7 +777,7 @@
                    >
                      <template #default="{ row }">
                        <span v-if="row.order">{{
-                          row.order.shipment_type == 1 ? '工厂物流' : '自我物流'
+                          row.order.shipment_type == 1 ? '九猫统筹物流' : '自我物流'
                        }}</span>
                      </template>
                    </el-table-column>