소스 검색

change: payment request record 国内运费参数调整.

peter 5 달 전
부모
커밋
5ca458eb8f
2개의 변경된 파일25개의 추가작업 그리고 7개의 파일을 삭제
  1. 6 4
      src/pages/payment-record2/components/upload.vue
  2. 19 3
      src/pages/payment-record2/index.vue

+ 6 - 4
src/pages/payment-record2/components/upload.vue

@@ -345,12 +345,14 @@ const next = (formEl: FormInstance | undefined) => {
               },
             ) as IPoItem[]
             jsonData.forEach((i) => {
-              console.log(i.Issue_Date, 'date')
+              // console.log(i.Issue_Date, 'date')
               tableData.value.push({
                 ...i,
-                Issue_Date: dayjs(
-                  new Date(i.Issue_Date).getTime() + 43000,
-                ).format('YYYY-MM-DD'),
+                Issue_Date: i.Issue_Date
+                  ? dayjs(new Date(i.Issue_Date).getTime() + 43000).format(
+                      'YYYY-MM-DD',
+                    )
+                  : '',
                 Weight_Unit: form.value.weightUnit,
                 Currency: form.value.currency,
                 payment_type: form.value.paymentType,

+ 19 - 3
src/pages/payment-record2/index.vue

@@ -48,6 +48,7 @@
           >
             Save
           </el-button>
+          <!-- <el-button @click="spliteDomesticTrackingAndPO">test</el-button> -->
         </div>
         <div class="logo-area">
           <img
@@ -794,13 +795,28 @@ const spliteDomesticTrackingAndPO = function () {
       },
     }
     if (i.PO_Number) {
-      t.push(Object.assign({ PO_id: i.PO_Number }, temp))
+      t.push(
+        Object.assign(
+          { PO_id: i.PO_Number, Name: `${i.Tracking_Number}-${i.PO_Number}` },
+          temp,
+        ),
+      )
     }
     if (i.PO_Number2) {
-      t.push(Object.assign({ PO_id: i.PO_Number2 }, temp))
+      t.push(
+        Object.assign(
+          { PO_id: i.PO_Number2, Name: `${i.Tracking_Number}-${i.PO_Number2}` },
+          temp,
+        ),
+      )
     }
     if (i.PO_Number3) {
-      t.push(Object.assign({ PO_id: i.PO_Number3 }, temp))
+      t.push(
+        Object.assign(
+          { PO_id: i.PO_Number3, Name: `${i.Tracking_Number}-${i.PO_Number3}` },
+          temp,
+        ),
+      )
     }
     return t
   }, [] as any[])