Merge branch 'dev' into 'master'

Dev

See merge request !176

src/api/axios.ts

@@ -35,7 +35,6 @@ axios.interceptors.response.use(
   (response) => {
   (response) => {
     // 1. 判断响应码
     // 1. 判断响应码
     const data = response.data
     const data = response.data
-
     if (data && typeof data === 'object' && typeof data.code === 'number') {
     if (data && typeof data === 'object' && typeof data.code === 'number') {
       // token 过期
       // token 过期
       if (data.code === 403) {
       if (data.code === 403) {

src/types/api/podCnOrder.ts

@@ -15,6 +15,8 @@ export interface ExportParams extends SearchForm {
 }
 }
 export interface SearchForm {
 export interface SearchForm {
   timeType?: number | null
   timeType?: number | null
+  newStandard?: number | string
+  standardDesignImage?:0 | 1 | 2 | null
   shopNumber?: string
   shopNumber?: string
   productMark?: string
   productMark?: string
   shipmentType?: string | number
   shipmentType?: string | number
@@ -57,7 +59,6 @@ export interface SearchForm {
   blocking?: boolean
   blocking?: boolean
   outOfStock?: boolean
   outOfStock?: boolean
   receiverCountry?: string
   receiverCountry?: string
-  standardDesignImage?: boolean
 }
 }
 export interface PodCnOrderListData {
 export interface PodCnOrderListData {
   id: number
   id: number

src/views/order/podCN/FastProduction.vue

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

src/views/order/podCN/PodMakeOrder.vue

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

src/views/order/podCN/index.vue

@@ -186,6 +186,23 @@
             style="width: 150px"
             style="width: 150px"
           />
           />
         </ElFormItem>
         </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="生产单号">
         <ElFormItem v-if="status !== 'BATCH_DOWNLOAD'" label="生产单号">
           <ElInput
           <ElInput
             v-model.trim="searchForm.factorySubOrderNumber"
             v-model.trim="searchForm.factorySubOrderNumber"
@@ -574,19 +591,22 @@
                   ></ElOption>
                   ></ElOption>
                 </ElSelect>
                 </ElSelect>
               </ElFormItem>
               </ElFormItem>
-              <ElFormItem label="规范素材">
+              <ElFormItem
+                label="规范素材"
+              >
                 <ElSelect
                 <ElSelect
-                  v-model="searchForm.standardDesignImage"
+                  v-model="searchForm.newStandard"
                   placeholder="请选择"
                   placeholder="请选择"
                   clearable
                   clearable
                   filterable
                   filterable
+                  :teleported="false"
                   style="width: 150px"
                   style="width: 150px"
                 >
                 >
                   <ElOption
                   <ElOption
                     v-for="(_, index) in ['否', '是']"
                     v-for="(_, index) in ['否', '是']"
                     :key="index"
                     :key="index"
-                    :value="!!index"
-                    :label="index === 0 ? '否' : '是'"
+                    :value="index"
+                    :label="['否', '是'][index]"
                   ></ElOption>
                   ></ElOption>
                 </ElSelect>
                 </ElSelect>
               </ElFormItem>
               </ElFormItem>
@@ -3214,6 +3234,7 @@ const detailData = ref({})
 const [searchForm, resetSearchForm] = useValue<SearchForm>({
 const [searchForm, resetSearchForm] = useValue<SearchForm>({
   timeType: 1,
   timeType: 1,
   shopNumber: '',
   shopNumber: '',
+  newStandard: '',
   replaceShipment: '',
   replaceShipment: '',
   productMark: '',
   productMark: '',
   shipmentType: '',
   shipmentType: '',
@@ -3952,12 +3973,11 @@ const tableColumns = computed(() => {
       },
       },
       {
       {
         label: '规范素材',
         label: '规范素材',
-        minWidth: 180,
+        minWidth: 130,
         prop: 'standardDesignImage',
         prop: 'standardDesignImage',
         slot: 'standardDesignImage',
         slot: 'standardDesignImage',
         align: 'center',
         align: 'center',
-      },
-      {
+      },{
         label: '失败原因',
         label: '失败原因',
         minWidth: 250,
         minWidth: 250,
         prop: 'failReason',
         prop: 'failReason',
@@ -4209,6 +4229,7 @@ const {
     baseparams.tagsIdArr && delete baseparams.tagsIdArr
     baseparams.tagsIdArr && delete baseparams.tagsIdArr
     // 批量下载
     // 批量下载
     if (status.value === 'BATCH_DOWNLOAD') {
     if (status.value === 'BATCH_DOWNLOAD') {
+      delete baseparams.newStandard
       return batchDownloadApi(
       return batchDownloadApi(
         {
         {
           ...baseparams,
           ...baseparams,