Skip to content

Commit da64db4

Browse files
committed
支持多图片上传
1 parent 0f68bec commit da64db4

File tree

7 files changed

+50
-25
lines changed

7 files changed

+50
-25
lines changed

public/components/oa/workDetailFile/workDetailFile.html

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,19 @@
5656
{{event.staffName}}
5757
</td>
5858
<td class="text-center" v-if="event.fileType != 'S'">
59-
<a :href="event.pathUrl" target="_blank">下载</a>
59+
<div v-if="event.pathUrl.endsWith('jpg') || event.pathUrl.endsWith('png')">
60+
<img style="width: 60px; height: 60px;" class="border-radius" v-bind:src="event.pathUrl"
61+
v-on:click="_viewTaskFileImg(event.pathUrl)" />
62+
</div>
63+
<div v-else>
64+
<a :href="event.pathUrl" target="_blank">下载</a>
65+
</div>
6066
</td>
6167
<td class="text-center" v-else>
6268
--
6369
</td>
6470
</tr>
6571
</tbody>
66-
<tfoot>
67-
<tr>
68-
<td colspan="2">
69-
<ul class="pagination float-right"></ul>
70-
</td>
71-
</tr>
72-
</tfoot>
7372
</table>
7473
<!-- 分页 -->
7574
<div class="text-right">

public/components/oa/workDetailTaskItem/workDetailTaskItem.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<tbody>
5555
<tr v-for="item in workDetailTaskItemInfo.items">
5656
<td class="text-left" style="width: 400px;">
57-
<div >
58-
{{item.content}}
57+
<div>
58+
{{item.content}}
5959
</div>
6060
</td>
6161
<td class="text-center">
@@ -70,8 +70,14 @@
7070
{{item.remark}}
7171
</td>
7272
<td class="text-center">
73-
<div v-if="item.pathUrl">
74-
<a :href="item.pathUrl" target="_blank">下载</a>
73+
<div v-if="item.pathUrls" v-for="(url,index) in item.pathUrls">
74+
<div v-if="url.endsWith('jpg') || url.endsWith('png')">
75+
<img style="width: 60px; height: 60px;" class="border-radius" v-bind:src="url"
76+
v-on:click="_viewTaskFileImg(url)" />
77+
</div>
78+
<div v-else>
79+
<a :href="url" target="_blank">下载</a>
80+
</div>
7581
</div>
7682
<div v-else> - </div>
7783
</td>

public/components/oa/workDetailTaskItem/workDetailTaskItem.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
$that.workDetailTaskItemInfo.taskId = _task.taskId;
7676
$that._loadWorkDetailTaskItemData();
7777
},
78+
_viewTaskFileImg: function (_url) {
79+
vc.emit('viewImage', 'showImage', {
80+
url: _url
81+
});
82+
},
7883
}
7984
});
8085
})(window.vc);

public/pages/oa/addWork/addWork.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
endTime:'',
1111
staffs:[],
1212
copyStaffs:[],
13-
pathUrl:'',
13+
pathUrls:[],
1414
contents:[],
1515
period:'',
1616
months: [],
@@ -40,8 +40,9 @@
4040
vc.emit('textarea','init',$that.addWorkInfo);
4141
},
4242
_initEvent: function () {
43-
vc.on('addWorkInfo', 'notifyFile', function (_param) {
44-
$that.addWorkInfo.pathUrl = _param.realFileName;
43+
vc.on('addWork', 'notifyFile', function (_param) {
44+
$that.addWorkInfo.pathUrls = [];
45+
$that.addWorkInfo.pathUrls.push(_param.realFileName);
4546
})
4647
},
4748
methods: {

public/pages/oa/editWork/editWork.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
endTime: '',
1212
staffs: [],
1313
copyStaffs: [],
14-
pathUrl: '',
14+
pathUrls: [],
1515
contents:[],
1616
period: '',
1717
months: [],
@@ -38,8 +38,9 @@
3838
vc.emit('textarea', 'init', $that.editWorkInfo);
3939
},
4040
_initEvent: function () {
41-
vc.on('editWorkInfo', 'notifyFile', function (_param) {
42-
$that.editWorkInfo.pathUrl = _param.realFileName;
41+
vc.on('editWork', 'notifyFile', function (_param) {
42+
$that.editWorkInfo.pathUrls = [];
43+
$that.editWorkInfo.pathUrls.push(_param.realFileName);
4344
})
4445
},
4546
methods: {
@@ -179,8 +180,8 @@
179180
function (json, res) {
180181
let _json = JSON.parse(json);
181182
vc.copyObject(_json.data[0], $that.editWorkInfo);
182-
if(_json.data[0].pathUrl){
183-
vc.emit('uploadFile', 'notifyVedio',_json.data[0].pathUrl);
183+
if(_json.data[0].pathUrls){
184+
vc.emit('uploadFile', 'notifyVedio',_json.data[0].pathUrls[0]);
184185
}
185186
$that.editWorkInfo.contents.forEach(_c=>{
186187
_c.id = vc.uuid();

public/pages/oa/workDetail/workDetail.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,21 @@
103103
</div>
104104
</div>
105105
<div class="col-sm-3">
106-
<div class="form-group">
106+
<div class="form-group flex justify-start">
107107
<label class="col-form-label">
108108
<vc:i18n name="附件:" namespace="workDetailInfo"></vc:i18n>
109109
</label>
110-
<label class="">
111-
<a :href="workDetailInfo.pathUrl" v-if="workDetailInfo.pathUrl">下载</a>
112-
</label>
110+
<div class="flex justify-start">
111+
<div class="" v-if="workDetailInfo.pathUrls" v-for="(url,index) in workDetailInfo.pathUrls">
112+
<div v-if="url.endsWith('jpg') || url.endsWith('png')">
113+
<img style="width: 60px; height: 60px;" class="border-radius" v-bind:src="url"
114+
v-on:click="_viewTaskFileImg(url)" />
115+
</div>
116+
<div v-else>
117+
<a :href="url" target="_blank">下载</a>
118+
</div>
119+
</div>
120+
</div>
113121
</div>
114122
</div>
115123
</div>

public/pages/oa/workDetail/workDetail.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
stateName: "",
2020
createTime: '',
2121
content: '',
22-
pathUrl: '',
22+
pathUrls: [],
2323
_currentTab: 'workDetailContent',
2424
contents:[]
2525
}
@@ -72,6 +72,11 @@
7272
contents:$that.workDetailInfo.contents
7373
})
7474
},
75+
_viewTaskFileImg: function (_url) {
76+
vc.emit('viewImage', 'showImage', {
77+
url: _url
78+
});
79+
},
7580
}
7681
});
7782
})(window.vc);

0 commit comments

Comments
 (0)