新功能提交

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?: number | string
   shopNumber?: string
   shopNumber?: string
   productMark?: string
   productMark?: string
   shipmentType?: string | number
   shipmentType?: string | number

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"
@@ -590,6 +607,25 @@
                   ></ElOption>
                   ></ElOption>
                 </ElSelect>
                 </ElSelect>
               </ElFormItem>
               </ElFormItem>
+              <ElFormItem
+                label="规范素材"
+              >
+                <ElSelect
+                  v-model="searchForm.newStandard"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  :teleported="false"
+                  style="width: 150px"
+                >
+                  <ElOption
+                    v-for="(_, index) in ['否', '是','混合']"
+                    :key="index"
+                    :value="index"
+                    :label="['否', '是','混合'][index]"
+                  ></ElOption>
+                </ElSelect>
+              </ElFormItem>
             </ElForm>
             </ElForm>
             <template #reference>
             <template #reference>
               <el-button type="warning" @click="searchVisible = !searchVisible">
               <el-button type="warning" @click="searchVisible = !searchVisible">
@@ -1908,6 +1944,9 @@
           <template #failReason="{ row }">
           <template #failReason="{ row }">
             <span style="white-space: pre-line" v-html="row.failReason"></span>
             <span style="white-space: pre-line" v-html="row.failReason"></span>
           </template>
           </template>
+          <template #standardDesignImage="{ row }">
+            {{(row.standardDesignImage || row.standardDesignImage===0)?['否', '是','混合'][row.standardDesignImage ]: ''}}
+          </template>
           <template #operate="{ row }">
           <template #operate="{ row }">
             <div
             <div
               v-if="status === 'BATCH_DOWNLOAD'"
               v-if="status === 'BATCH_DOWNLOAD'"
@@ -3214,6 +3253,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 +3992,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 +4248,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,