From da64db403db93e28b6af86b8e29fac96aa85e117 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sun, 30 Mar 2025 18:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/workDetailFile/workDetailFile.html        | 15 +++++++--------
 .../workDetailTaskItem/workDetailTaskItem.html   | 14 ++++++++++----
 .../oa/workDetailTaskItem/workDetailTaskItem.js  |  5 +++++
 public/pages/oa/addWork/addWork.js               |  7 ++++---
 public/pages/oa/editWork/editWork.js             | 11 ++++++-----
 public/pages/oa/workDetail/workDetail.html       | 16 ++++++++++++----
 public/pages/oa/workDetail/workDetail.js         |  7 ++++++-
 7 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/public/components/oa/workDetailFile/workDetailFile.html b/public/components/oa/workDetailFile/workDetailFile.html
index c5c525ba2..25bad9bf3 100644
--- a/public/components/oa/workDetailFile/workDetailFile.html
+++ b/public/components/oa/workDetailFile/workDetailFile.html
@@ -56,20 +56,19 @@
                     {{event.staffName}}
                 </td>
                 <td class="text-center" v-if="event.fileType != 'S'">
-                    <a :href="event.pathUrl" target="_blank">下载</a>
+                        <div v-if="event.pathUrl.endsWith('jpg') || event.pathUrl.endsWith('png')">
+                            <img style="width: 60px; height: 60px;" class="border-radius" v-bind:src="event.pathUrl"
+                                v-on:click="_viewTaskFileImg(event.pathUrl)" />
+                        </div>
+                        <div v-else>
+                            <a :href="event.pathUrl" target="_blank">下载</a>
+                        </div>
                 </td>
                 <td class="text-center" v-else>
                     --
                 </td>
             </tr>
             </tbody>
-            <tfoot>
-            <tr>
-                <td colspan="2">
-                    <ul class="pagination float-right"></ul>
-                </td>
-            </tr>
-            </tfoot>
         </table>
         <!-- 分页 -->
         <div class="text-right">
diff --git a/public/components/oa/workDetailTaskItem/workDetailTaskItem.html b/public/components/oa/workDetailTaskItem/workDetailTaskItem.html
index 7980a6890..ff94da230 100644
--- a/public/components/oa/workDetailTaskItem/workDetailTaskItem.html
+++ b/public/components/oa/workDetailTaskItem/workDetailTaskItem.html
@@ -54,8 +54,8 @@
                     <tbody>
                         <tr v-for="item in workDetailTaskItemInfo.items">
                             <td class="text-left" style="width: 400px;">
-                                <div >
-                                {{item.content}}
+                                <div>
+                                    {{item.content}}
                                 </div>
                             </td>
                             <td class="text-center">
@@ -70,8 +70,14 @@
                                 {{item.remark}}
                             </td>
                             <td class="text-center">
-                                <div v-if="item.pathUrl">
-                                    <a :href="item.pathUrl" target="_blank">下载</a>
+                                <div v-if="item.pathUrls" v-for="(url,index) in item.pathUrls">
+                                    <div v-if="url.endsWith('jpg') || url.endsWith('png')">
+                                        <img style="width: 60px; height: 60px;" class="border-radius" v-bind:src="url"
+                                            v-on:click="_viewTaskFileImg(url)" />
+                                    </div>
+                                    <div v-else>
+                                        <a :href="url" target="_blank">下载</a>
+                                    </div>
                                 </div>
                                 <div v-else> - </div>
                             </td>
diff --git a/public/components/oa/workDetailTaskItem/workDetailTaskItem.js b/public/components/oa/workDetailTaskItem/workDetailTaskItem.js
index 0f1ecee12..6387790da 100644
--- a/public/components/oa/workDetailTaskItem/workDetailTaskItem.js
+++ b/public/components/oa/workDetailTaskItem/workDetailTaskItem.js
@@ -75,6 +75,11 @@
                 $that.workDetailTaskItemInfo.taskId = _task.taskId;
                 $that._loadWorkDetailTaskItemData();
             },
+            _viewTaskFileImg: function (_url) {
+                vc.emit('viewImage', 'showImage', {
+                    url: _url
+                });
+            },
         }
     });
 })(window.vc);
\ No newline at end of file
diff --git a/public/pages/oa/addWork/addWork.js b/public/pages/oa/addWork/addWork.js
index 6ec8f149b..996cbd2c9 100644
--- a/public/pages/oa/addWork/addWork.js
+++ b/public/pages/oa/addWork/addWork.js
@@ -10,7 +10,7 @@
                 endTime:'',
                 staffs:[],
                 copyStaffs:[],
-                pathUrl:'',
+                pathUrls:[],
                 contents:[],
                 period:'',
                 months: [],
@@ -40,8 +40,9 @@
             vc.emit('textarea','init',$that.addWorkInfo);
         },
         _initEvent: function () {
-            vc.on('addWorkInfo', 'notifyFile', function (_param) {
-                $that.addWorkInfo.pathUrl = _param.realFileName;
+            vc.on('addWork', 'notifyFile', function (_param) {
+                $that.addWorkInfo.pathUrls = [];
+                $that.addWorkInfo.pathUrls.push(_param.realFileName);
             })
         },
         methods: {
diff --git a/public/pages/oa/editWork/editWork.js b/public/pages/oa/editWork/editWork.js
index 6c8179fdd..cbbf6a9b9 100644
--- a/public/pages/oa/editWork/editWork.js
+++ b/public/pages/oa/editWork/editWork.js
@@ -11,7 +11,7 @@
                 endTime: '',
                 staffs: [],
                 copyStaffs: [],
-                pathUrl: '',
+                pathUrls: [],
                 contents:[],
                 period: '',
                 months: [],
@@ -38,8 +38,9 @@
             vc.emit('textarea', 'init', $that.editWorkInfo);
         },
         _initEvent: function () {
-            vc.on('editWorkInfo', 'notifyFile', function (_param) {
-                $that.editWorkInfo.pathUrl = _param.realFileName;
+            vc.on('editWork', 'notifyFile', function (_param) {
+                $that.editWorkInfo.pathUrls = [];
+                $that.editWorkInfo.pathUrls.push(_param.realFileName);
             })
         },
         methods: {
@@ -179,8 +180,8 @@
                     function (json, res) {
                         let _json = JSON.parse(json);
                         vc.copyObject(_json.data[0], $that.editWorkInfo);
-                        if(_json.data[0].pathUrl){
-                            vc.emit('uploadFile', 'notifyVedio',_json.data[0].pathUrl);
+                        if(_json.data[0].pathUrls){
+                            vc.emit('uploadFile', 'notifyVedio',_json.data[0].pathUrls[0]);
                         }
                         $that.editWorkInfo.contents.forEach(_c=>{
                             _c.id = vc.uuid();
diff --git a/public/pages/oa/workDetail/workDetail.html b/public/pages/oa/workDetail/workDetail.html
index dae483902..7f03ffc65 100644
--- a/public/pages/oa/workDetail/workDetail.html
+++ b/public/pages/oa/workDetail/workDetail.html
@@ -103,13 +103,21 @@
                         </div>
                     </div>
                     <div class="col-sm-3">
-                        <div class="form-group">
+                        <div class="form-group flex justify-start">
                             <label class="col-form-label">
                                 <vc:i18n name="附件：" namespace="workDetailInfo"></vc:i18n>
                             </label>
-                            <label class="">
-                                <a :href="workDetailInfo.pathUrl" v-if="workDetailInfo.pathUrl">下载</a>
-                            </label>
+                            <div class="flex justify-start">
+                                <div class="" v-if="workDetailInfo.pathUrls" v-for="(url,index) in workDetailInfo.pathUrls">
+                                    <div v-if="url.endsWith('jpg') || url.endsWith('png')">
+                                        <img style="width: 60px; height: 60px;" class="border-radius" v-bind:src="url"
+                                            v-on:click="_viewTaskFileImg(url)" />
+                                    </div>
+                                    <div v-else>
+                                        <a :href="url" target="_blank">下载</a>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/public/pages/oa/workDetail/workDetail.js b/public/pages/oa/workDetail/workDetail.js
index 2d8c3ee04..aab86e3fd 100644
--- a/public/pages/oa/workDetail/workDetail.js
+++ b/public/pages/oa/workDetail/workDetail.js
@@ -19,7 +19,7 @@
                 stateName: "",
                 createTime: '',
                 content: '',
-                pathUrl: '',
+                pathUrls: [],
                 _currentTab: 'workDetailContent',
                 contents:[]
             }
@@ -72,6 +72,11 @@
                     contents:$that.workDetailInfo.contents
                 })
             },
+            _viewTaskFileImg: function (_url) {
+                vc.emit('viewImage', 'showImage', {
+                    url: _url
+                });
+            },
         }
     });
 })(window.vc);
\ No newline at end of file