From f14ea940fb32105de8b592992e3f53c62f31d84d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 22 一月 2026 16:42:51 +0800
Subject: [PATCH] 2026.1.22

---
 pages/mLedger/ledgerupload/ledgerupload.js |   92 ++++++++++++++++++++++++++-------------------
 1 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/pages/mLedger/ledgerupload/ledgerupload.js b/pages/mLedger/ledgerupload/ledgerupload.js
index 38baa06..df3c757 100644
--- a/pages/mLedger/ledgerupload/ledgerupload.js
+++ b/pages/mLedger/ledgerupload/ledgerupload.js
@@ -30,8 +30,6 @@
     type: 0,
     // 鍘嗗彶鏈�鏂拌褰�
     lastLedger: undefined,
-
-    
   },
 
   /**
@@ -42,12 +40,13 @@
     this.getOpenerEventChannel().on(
       'acceptDataFromOpenerPage',
       function (data) {
-        data.ledger.description = data.ledger.description.replaceAll(
+        data.ledger.description = data.ledger.description?.replaceAll(
           '\\n',
           '\n',
         );
         that.setData({
           ledger: data.ledger,
+          time: moment(data.ledger.updateDate).format('YYYY骞碝M鏈圖D鏃�'),
           indexGroup: data.indexGroup,
           type: data.type,
           taskId: data.taskId,
@@ -65,10 +64,15 @@
 
         // 瀵逛簬鍙鍒剁殑骞朵笖涓嶆槸閲嶄紶鐘舵�佺殑鍙拌处锛岃幏鍙栨渶鏂扮殑鍘嗗彶璁板綍鐢ㄤ簬澶嶅埗
         if (data.ledger.copy && !data.reUpload) {
-          that.getLatestLedger()
+          that.getLatestLedger();
         }
       },
     );
+    this.setData({
+      loadingText: '涓婁紶涓�',
+      loadCompleteText: '涓婁紶瀹屾垚',
+      timeoutText: '涓婁紶瓒呮椂',
+    });
   },
 
   /**
@@ -78,15 +82,15 @@
     if (this.data.reUpload) {
       //do nothing
       return;
-    } else if (this.data.ledger.path1) {
-      let imgFiles = this.data.ledger.path1;
+    } else if (this.data.ledger._files) {
+      let imgFiles = this.data.ledger._files;
       let remark = this.data.remark;
       if (this.data.ledger.remark1) remark = this.data.ledger.remark1;
       let remarkDisable = true;
       this.setData({
         imgFiles,
         remark,
-        remarkDisable
+        remarkDisable,
       });
     } else if (this.data.ledger.upLoad) {
       var that = this;
@@ -101,14 +105,14 @@
             if (res.length > 0) {
               let detail = res[0];
               if (detail.upLoad) {
-                let imgFiles = detail.path1;
+                let imgFiles = detail._files;
                 let remark = detail.remark1 ? detail.remark1 : '';
                 let remarkDisable = true;
                 that.setData({
                   imgFiles,
                   remark,
                   remarkDisable,
-                  detail
+                  detail,
                 });
               }
             }
@@ -120,14 +124,14 @@
             if (res.success) {
               let detail = res.data;
               if (detail.upLoad) {
-                let imgFiles = detail.path1;
+                let imgFiles = detail._files;
                 let remark = detail.remark1 ? detail.remark1 : '';
                 let remarkDisable = true;
                 that.setData({
                   imgFiles,
                   remark,
                   remarkDisable,
-                  detail
+                  detail,
                 });
               }
             }
@@ -143,33 +147,45 @@
     var typeId = this.data.ledger.ledgerSubTypeId;
     var sceneType = app.globalData.userInfo.extension2;
     this.setData({
-      latestLedgerLoading: true
-    })
+      latestLedgerLoading: true,
+    });
     ledgerservice.getLedgerDetail(userId, typeId, sceneType, null, {
-      success: (res) => {
+      success: res => {
         if (res.length > 0) {
-          const ledger = res[0]
+          const ledger = res[0];
           this.setData({
             lastLedger: {
               ...ledger,
-              _updateTimeStr: moment(ledger.updateDate).format('YYYY骞碝M鏈圖D鏃�')
-            }
-          })
+              _updateTimeStr: moment(ledger.updateDate).format(
+                'YYYY骞碝M鏈圖D鏃�',
+              ),
+            },
+          });
         }
       },
       complete: () => {
         this.setData({
-          latestLedgerLoading: false
-        })
-      }
+          latestLedgerLoading: false,
+        });
+      },
     });
+  },
+
+  uploadFileFail(e) {
+    const { type, index } = e.detail;
+    if (type == 1) {
+      wx.showToast({
+        title: `鏂囦欢杩囧ぇ`,
+        icon: 'error',
+      });
+    }
   },
 
   // 涓婁紶鍙拌处
   onSubmit: function () {
     if (this.data.imgFiles.length == 0) {
       wx.showToast({
-        title: '璇疯嚦灏戦�夋嫨涓�寮犲浘鐗�',
+        title: '璇疯嚦灏戦�夋嫨涓�涓枃浠�',
         icon: 'none',
       });
     } else {
@@ -191,7 +207,7 @@
   // 寤剁敤澶嶅埗鍙拌处
   onCopyLedger() {
     if (this.data.latestLedgerLoading) {
-      return
+      return;
     } else if (this.data.lastLedger == undefined) {
       wx.showToast({
         title: '娌℃湁鍙欢鐢ㄧ殑璁板綍',
@@ -227,13 +243,13 @@
         break;
       case 2:
         if (this.data.type == 0) {
-          const {
-            lastLedger
-          } = this.data
-          const copyLedgerList = [{
-            subTypeId: lastLedger.ledgerSubTypeId,
-            time: `${lastLedger.year}-${lastLedger.month}`
-          }]
+          const { lastLedger } = this.data;
+          const copyLedgerList = [
+            {
+              subTypeId: lastLedger.ledgerSubTypeId,
+              time: `${lastLedger.year}-${lastLedger.month}`,
+            },
+          ];
           this._uploadCopyLedger(copyLedgerList);
         }
         break;
@@ -278,10 +294,10 @@
 
   //鍥剧墖鏀惧ぇ棰勮
   previewImage(e) {
-    const {
-      index
-    } = e.currentTarget.dataset;
-    const previewImageUrls = this.data.imgFiles;
+    const { index } = e.currentTarget.dataset;
+    const previewImageUrls = this.data.imgFiles
+      .filter(f => f.type == 'image')
+      .map(f => f.url);
     this.setData({
       previewImageUrls,
       previewCurrent: index,
@@ -291,11 +307,9 @@
 
   // 鍙拌处澶囨敞鐩戝惉
   onRemarkChange(e) {
-    const {
-      value
-    } = e.detail;
+    const { value } = e.detail;
     this.setData({
-      remark: value
+      remark: value,
     });
   },
-});
\ No newline at end of file
+});

--
Gitblit v1.9.3