Merge branch 'dev' into 'master'

Dev

See merge request !112

components.d.ts

@@ -34,6 +34,7 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']

src/components/uploadBox.vue

@@ -20,11 +20,11 @@
         :key="index"
         class="upload-item"
       >
-        <div class="file-name" :title="upload.batchArrangeNum">
-          批次号：{{ upload.batchArrangeNum }}
+        <div class="file-batchArrangeNum" :title="upload.batchArrangeNum">
+          {{ upload.batchArrangeNum }}
         </div>
         <div class="file-name" :title="upload.fileName">
-          文件名：{{ upload.fileName }}
+          {{ upload.fileName }}
         </div>
         <div
           class="file-status"
@@ -123,6 +123,12 @@ function toggleFn() {
   flex: 1;
 }
 
+.file-batchArrangeNum {
+  font-weight: 600;
+  font-size: 14px;
+  color: #333;
+  white-space: nowrap;
+}
 .file-name {
   font-weight: 600;
   font-size: 14px;

src/types/api/podUsOrder.ts

@@ -48,6 +48,7 @@ export interface SearchForm {
 export interface PodUsOrderListData {
   id: number
   thirdOrderNumber?: string
+  batchArrangeNumber?: string
   prnUrl?: string
   factoryOrderNumber?: string
   prnDownloadStatus?: boolean

src/views/order/podUs/index.vue

@@ -1761,17 +1761,30 @@
               {{ row.automaticComposing ? '是' : '否' }}
             </div>
           </template>
-          <template #prn="{ row }">
-            <div style="display: flex">
-              <span :title="fileName(row)" class="flex-1">{{
-                fileName(row)
-              }}</span>
+          <template #composingParam="{ row }">
+            <div style="white-space: pre-line">
+              {{ row.composingParam?.split(';').join('\n') }}
+            </div>
+          </template>
+          <template #failTime="{ row }">
+            <div style="white-space: pre-line">
+              {{ row.failTime?.replace('T', ' ') }}
+            </div>
+          </template>
+          <template #failReason="{ row }">
+            <span style="white-space: pre-line" v-html="row.failReason"></span>
+          </template>
+          <template #operate="{ row }">
+            <div
+              v-if="status === 'BATCH_DOWNLOAD'"
+              class="operate-box-vertical"
+            >
               <el-link
                 :disabled="row.isUpload"
                 underline="never"
                 type="success"
                 @click="uploadFile(row)"
-                >上传</el-link
+              >上传PRN</el-link
               >
               <el-icon
                 v-if="row.isUpload"
@@ -1784,9 +1797,10 @@
                 :disabled="!row.prnUrl"
                 style="margin-left: 8px"
                 underline="never"
-                type="primary"
+                :title="fileName(row)"
+                type="success"
                 @click="downloadRowProFile(row)"
-                >下载
+              >下载PRN
               </el-link>
               <el-icon
                 v-if="row.prnDownloadStatus"
@@ -1795,30 +1809,12 @@
               >
                 <CircleCheckFilled />
               </el-icon>
-            </div>
-          </template>
-          <template #composingParam="{ row }">
-            <div style="white-space: pre-line">
-              {{ row.composingParam?.split(';').join('\n') }}
-            </div>
-          </template>
-          <template #failTime="{ row }">
-            <div style="white-space: pre-line">
-              {{ row.failTime?.replace('T', ' ') }}
-            </div>
-          </template>
-          <template #failReason="{ row }">
-            <span style="white-space: pre-line" v-html="row.failReason"></span>
-          </template>
-          <template #operate="{ row }">
-            <div
-              v-if="status === 'BATCH_DOWNLOAD'"
-              class="operate-box-vertical"
-            >
               <span class="operate-item">
+
                 <ElButton
                   :disabled="!row.url && !row.tiffUrl"
                   link
+                  title="下载PNG或TIFF"
                   type="primary"
                   @click="handleDownload(row)"
                 >
@@ -3564,13 +3560,7 @@ const tableColumns = computed(() => {
         prop: 'employeeAccount',
         align: 'center',
       },
-      {
-        label: '失败原因',
-        minWidth: 250,
-        prop: 'failReason',
-        slot: 'failReason',
-        align: 'left',
-      },
+
       {
         label: '创建时间',
         width: 180,
@@ -3593,11 +3583,11 @@ const tableColumns = computed(() => {
         align: 'center',
       },
       {
-        label: 'PRN文件',
-        width: 300,
-        prop: 'automaticComposing',
-        slot: 'prn',
-        align: 'right',
+        label: '失败原因',
+        minWidth: 250,
+        prop: 'failReason',
+        slot: 'failReason',
+        align: 'left',
       },
       {
         label: '排版参数',
@@ -3609,7 +3599,7 @@ const tableColumns = computed(() => {
       {
         label: '操作',
         slot: 'operate',
-        width: 300,
+        width: 400,
         align: 'center',
         fixed: 'right',
         prop: 'operate',
@@ -4207,19 +4197,25 @@ const uploadFile = (row: PodUsOrderListData) => {
   input.type = 'file'
   input.multiple = false
   input?.click()
-  row.isUpload = true
 
   input.onchange = async function () {
     try {
       if (input.files && input.files.length) {
+        if(!input.files[0].name.startsWith(row.batchArrangeNumber || '')) {
+          await ElMessageBox.confirm(`文件名不是以批次号开头是否继续上传?`, '提示', {
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+        }
+        row.isUpload = true
         uploadList.value.push(row)
 
         const fm = new FormData()
-        fm.append('file', input.files?.[0])
+        fm.append('file', (input.files as never)?.[0])
         row.fileName = input.files?.[0]?.name
         // console.log(4219, input.files?.[0])
 
-        const res = await uploadPRNFile(row.id, fm)
+        const res = await uploadPRNFile(row.id, fm as never)
         row.prnUrl = res.message
       }
     } finally {