diff --git a/src/views/service/components/attachmentUpload.vue b/src/views/service/components/attachmentUpload.vue
index 6f6b937..0a3590c 100644
--- a/src/views/service/components/attachmentUpload.vue
+++ b/src/views/service/components/attachmentUpload.vue
@@ -20,29 +20,6 @@
-
-
+
+
+
+
-
+
{{em.client_file_name?em.client_file_name:'未命名'}}
+
+
+
@@ -161,8 +165,6 @@ export default {
const userInfo = this.$TOOL.data.get("USER_INFO");
this.user_id = userInfo.id;
-
-
setTimeout(()=>{
this.getContactList();
},1000)
@@ -171,8 +173,42 @@ export default {
},
methods:{
getWsResult(res){
- if(res.data && (res.data.type == 36 || res.data.type == 38)){
+ if(res.data && (res.data.type == 12 || res.data.type == 35 || res.data.type == 36 || res.data.type == 38)){
switch(res.data.type) {
+ case 12:
+ this.msgList.forEach(item=>{
+ if(item.to_message_list && item.to_message_list.length>0){
+ item.to_message_list.forEach(em=>{
+ if(em.uuid && em.uuid === res.data.file_unique_id){
+ em.showLoading = res.data.rate !== 100;
+ em.rate = res.data.rate;
+ }
+ })
+ }
+ })
+ break;
+ case 35:
+ if(res.data.send_message_type === 2 && res.data.data.to_message){
+ res.data.data.to_message_list = JSON.parse(res.data.data.to_message);
+ }
+ if(res.data.data){
+ let obj = {
+ created_at: res.data.from_time,
+ send_message_type: res.data.send_message_type ? res.data.send_message_type : 1,
+ to_user_id: res.data.to_user_id,
+ to_message: res.data.data.to_message,
+ to_message_list: res.data.data.to_message_list,
+ from_user: {
+ avatar: res.data.from_avatar,
+ name: res.data.from_user,
+ }
+ };
+ this.msgList.push(obj);
+ setTimeout(()=>{
+ this.scrollDown();
+ },500);
+ }
+ break;
case 36:
res.data.rows.forEach((item)=>{
if(item.send_message_type == 2){
@@ -191,8 +227,8 @@ export default {
case 38:
if(res.data.contact_list && res.data.contact_list.length>0){
res.data.contact_list.forEach(item=>{
- if(item.send_message_type ==2){
- item.to_message_list = JSON.parse(item.to_message);
+ if(item.to_message.send_message_type === 2){
+ item.to_message_list = JSON.parse(item.to_message.to_message);
}
})
}
@@ -208,9 +244,7 @@ export default {
}
}
break;
- case 12:
- break;
default:
break;
}
@@ -277,7 +311,6 @@ export default {
})
},
uploadFileSuccess(data){
- console.log('接口上传成功',data)
const userInfo = this.$TOOL.data.get("USER_INFO");
this.msgList.push({
to_user_id:-1,
@@ -290,6 +323,10 @@ export default {
to_message_list:data,
to_message:''
});
+
+ setTimeout(()=>{
+ this.scrollDown();
+ },500)
},
recordsShow(){
@@ -306,7 +343,6 @@ export default {
const { scrollTop } = event;
if(scrollTop === 0 && this.msgList.length>0 && this.page >1){
this.page = this.page -1;
- console.log('执行接口数据获取')
this.getCustomerMsgList(true)
}
},
@@ -444,6 +480,27 @@ export default {
padding: 10px;
display: inline-block;
text-align: left;
+ .imgView{
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ margin-bottom: 5px;
+ .loadingIcon{
+ animation: rotate 1s linear infinite;
+ }
+ @keyframes rotate {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(360deg);
+ }
+ }
+ }
+ .imgViewRight{
+ justify-content: flex-end;
+ }
.fileView{
cursor: pointer;
color: var(--el-color-primary);
@@ -543,4 +600,13 @@ export default {
}
}
}
+
+.exportPopover{
+ margin-bottom: 8px;
+}
+.exportPopover ::v-deep .el-progress-bar__innerText{
+ height: 100%;
+ display: flex;align-items: center;justify-content: flex-end;
+ font-size: 10px;
+}